some updated files

diff --git a/control/gui/expert/MDC_LV_Turn_On_ALL_Relais b/control/gui/expert/MDC_LV_Turn_On_ALL_Relais
index 82f1517ba943c1559e7635db11f01d3316a25759..0859841394f45ba500e387b5dc112bd78f79b24b 100755 (executable)
--- a/control/gui/expert/MDC_LV_Turn_On_ALL_Relais
+++ b/control/gui/expert/MDC_LV_Turn_On_ALL_Relais
@@ -1,10 +1,10 @@
 #!/bin/bash
 xterm -e 'echo "Enabling the MDC-LV-Relais. Wait 4 Seconds..."; sleep 4' &
-command_client.pl -e etraxp204 -c "/home/hadaq/bin/writetty.sh 'OWDS 0'"
+~/bin/command_client.pl -e etraxp204 -c "/home/hadaq/bin/writetty.sh 'OWDS 0'"
 sleep 2
-command_client.pl -e etraxp204 -c "/home/hadaq/bin/writetty.sh 'OWDS 0'"
+~/bin/command_client.pl -e etraxp204 -c "/home/hadaq/bin/writetty.sh 'OWDS 0'"
 sleep 2
-command_client.pl -e etraxp204 -c "/home/hadaq/bin/writetty.sh 'OWDS 0'"
+~/bin/command_client.pl -e etraxp204 -c "/home/hadaq/bin/writetty.sh 'OWDS 0'"
 
 xterm -e 'echo "Now you should have 157 A and 151 A
 on the +3V and -3V rails of the MDC LV (EPICS LV, crates.adl). 

diff --git a/hmon/QA.pm b/hmon/QA.pm
index 011d5669f95b38312c8d05ca93b8d3de9590eb01..38df908ca10e166a7f16b48fb262f365df1d5df6 100644 (file)
--- a/hmon/QA.pm
+++ b/hmon/QA.pm
@@ -79,6 +79,8 @@ our $TrgCheckPolarity = 1;
 our @Eventsbroken     = (.5,5,10);
 our @MdcTokenMissLimits = (10,50,100);
 
+our @PionLvCurrLimits = (4,5,6);
+
 
 our @LimitTriggerPerSpill = (1000, 0, 0);
 our $AcceleratorCycle = 12;

diff --git a/mdc/serials_oep.db b/mdc/serials_oep.db
index 177b80bfe01400207e1718e57e3c01a2edd7ff54..fe29cc78358475d630c9a8f2deb7995c5e19f305 100644 (file)
--- a/mdc/serials_oep.db
+++ b/mdc/serials_oep.db
@@ -381,7 +381,7 @@
 418 0xd8000001fc6b8728
 419 0x41000001fc6a6b28
 420 0x81000001fc6b8428
-421 0x4d000001fc61e228
+#421 0x4d000001fc61e228 # disabled? JAM
 422 0x47000001fc629628
 423 0xac000001fc629328
 425 0x72000001fc6b5528
@@ -448,4 +448,4 @@
 497 0xf8000001fc769228
 498 0x85000001fc778728
 499 0xd0000001fc76f728  # not light on FOT
-500 0x46000001fc76fe28
\ No newline at end of file
+500 0x46000001fc76fe28

diff --git a/nettools/nettrace.db b/nettools/nettrace.db
index f5aaec597d39b74d7c899c0e73eb93f9b079dea0..b84b7d7bc61f2aa4c93a356a70a01816b809e767 100644 (file)
--- a/nettools/nettrace.db
+++ b/nettools/nettrace.db
@@ -1,142 +1,714 @@
 %hublist = (
-             '34305' => {
-                          '7' => 19505,
-                          '3' => 19488,
-                          '5' => 19520,
-                          '4' => 19504,
-                          '6' => 19536,
-                          '1' => 19456,
-                          '2' => 19472
-                        },
-             '34048' => {
-                          '2' => 34049
-                        },
-             '35072' => {
-                          '3' => 14339,
-                          '0' => 14336,
-                          '2' => 14338,
-                          '1' => 14337
-                        },
+             '4356' => {
+                         '8' => 8975,
+                         '7' => 8974,
+                         '3' => 8970,
+                         '4' => 8971,
+                         '5' => 8972,
+                         '6' => 8973,
+                         '1' => 8968,
+                         '2' => 8969
+                       },
+             '4096' => {
+                         '1' => 4098,
+                         '2' => 4099,
+                         '0' => 4097,
+                         '3' => 4100
+                       },
              '33808' => {
                           '2' => 33809
                         },
-             '34049' => {
-                          '5' => 12816,
-                          '3' => 12848,
-                          '6' => 12800,
-                          '4' => 12832,
-                          '2' => 12864,
-                          '1' => 12880
+             '4160' => {
+                         '1' => 4162,
+                         '2' => 4163,
+                         '3' => 4164,
+                         '0' => 4161
+                       },
+             '4147' => {
+                         '2' => 8224,
+                         '4' => 8227,
+                         '7' => 8230,
+                         '3' => 8225,
+                         '6' => 8229,
+                         '5' => 8228,
+                         '8' => 8231
+                       },
+             '4164' => {
+                         '4' => 8507,
+                         '3' => 8506,
+                         '7' => 8510,
+                         '8' => 8511,
+                         '2' => 8505,
+                         '1' => 8504,
+                         '6' => 8509,
+                         '5' => 8508
+                       },
+             '4129' => {
+                         '4' => 8195,
+                         '2' => 8193,
+                         '1' => 8192,
+                         '8' => 8199,
+                         '5' => 8196,
+                         '6' => 8197,
+                         '3' => 8194
+                       },
+             '35072' => {
+                          '3' => 14337,
+                          '0' => 14336
                         },
-             '33552' => {
-                          '2' => 33553
+             '4434' => {
+                         '4' => 8795,
+                         '7' => 8798,
+                         '3' => 8794,
+                         '8' => 8799,
+                         '1' => 8792,
+                         '2' => 8793,
+                         '6' => 8797,
+                         '5' => 8796
+                       },
+             '4400' => {
+                         '2' => 4403,
+                         '1' => 4402,
+                         '0' => 4401,
+                         '3' => 4404
+                       },
+             '4354' => {
+                         '5' => 8717,
+                         '6' => 8716,
+                         '1' => 8712,
+                         '2' => 8713,
+                         '8' => 8719,
+                         '7' => 8718,
+                         '3' => 8714,
+                         '4' => 8715
+                       },
+             '4416' => {
+                         '3' => 4420,
+                         '0' => 4417,
+                         '2' => 4419,
+                         '1' => 4418
+                       },
+             '4180' => {
+                         '4' => 8475,
+                         '8' => 8479,
+                         '7' => 8478,
+                         '3' => 8474,
+                         '1' => 8472,
+                         '2' => 8473,
+                         '5' => 8476,
+                         '6' => 8477
+                       },
+             '32771' => {
+                          '1' => 35072,
+                          '2' => 35088
                         },
-             '12848' => {
-                          '1' => 12850,
-                          '0' => 12849
+             '4436' => {
+                         '5' => 9052,
+                         '6' => 9053,
+                         '1' => 9048,
+                         '2' => 9049,
+                         '8' => 9055,
+                         '7' => 9054,
+                         '3' => 9050,
+                         '4' => 9051
+                       },
+             '4128' => {
+                         '2' => 4131,
+                         '1' => 4130,
+                         '0' => 4129,
+                         '3' => 4132
+                       },
+             '4179' => {
+                         '5' => 8532,
+                         '6' => 8533,
+                         '1' => 8528,
+                         '2' => 8529,
+                         '8' => 8471,
+                         '7' => 8470,
+                         '3' => 8530,
+                         '4' => 8531
+                       },
+             '4116' => {
+                         '5' => 8460,
+                         '6' => 8461,
+                         '2' => 8457,
+                         '1' => 8456,
+                         '8' => 8463,
+                         '3' => 8458,
+                         '7' => 8462,
+                         '4' => 8459
+                       },
+             '32772' => {
+                          '5' => 12864,
+                          '3' => 12832,
+                          '6' => 12880,
+                          '4' => 12848,
+                          '1' => 12800,
+                          '2' => 12816
+                        },
+             '4418' => {
+                         '6' => 9037,
+                         '5' => 9036,
+                         '1' => 9032,
+                         '2' => 9033,
+                         '7' => 9038,
+                         '3' => 9034,
+                         '8' => 9039,
+                         '4' => 9035
+                       },
+             '4371' => {
+                         '2' => 8734,
+                         '1' => 8735,
+                         '6' => 8730,
+                         '5' => 8731,
+                         '4' => 8732,
+                         '3' => 8733,
+                         '7' => 8729,
+                         '8' => 8728
+                       },
+             '4131' => {
+                         '5' => 8276,
+                         '6' => 8277,
+                         '1' => 8272,
+                         '2' => 8273,
+                         '8' => 8279,
+                         '7' => 8278,
+                         '3' => 8274,
+                         '4' => 8275
+                       },
+             '4162' => {
+                         '1' => 8248,
+                         '2' => 8249,
+                         '4' => 8251,
+                         '3' => 8250,
+                         '6' => 8253,
+                         '5' => 8252
+                       },
+             '4402' => {
+                         '5' => 9011,
+                         '6' => 9010,
+                         '2' => 9014,
+                         '1' => 9015,
+                         '8' => 9008,
+                         '3' => 9013,
+                         '7' => 9009,
+                         '4' => 9012
+                       },
+             '34304' => {
+                          '2' => 34305
                         },
              '33568' => {
                           '2' => 33569
                         },
-             '12832' => {
-                          '1' => 12834,
-                          '0' => 12833
+             '33809' => {
+                          '5' => 18464,
+                          '6' => 18465,
+                          '1' => 18482,
+                          '2' => 18481,
+                          '8' => 18467,
+                          '7' => 18466,
+                          '3' => 18480,
+                          '4' => 18483
                         },
+             '4115' => {
+                         '4' => 8467,
+                         '8' => 8455,
+                         '7' => 8454,
+                         '3' => 8466,
+                         '1' => 8464,
+                         '2' => 8465,
+                         '5' => 8468,
+                         '6' => 8469
+                       },
+             '4099' => {
+                         '4' => 8483,
+                         '2' => 8481,
+                         '1' => 8480,
+                         '8' => 8487,
+                         '6' => 8485,
+                         '3' => 8482,
+                         '7' => 8486
+                       },
              '34816' => {
                           '2' => 34817
                         },
+             '4369' => {
+                         '4' => 8988,
+                         '8' => 8984,
+                         '3' => 8989,
+                         '7' => 8985,
+                         '2' => 8990,
+                         '1' => 8991,
+                         '5' => 8987,
+                         '6' => 8986
+                       },
+             '4385' => {
+                         '4' => 9004,
+                         '8' => 9000,
+                         '3' => 9005,
+                         '7' => 9001,
+                         '2' => 9006,
+                         '1' => 9007,
+                         '5' => 9003,
+                         '6' => 9002
+                       },
+             '33792' => {
+                          '2' => 33793
+                        },
+             '4403' => {
+                         '2' => 8766,
+                         '1' => 8767,
+                         '6' => 8762,
+                         '5' => 8763,
+                         '4' => 8764,
+                         '3' => 8765,
+                         '7' => 8761,
+                         '8' => 8760
+                       },
+             '4435' => {
+                         '4' => 9043,
+                         '8' => 9047,
+                         '7' => 9046,
+                         '3' => 9042,
+                         '1' => 9040,
+                         '2' => 9041,
+                         '5' => 9044,
+                         '6' => 9045
+                       },
+             '12832' => {
+                          '0' => 12833,
+                          '1' => 12834
+                        },
              '33793' => {
-                          '5' => 18448,
-                          '7' => 18450,
-                          '11' => 18466,
-                          '10' => 18465,
-                          '1' => 18434,
                           '4' => 18435,
-                          '9' => 18464,
-                          '3' => 18433,
                           '8' => 18451,
+                          '7' => 18450,
+                          '3' => 18433,
+                          '1' => 18434,
                           '2' => 18432,
-                          '12' => 18467,
+                          '5' => 18448,
                           '6' => 18449
                         },
-             '12864' => {
-                          '0' => 12865,
-                          '1' => 12866
+             '32770' => {
+                          '2' => 34816,
+                          '1' => 34304,
+                          '3' => 34560
                         },
-             '33809' => {
-                          '5' => 18499,
-                          '7' => 18497,
-                          '11' => 18514,
-                          '10' => 18513,
-                          '1' => 18482,
-                          '4' => 18483,
-                          '9' => 18512,
-                          '3' => 18480,
-                          '8' => 18496,
-                          '2' => 18481,
-                          '12' => 18515,
-                          '6' => 18498
+             '4145' => {
+                         '7' => 8213,
+                         '3' => 8209,
+                         '5' => 8211,
+                         '8' => 8214,
+                         '1' => 8212,
+                         '2' => 8208,
+                         '4' => 8210
+                       },
+             '4372' => {
+                         '4' => 8724,
+                         '3' => 8725,
+                         '7' => 8721,
+                         '8' => 8720,
+                         '2' => 8726,
+                         '1' => 8727,
+                         '6' => 8722,
+                         '5' => 8723
+                       },
+             '4114' => {
+                         '6' => 8541,
+                         '5' => 8540,
+                         '2' => 8537,
+                         '1' => 8536,
+                         '3' => 8538,
+                         '7' => 8542,
+                         '8' => 8543,
+                         '4' => 8539
+                       },
+             '4432' => {
+                         '0' => 4433,
+                         '3' => 4436,
+                         '2' => 4435,
+                         '1' => 4434
+                       },
+             '4370' => {
+                         '6' => 8978,
+                         '5' => 8979,
+                         '2' => 8982,
+                         '1' => 8983,
+                         '3' => 8980,
+                         '7' => 8977,
+                         '8' => 8976,
+                         '4' => 8981
+                       },
+             '4161' => {
+                         '1' => 8240,
+                         '2' => 8241,
+                         '6' => 8245,
+                         '5' => 8244,
+                         '4' => 8243,
+                         '7' => 8246,
+                         '3' => 8242,
+                         '8' => 8247
+                       },
+             '4097' => {
+                         '2' => 8259,
+                         '1' => 8258,
+                         '5' => 8256,
+                         '6' => 8263,
+                         '4' => 8261,
+                         '8' => 8265,
+                         '3' => 8257,
+                         '7' => 8260
+                       },
+             '4352' => {
+                         '0' => 4353,
+                         '3' => 4356,
+                         '1' => 4354,
+                         '2' => 4355
+                       },
+             '4401' => {
+                         '8' => 9016,
+                         '7' => 9017,
+                         '3' => 9021,
+                         '4' => 9020,
+                         '5' => 9019,
+                         '6' => 9018,
+                         '1' => 9023,
+                         '2' => 9022
+                       },
+             '32768' => {
+                          '4' => 3,
+                          '1' => 32770,
+                          '2' => 32771,
+                          '0' => 32769,
+                          '7' => 33040,
+                          '3' => 32772,
+                          '6' => 33024
                         },
-             '34561' => {
-                          '2' => 17424,
-                          '1' => 17408,
-                          '3' => 17440
+             '33040' => {
+                          '2' => 33041
+                        },
+             '35088' => {
+                          '0' => 14352,
+                          '1' => 14353
+                        },
+             '12848' => {
+                          '0' => 12849,
+                          '1' => 12850
                         },
              '33569' => {
                           '4' => 12355,
-                          '1' => 12352,
-                          '10' => 12372,
-                          '7' => 12369,
-                          '5' => 12356,
-                          '6' => 12368,
-                          '2' => 12353,
                           '8' => 12370,
                           '3' => 12354,
-                          '9' => 12371
-                        },
-             '33553' => {
-                          '4' => 12323,
-                          '10' => 12340,
-                          '1' => 12320,
-                          '7' => 12337,
-                          '5' => 12324,
-                          '6' => 12336,
-                          '2' => 12321,
-                          '8' => 12338,
-                          '9' => 12339,
-                          '3' => 12322
+                          '7' => 12369,
+                          '10' => 12372,
+                          '2' => 12353,
+                          '1' => 12352,
+                          '9' => 12371,
+                          '5' => 12356,
+                          '6' => 12368
                         },
-             '34304' => {
-                          '2' => 34305
+             '4163' => {
+                         '5' => 8500,
+                         '6' => 8501,
+                         '2' => 8497,
+                         '1' => 8496,
+                         '8' => 8503,
+                         '3' => 8498,
+                         '7' => 8502,
+                         '4' => 8499
+                       },
+             '33025' => {
+                          '6' => 4176,
+                          '3' => 4128,
+                          '5' => 4160,
+                          '1' => 4096,
+                          '2' => 4112,
+                          '4' => 4144
                         },
-             '12880' => {
-                          '0' => 12881,
-                          '1' => 12882
+             '4130' => {
+                         '2' => 8201,
+                         '1' => 8200,
+                         '4' => 8203,
+                         '3' => 8202,
+                         '6' => 8205,
+                         '7' => 8198,
+                         '5' => 8204
+                       },
+             '33537' => {
+                          '8' => 12306,
+                          '7' => 12305,
+                          '3' => 12290,
+                          '4' => 12291,
+                          '9' => 12307,
+                          '5' => 12292,
+                          '6' => 12304,
+                          '10' => 12308,
+                          '1' => 12288,
+                          '2' => 12289
                         },
-             '32769' => {
-                          '5' => 34560,
-                          '7' => 34048,
-                          '11' => 34816,
-                          '10' => 33568,
-                          '1' => 33792,
-                          '9' => 33552,
-                          '8' => 33536,
-                          '2' => 33808,
-                          '6' => 34304
+             '4132' => {
+                         '4' => 8283,
+                         '1' => 8280,
+                         '2' => 8281,
+                         '5' => 8284,
+                         '3' => 8282,
+                         '6' => 8285
+                       },
+             '33024' => {
+                          '2' => 33025
+                        },
+             '33825' => {
+                          '3' => 18514,
+                          '7' => 18498,
+                          '8' => 18499,
+                          '4' => 18515,
+                          '6' => 18497,
+                          '5' => 18496,
+                          '2' => 18513,
+                          '1' => 18512
+                        },
+             '4420' => {
+                         '4' => 8779,
+                         '8' => 8783,
+                         '3' => 8778,
+                         '7' => 8782,
+                         '2' => 8777,
+                         '1' => 8776,
+                         '5' => 8780,
+                         '6' => 8781
+                       },
+             '62213' => {
+                          '3' => 62213
+                        },
+             '12864' => {
+                          '1' => 12866,
+                          '0' => 12865
+                        },
+             '33824' => {
+                          '2' => 33825
                         },
              '12816' => {
                           '0' => 12817,
                           '1' => 12818
                         },
+             '4177' => {
+                         '2' => 8513,
+                         '1' => 8512,
+                         '5' => 8516,
+                         '6' => 8517,
+                         '4' => 8515,
+                         '8' => 8519,
+                         '3' => 8514,
+                         '7' => 8518
+                       },
+             '34560' => {
+                          '2' => 34561
+                        },
+             '4100' => {
+                         '5' => 8492,
+                         '6' => 8493,
+                         '1' => 8488,
+                         '2' => 8489,
+                         '8' => 8495,
+                         '7' => 8494,
+                         '3' => 8490,
+                         '4' => 8491
+                       },
+             '4178' => {
+                         '4' => 8523,
+                         '7' => 8526,
+                         '3' => 8522,
+                         '8' => 8527,
+                         '1' => 8520,
+                         '2' => 8521,
+                         '6' => 8525,
+                         '5' => 8524
+                       },
+             '4098' => {
+                         '6' => 8266,
+                         '3' => 8269,
+                         '5' => 8267,
+                         '2' => 8262,
+                         '1' => 8264,
+                         '4' => 8268
+                       },
+             '4419' => {
+                         '7' => 8774,
+                         '3' => 8770,
+                         '8' => 8775,
+                         '4' => 8771,
+                         '6' => 8773,
+                         '5' => 8772,
+                         '1' => 8768,
+                         '2' => 8769
+                       },
+             '4388' => {
+                         '7' => 8743,
+                         '3' => 8747,
+                         '8' => 8742,
+                         '4' => 8746,
+                         '6' => 8744,
+                         '5' => 8745,
+                         '1' => 8737,
+                         '2' => 8736
+                       },
+             '34305' => {
+                          '4' => 19504,
+                          '2' => 19472,
+                          '1' => 19456,
+                          '5' => 19520,
+                          '6' => 19536,
+                          '3' => 19488,
+                          '7' => 19505
+                        },
+             '4112' => {
+                         '1' => 4114,
+                         '2' => 4115,
+                         '3' => 4116,
+                         '0' => 4113
+                       },
+             '34960' => {
+                          '2' => 20498,
+                          '1' => 20497,
+                          '3' => 20499,
+                          '0' => 20496
+                        },
+             '32769' => {
+                          '1' => 33808,
+                          '2' => 33792,
+                          '4' => 33568,
+                          '6' => 33536,
+                          '3' => 33824
+                        },
+             '4113' => {
+                         '4' => 8451,
+                         '7' => 8534,
+                         '3' => 8450,
+                         '8' => 8535,
+                         '1' => 8448,
+                         '2' => 8449,
+                         '6' => 8453,
+                         '5' => 8452
+                       },
+             '4176' => {
+                         '0' => 4177,
+                         '3' => 4180,
+                         '1' => 4178,
+                         '2' => 4179
+                       },
+             '4384' => {
+                         '0' => 4385,
+                         '3' => 4388,
+                         '2' => 4387,
+                         '1' => 4386
+                       },
+             '4353' => {
+                         '4' => 8707,
+                         '8' => 8711,
+                         '3' => 8706,
+                         '7' => 8710,
+                         '2' => 8705,
+                         '1' => 8704,
+                         '5' => 8708,
+                         '6' => 8709
+                       },
+             '4404' => {
+                         '6' => 8754,
+                         '3' => 8757,
+                         '7' => 8752,
+                         '8' => 8753,
+                         '2' => 8758,
+                         '1' => 8759,
+                         '4' => 8756
+                       },
+             '4148' => {
+                         '1' => 8233,
+                         '2' => 8232,
+                         '4' => 8235,
+                         '7' => 8237,
+                         '6' => 8226,
+                         '3' => 8234,
+                         '5' => 8236
+                       },
+             '4386' => {
+                         '8' => 8992,
+                         '3' => 8997,
+                         '7' => 8993,
+                         '4' => 8996,
+                         '5' => 8995,
+                         '6' => 8994,
+                         '2' => 8998,
+                         '1' => 8999
+                       },
+             '4433' => {
+                         '6' => 8789,
+                         '5' => 8788,
+                         '1' => 8784,
+                         '2' => 8785,
+                         '7' => 8790,
+                         '3' => 8786,
+                         '8' => 8791,
+                         '4' => 8787
+                       },
+             '4368' => {
+                         '2' => 4371,
+                         '1' => 4370,
+                         '3' => 4372,
+                         '0' => 4369
+                       },
+             '12880' => {
+                          '0' => 12881,
+                          '1' => 12882
+                        },
+             '34561' => {
+                          '3' => 17440,
+                          '1' => 17408,
+                          '2' => 17424,
+                          '4' => 34960
+                        },
+             '4355' => {
+                         '5' => 8964,
+                         '6' => 8965,
+                         '2' => 8961,
+                         '1' => 8960,
+                         '8' => 8967,
+                         '3' => 8962,
+                         '7' => 8966,
+                         '4' => 8963
+                       },
+             '33041' => {
+                          '2' => 4368,
+                          '1' => 4352,
+                          '4' => 4400,
+                          '3' => 4384,
+                          '6' => 4432,
+                          '5' => 4416
+                        },
              '34817' => {
-                          '2' => 16384,
+                          '3' => 16385,
                           '1' => 2,
-                          '4' => 35072,
-                          '3' => 16385
-                        },
-             '33792' => {
-                          '2' => 33793
+                          '2' => 16384
                         },
+             '4417' => {
+                         '8' => 9031,
+                         '3' => 9026,
+                         '7' => 9030,
+                         '4' => 9027,
+                         '5' => 9028,
+                         '6' => 9029,
+                         '2' => 9025,
+                         '1' => 9024
+                       },
+             '4387' => {
+                         '6' => 8740,
+                         '5' => 8741,
+                         '2' => 8749,
+                         '1' => 8748,
+                         '3' => 8750,
+                         '7' => 8739,
+                         '8' => 8738,
+                         '4' => 8751
+                       },
              '12800' => {
                           '0' => 12801,
                           '1' => 12802
@@ -144,23 +716,20 @@
              '33536' => {
                           '2' => 33537
                         },
-             '32768' => {
-                          '2' => 32769
-                        },
-             '33537' => {
-                          '7' => 12305,
-                          '5' => 12292,
-                          '4' => 12291,
-                          '10' => 12308,
-                          '1' => 12288,
-                          '8' => 12306,
-                          '9' => 12307,
-                          '3' => 12290,
-                          '6' => 12304,
-                          '2' => 12289
-                        },
-             '34560' => {
-                          '2' => 34561
-                        }
+             '4146' => {
+                         '7' => 8221,
+                         '3' => 8217,
+                         '6' => 8220,
+                         '5' => 8219,
+                         '1' => 8215,
+                         '2' => 8216,
+                         '4' => 8218
+                       },
+             '4144' => {
+                         '2' => 4147,
+                         '1' => 4146,
+                         '3' => 4148,
+                         '0' => 4145
+                       }
            );
 

diff --git a/nettools/reviveoep.pl b/nettools/reviveoep.pl
index 6c9d277a80b9d346ca48f6100a401921a1f41a9e..820f3f81c58f0e8b40b5b2164514086d1df2dd97 100755 (executable)
--- a/nettools/reviveoep.pl
+++ b/nettools/reviveoep.pl
@@ -21,7 +21,6 @@ my $msg = "";
 print "Checking for time-outs\n";
 #Get timed out ports
 my $t_timeout = trb_register_read(0xfffe, 0x8b);
-my $t_busy    = trb_register_read(0xfe11, 0x80);
 foreach my $h (keys %$t_timeout) {
   if($h >= 0x1000 && $h < 0x2000 && $h%16) {
     my $ports = ($t_timeout->{$h} >> 16) & 0x1fe;
@@ -56,6 +55,7 @@ foreach my $h (keys %$t_timeout) {
 system("trbcmd setbit 0x0003 0xa0c0 0x400");
 usleep(30000);
 print "Checking for busy MDC front-ends\n";
+my $t_busy    = trb_register_read(0xfe11, 0x80);
 foreach my $h (keys %$t_busy) {
   my $ports = ($t_busy->{$h}) & 0x1fe;
   if($ports) {
@@ -104,7 +104,10 @@ foreach my $h (keys %$t_timeout) {
 
 #load startup-settings
 print("Loading configuration for OEP\n");
-system("ssh -X hadesdaq02 'cd /home/hadaq/trbsoft/daq/main/;./startup.pl -f ../mdc/startup.script -c 0 -m MDCnomasks -m MDCDATASET -m MDCindiv -m MDCreg0current -eb off'");
+#system("ssh -X lxhadeb06 'cd /home/hadaq/trbsoft/daq/main/;./startup.pl -f ../mdc/startup.script -c 0 -m MDCnomasks -m MDCDATASET -m MDCindiv -m MDCreg0current -eb off'");
+system("ssh -X lxhadesdaq 'cd /home/hadaq/trbsoft/daq/main/;./startup.pl -f ../mdc/startup.script -c 0 -m MDCnomasks -m MDCDATASET -m MDCindiv -m MDCreg0current -eb off'");
+
+
 
 #Correct trigger number (get from CTS)
 my $t_trignum = trb_register_read(0x0002, 01) or die;

diff --git a/nettools/whatis_db.pl b/nettools/whatis_db.pl
index 226ed4a7ef0d435944e913456c3c7ae01ecf4a1e..e0ddf9f0ed3ab621d1f235a44e67407164e26557 100755 (executable)
--- a/nettools/whatis_db.pl
+++ b/nettools/whatis_db.pl
@@ -7,7 +7,7 @@ use Data::Dumper;
 
 $Data::Dumper::Purity = 1;
 
-my $dbfile = "/home/hadaq/trbsoft/daq/tools/whatis.db";
+my $dbfile = "/home/hadaq/trbsoft/hadesdaq/nettools/data/whatis.db";
 
 sub usage {
   print "Usage: whatis.pl <endpoint-address>\n";

diff --git a/start/ThreshPadiwaVeto.db b/start/ThreshPadiwaVeto.db
index a6beab41d396f67708e17cde2d6bc6bb5df799ac..c97fd1b6781666afbd5109dd744be662adeb8dbe 100644 (file)
--- a/start/ThreshPadiwaVeto.db
+++ b/start/ThreshPadiwaVeto.db
@@ -1,39 +1,39 @@
 # Board   Chain   ChainLen  DAC   Channel   Command   Value
-  5010    1       1         0     0         8         0x8000
-  5010    1       1         0     2         8         0x8000
-  5010    1       1         0     4         8         0x8000
-  5010    1       1         0     6         8         0x8000
-  5010    1       1         0     8         8         0x8000
-  5010    1       1         0     10        8         0x8000
-  5010    1       1         0     12        8         0xf000
-  5010    1       1         0     14        8         0x8000
+  5010    1       1         0     0         8         0x0400
+  5010    1       1         0     2         8         0x05ad
+  5010    1       1         0     4         8         0x0556
+  5010    1       1         0     6         8         0x0724
+  5010    1       1         0     8         8         0x0562
+  5010    1       1         0     10        8         0x0527
+  5010    1       1         0     12        8         0x04aa
+  5010    1       1         0     14        8         0x06ce
 
-  5010    2       1         0     0         8         0x8000
-  5010    2       1         0     2         8         0x8000
-  5010    2       1         0     4         8         0x8000
-  5010    2       1         0     6         8         0x8000
-  5010    2       1         0     8         8         0x8000
-  5010    2       1         0     10        8         0x8000
-  5010    2       1         0     12        8         0x8000
-  5010    2       1         0     14        8         0xf000
+  5010    2       1         0     0         8         0x0572
+  5010    2       1         0     2         8         0x05c5
+  5010    2       1         0     4         8         0x06ff
+  5010    2       1         0     6         8         0x04d2
+  5010    2       1         0     8         8         0x0582
+  5010    2       1         0     10        8         0x0642
+  5010    2       1         0     12        8         0x05dc
+  5010    2       1         0     14        8         0x0470
 
-  5013    1       1         0     0         8         0x8000
-  5013    1       1         0     2         8         0x8000
-  5013    1       1         0     4         8         0x8000
-  5013    1       1         0     6         8         0x8000
-  5013    1       1         0     8         8         0x8000
-  5013    1       1         0     10        8         0x8000
-  5013    1       1         0     12        8         0x8000
-  5013    1       1         0     14        8         0x8000
+  5013    1       1         0     0         8         0x0560
+  5013    1       1         0     2         8         0x0556
+  5013    1       1         0     4         8         0x03e6
+  5013    1       1         0     6         8         0x051d
+  5013    1       1         0     8         8         0x03ee
+  5013    1       1         0     10        8         0x0755
+  5013    1       1         0     12        8         0x0510
+  5013    1       1         0     14        8         0x04a8
 
-  5013    2       1         0     0         8         0x8000
-  5013    2       1         0     2         8         0x8000
-  5013    2       1         0     4         8         0x8000
-  5013    2       1         0     6         8         0x8000
-  5013    2       1         0     8         8         0x8000
-  5013    2       1         0     10        8         0x8000
-  5013    2       1         0     12        8         0x8000
-  5013    2       1         0     14        8         0x8000
+  5013    2       1         0     0         8         0x050a
+  5013    2       1         0     2         8         0x0598
+  5013    2       1         0     4         8         0x0579
+  5013    2       1         0     6         8         0x050f
+  5013    2       1         0     8         8         0x0549
+  5013    2       1         0     10        8         0x06ae
+  5013    2       1         0     12        8         0x0522
+  5013    2       1         0     14        8         0x0500
 
 #Unused slow channels
   5010    1       1         0     1         8         0xffff

diff --git a/start/startup.script b/start/startup.script
index 82e14b31eba559c0050e51a953c7906d21d127f1..45ceaf77df5dadfc9188557c181791df20944ae0 100644 (file)
--- a/start/startup.script
+++ b/start/startup.script
@@ -15,8 +15,8 @@ trbcmd clearbit 0xfe48 0xc800 0x00001000
 trbcmd clearbit 0xfe4e 0xc800 0x00001000
 
 #2us trigger window
-trbcmd w 0xfe48 0xc801 0x80f00000
-trbcmd w 0xfe4e 0xc801 0x80f00000
+trbcmd w 0xfe48 0xc801 0x800f0190
+trbcmd w 0xfe4e 0xc801 0x800f0190
 
 #Data limit off
 trbcmd w 0xfe48 0xc804 0x00000080
@@ -25,31 +25,56 @@ trbcmd w 0xfe4e 0xc804 0x00000080
 
 
 #Hodoscope inputs
-#trbcmd w 0x5010 0xc802 0xffffffff # disable channel 0-31
+ trbcmd w 0x5010 0xc802 0xffffffff # disable channel 0-31
  trbcmd w 0x5010 0xc803 0x00000000 # disable channel 32-63
  trbcmd w 0x5011 0xc802 0x00000000 # disable channel 0-31
  trbcmd w 0x5011 0xc803 0x00000000 # disable channel 32-63
  trbcmd w 0x5012 0xc802 0x00000000 # disable channel 0-31
  trbcmd w 0x5012 0xc803 0x00000000 # disable channel 32-63
-#trbcmd w 0x5013 0xc802 0xffffffff # disable channel 0-31
+ trbcmd w 0x5013 0xc802 0xffffffff # disable channel 0-31
  trbcmd w 0x5013 0xc803 0x00000000 # disable channel 32-63
 
 #Start inputs
-#trbcmd w 0x5000 0xc802 0xffffffff # disable channel 0-31
+ trbcmd w 0x5000 0xc802 0xffff0000 # disable channel 0-31
  trbcmd w 0x5000 0xc803 0x00000000 # disable channel 32-63
-#trbcmd w 0x5001 0xc802 0xffffffff # disable channel 0-31
+ trbcmd w 0x5001 0xc802 0x00000000 # disable channel 0-31
  trbcmd w 0x5001 0xc803 0x00000000 # disable channel 32-63
-#trbcmd w 0x5002 0xc802 0xffffffff # disable channel 0-31
+ trbcmd w 0x5002 0xc802 0x00000000 # disable channel 0-31
  trbcmd w 0x5002 0xc803 0x00000000 # disable channel 32-63
  trbcmd w 0x5003 0xc802 0x00000000 # disable channel 0-31
  trbcmd w 0x5003 0xc803 0x00000000 # disable channel 32-63
 
 
 #Trigger Generator Settings
+#Replace with proper values
+trbcmd w 0x5000 0xcf00 0xff00
+trbcmd w 0x5001 0xcf00 0x0
+trbcmd w 0x5002 0xcf00 0x0
+trbcmd w 0x5003 0xcf00 0x0
+trbcmd w 0x8880 0xcf00 0x0111   #Forward to CTS via central FPGA
+#Connected to second Start input on CTS
+
+trbcmd w 0x5010 0xcf00 0xffff
+trbcmd w 0x5001 0xcf00 0x0000
+trbcmd w 0x5002 0xcf00 0x0000
+trbcmd w 0x5003 0xcf00 0xffff
+trbcmd w 0x8890 0xcf00 0x1001   #Forward to CTS via central FPGA
+
 
 
 #Input Monitor Settings
+#Enable 16 inputs on all
+trbcmd w 0x5000 0xcf80 0xffff
+trbcmd w 0x5001 0xcf80 0xffff
+trbcmd w 0x5002 0xcf80 0xffff
+trbcmd w 0x5003 0xcf80 0x0000
+trbcmd w 0x5010 0xcf80 0xffff
+trbcmd w 0x5011 0xcf80 0x0000
+trbcmd w 0x5012 0xcf80 0x0000
+trbcmd w 0x5013 0xcf80 0xffff
 
 
 
 exec_cmd{local} /home/hadaq/trbsoft/daqtools/tools/dac_program.pl ../start/ThreshPadiwaVeto.db       
+exec_cmd{local} /home/hadaq/trbsoft/daqtools/tools/dac_program.pl ../start/ThreshNinoStart.db
+