update some daq scripts

diff --git a/control/gui/call_programs_wrapper.sh b/control/gui/call_programs_wrapper.sh
index e2f7b073d5844cd3c82a30f7196005d50c8707bd..ba93d5a8b9f881763f0186e300a831031423b27d 100755 (executable)
--- a/control/gui/call_programs_wrapper.sh
+++ b/control/gui/call_programs_wrapper.sh
@@ -1,5 +1,5 @@
-#ssh -X lxhadeb06 "export PATH=\$PATH:\$HOME/bin; echo $PATH; cd /home/hadaq/trbsoft/hadesdaq/control/gui/; ./call_programs2.pl -geometry -0-0" 
+ssh -X lxhadeb06 "export PATH=\$PATH:\$HOME/bin; echo $PATH; cd /home/hadaq/trbsoft/hadesdaq/control/gui/; ./call_programs2.pl -geometry -0-0" 
 #ssh -X lxhadeb06 ". .bashrc; export PATH=\$PATH:\$HOME/bin; echo $PATH; cd /home/hadaq/trbsoft/hadesdaq/control/gui/; ./call_programs2.pl -geometry -0-0" 
 
-cd /home/hadaq/trbsoft/daq/control/gui/
-/home/hadaq/trbsoft/daq/control/gui/call_programs2.pl -geometry -0-0
+#cd /home/hadaq/trbsoft/daq/control/gui/
+#/home/hadaq/trbsoft/daq/control/gui/call_programs2.pl -geometry -0-0

diff --git a/control/gui/daq/20_Reprogram_FPGA b/control/gui/daq/20_Reprogram_FPGA
index 151cc72c1041943eb08cb0e84c7c4734451faa5a..406d0624065e3c54a6c1efa014ea824a5db98062 100755 (executable)
--- a/control/gui/daq/20_Reprogram_FPGA
+++ b/control/gui/daq/20_Reprogram_FPGA
@@ -11,7 +11,7 @@ notifyall.sh "DAQ" "<I> FPGA are being reprogrammed." "STARTUP" &
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   cd ~/trbsoft/hadesdaq/main/
-  ./startup.pl -f main_hades.script -o file  -m TOF -m RPC -m WALL -m RICH -m SHOWER -m STARTCTS -m MDC -m MDCDATASET --eb off
+  ./startup.pl -f main_hades.script -o file  -m TOF -m RPC -m WALL -m RICH -m STARTCTS -m MDC -m MDCDATASET --eb off
   echo "First config run"
   bash startup_briccolage.sh
   '

diff --git a/ecal/addresses_ecal.db b/ecal/addresses_ecal.db
index 51d7ab6979df36c47f44b0fc9a0f50f58f3ff5d0..612177bf65b36ddc6efbf2aa3b1505b3af5e7550 100644 (file)
--- a/ecal/addresses_ecal.db
+++ b/ecal/addresses_ecal.db
@@ -11,18 +11,18 @@
     0x6010        0         1        0        0
     0x6011        0         1        0        0
     0x6012        0         1        0        0
-    0x6013        121         1        0        0
-    0x6014        159         1        0        0
-    0x6015        105         1        0        0
-    0x6016        106         1        0        0
+    0x6013        1211         1        0        0
+    0x6014        1591         1        0        0
+    0x6015        1051         1        0        0
+    0x6016        1061         1        0        0
 
-    0x6020        118         1        0        0
-    0x6021        109         1        0        0
-    0x6022        108         1        0        0
-    0x6023        154         1        0        0
-    0x6024        111         1        0        0
-    0x6025        110         1        0        0
-    0x6026        140         1        0        0
+    0x6020        1181         1        0        0
+    0x6021        1091         1        0        0
+    0x6022        1081         1        0        0
+    0x6023        1541         1        0        0
+    0x6024        1111         1        0        0
+    0x6025        1101         1        0        0
+    0x6026        1401         1        0        0
 
     0x6030        0         1        0        0
     0x6031        0         1        0        0
@@ -32,18 +32,18 @@
     0x6035        0         1        0        0
     0x6036        0         1        0        0
 
-    0x6040        116         1        0        0
-    0x6041        115         1        0        0
-    0x6042        120         1        0        0
-    0x6043        125         1        0        0
-    0x6044        113         1        0        0
-    0x6045        133         1        0        0
-    0x6046        124         1        0        0
+    0x6040        1161         1        0        0
+    0x6041        1151         1        0        0
+    0x6042        1201         1        0        0
+    0x6043        1251         1        0        0
+    0x6044        1131         1        0        0
+    0x6045        1331         1        0        0
+    0x6046        1241         1        0        0
 
-    0x6050        122         1        0        0
-    0x6051        127         1        0        0
-    0x6052        114         1        0        0
-    0x6053        119         1        0        0
-    0x6054        151         1        0        0
-    0x6055        132         1        0        0
-    0x6056        107         1        0        0
+    0x6050        1221         1        0        0
+    0x6051        1271         1        0        0
+    0x6052        1141         1        0        0
+    0x6053        1191         1        0        0
+    0x6054        1511         1        0        0
+    0x6055        1321         1        0        0
+    0x6056        1071         1        0        0

diff --git a/ecal/serials_trb3sc.db b/ecal/serials_trb3sc.db
new file mode 100644 (file)
index 0000000..035bfa3
--- /dev/null
+++ b/ecal/serials_trb3sc.db
@@ -0,0 +1,83 @@
+#List of all serial numbers for TRB3sc. 3-digit serial, append a '1'
+
+#  Serial    #  Unique ID
+########################################
+
+   0011        0x610000050dec4328
+   0021        0x820000050dec0a28
+   0031        0xb00000050d277128
+   0041        0x7a0000050df02428
+   0051        0xff0000050de7e528 
+   0061        0x0000000000000000
+   0071        0xfc000006e90e8828
+   0081        0x67000006ea309a28
+   0091        0xf1000006e919a128
+   0101        0x5d000006e913bc28
+
+   1051        0x8400000941031228
+   1061        0xb300000941031328
+   1071        0xb000000940ce5228
+   1081        0xcd00000940ce5e28
+   1091        0x3500000940ce5528
+
+   1101        0xfc00000940ce6a28
+   1111        0x3f000009408c2e28
+   1131        0x4f000009408a9b28
+   1141        0x2000000940c1e928
+   1151        0x6f000009409d7428
+   1161        0xcc000009409d6f28
+   1171        0xf600000940c29928
+   1181        0x49000009409d6828
+   1191        0x7100000940c28d28
+
+   1201        0xc100000940c29828
+   1211        0x4600000940c28c28   
+   1221        0x0c00000940c28128
+   1231        0x3b00000940c28028
+   1241        0x7d00000940880b28
+   1251        0xb1000009409d6328
+   1261        0x0200000940881428
+   1271        0x9b00000940876628
+   1281        0x0d00000940876f28
+   1291        0x9a00000940a5da28
+
+   1301        0x1d00000940a5ce28
+   1311        0xf600000940a5cb28
+   1321        0x6f00000940a61528
+   1331        0xea00000940a61228
+   1341        0x120000094094a928
+   1361        0xb100000940d69628
+   1371        0x4900000940a60928
+   1381        0x7700000940956828
+   1391        0x6100000940df2928
+
+   1401        0x6d00000940a60628
+   1411        0xa900000940a5fd28
+   1421        0x2c00000940a5fa28
+   1431        0x1600000940a63f28
+   1441        0x5c00000940a63228
+   1451        0xc300000940955b28
+   1461        0x4d00000940a62f28
+   1471        0x1c00000940a66028
+   1481        0x4600000940955c28
+   1491        0x3b00000940955028
+
+   1501        0x4f0000094093c328
+   1511        0x4400000940954f28
+   1531        0x3c0000094093b628
+   1541        0x1a0000094093aa28
+   1551        0x5600000940939228
+   1561        0x0f00000940939128
+   1571        0x430000094093a928
+   1581        0x2b00000940939e28
+   1591        0x7200000940939d28
+
+   1601        0xcd00000940943b28
+   1611        0xd100000940938628
+   1621        0x4800000940943c28
+   1631        0x840000094117ff28
+   1641        0x250000094117f728
+   1651        0xce0000094117f228
+   1661        0xf300000941240528
+   
+

diff --git a/ecal/startup.script b/ecal/startup.script
new file mode 100644 (file)
index 0000000..075f1e9
--- /dev/null
+++ b/ecal/startup.script
@@ -0,0 +1,6 @@
+#Assign addresses
+!ifndef RESTART
+  set_addresses  serials_trb3sc.db  addresses_ecal.db
+!endif
+wait
+

diff --git a/hmon/hmon_endpoints.pl b/hmon/hmon_endpoints.pl
index 42761c878ae2ac1642bd3afca576aef099cdec45..5ffa87817ebc6ccfc1690f445d19629b087ae161 100755 (executable)
--- a/hmon/hmon_endpoints.pl
+++ b/hmon/hmon_endpoints.pl
@@ -58,7 +58,7 @@ while(1) {
        0x1122,0x1123,0x1124,0x1140,0x1131,0x1132,0x1133,0x1134,0x1140,0x1141,0x1142,0x1143,0x1144,0x1150,0x1151,0x1152,
        0x1153,0x1154,
        ###
-       0x8100,0x8101,0x8110,0x8111
+#      0x8100,0x8101,0x8110,0x8111
        );
 
     foreach my $p (0..3) {
@@ -79,43 +79,48 @@ while(1) {
        }
     }
 
-    my @rich_boards =(0x3000,0x3001,0x3002,0x3003,0x3004,0x3010,0x3011,0x3012,0x3013,0x3014,0x3020,
-                     0x3021,0x3022,0x3023,0x3024,0x3030,0x3031,0x3032,0x3033,0x3034,0x3040,0x3041,
-                     0x3042,0x3043,0x3044,0x3050,0x3051,0x3052,0x3053,0x3054,0x8300,0x8301,0x8310,
-                     0x8311,0x8320,0x8321);
+    my @rich_boards =(
+        0x83c0,0x83c1,0x83c2,0x83c3,0x83c4,0x83c5,0x83c6,0x83c7,0x83c8,0x83c9,0x83ca
+#0x3000,0x3001,0x3002,0x3003,0x3004,0x3010,0x3011,0x3012,0x3013,0x3014,0x3020,
+#                    0x3021,0x3022,0x3023,0x3024,0x3030,0x3031,0x3032,0x3033,0x3034,0x3040,0x3041,
+#                    0x3042,0x3043,0x3044,0x3050,0x3051,0x3052,0x3053,0x3054,0x8300,0x8301,0x8310,
+#                    0x8311,0x8320,0x8321
+);
     
     
-    my @tof_boards =(0x4c00,0x4c10,0x4c20,0x4c30,0x4c31,0x4c40,0x4c50,0x8600,0x8601);
-
-    my @rpc_boards =(0x4800,0x4801,0x4802,0x4803,0x4810,0x4811,0x4812,0x4813,0x4820,0x4821,0x4822,
+    my @tof_boards =(0x4c00,0x4c10,0x4c20,0x4c30,0x4c31,0x4c40,0x4c50,0x8600,0x8601,0x4800,0x4801,0x4802,0x4803,0x4810,0x4811,0x4812,0x4813,0x4820,0x4821,0x4822,
                     0x4823,0x4830,0x4831,0x4832,0x4833,0x4840,0x4841,0x4842,0x4843,0x4850,0x4851,
-                    0x4852,0x4853,0x8400,0x8401,0x8410,0x8411,0x8420,0x8421);
+                    0x4852,0x4853,0x8400,0x8401,0x8410,0x8411);
+
+    my @rpc_boards = (
+       0x8a00,0x8a01,0x8a02,0x8a03,0x8a04,0x8a05,
+       );
 
     my @other_boards =(
        #shower
-       0x3200,0x3201,0x3202,0x3210,0x3211,0x3212,0x3220,0x3221,0x3222,0x3230,0x3231,0x3232,0x3240,0x3241,0x3242,
-       0x3250,0x3251,0x3252,
+#      0x3200,0x3201,0x3202,0x3210,0x3211,0x3212,0x3220,0x3221,0x3222,0x3230,0x3231,0x3232,0x3240,0x3241,0x3242,
+#      0x3250,0x3251,0x3252,
        #shower-hub
 #      0x8500,0x8501,
        #cts
        0x0002,0x0003,
        #central hub
-       0x8000,0x8001,
+       0x8000,0x8012,0x8013,0x8015,0x8016,0x8017,0x8018,
        #start/veto
-       0x4000,
+#      0x4000,
        #start/veto hub
-       0x8800,0x8801,
+       0x8800,
        #fw
        0x4400,0x4410,0x4420,
        #fw hub
        0x8700,0x8701,
        #Pion
-       0x8900,0x3800,0x3801,
-       0x8910,0x3810,0x3811,
+#      0x8900,0x3800,0x3801,
+#      0x8910,0x3810,0x3811,
        #Start TRB3
-       0x8880,0x5000,0x5002,0x5003,
+#      0x8880,0x5000,0x5002,0x5003,
        #Hodo TRB3
-       0x8890,0x5010,0x5011,0x5012,0x5013
+#      0x8890,0x5010,0x5011,0x5012,0x5013
        );
 
     ###strip the register value
@@ -138,7 +143,7 @@ while(1) {
     my $num_mdc_mistake = (scalar @{$mdc_results[4]});
     my @sorted_mdc_results = sort @{$mdc_results[2]};
 
-    my $title    = "MDC system";
+    my $title    = "MDC";
     my $value    = "OK";
     if ($num_mdc_missing > 0) {$value = "$num_mdc_missing missing";} 
     if ($num_mdc_mistake > 0) {$value = "Check Script";} 
@@ -170,7 +175,7 @@ while(1) {
     my $num_rich_mistake = (scalar @{$rich_results[4]});
     my @sorted_rich_results = sort @{$rich_results[2]};
 
-    my $rich_title    = "RICH system";
+    my $rich_title    = "RICH";
     my $rich_value    = "OK";
     if ($num_rich_missing > 0) {$rich_value = "$num_rich_missing missing";} 
     if ($num_rich_mistake > 0) {$rich_value = "Check Script";} 
@@ -203,7 +208,7 @@ while(1) {
     my $num_tof_mistake = (scalar @{$tof_results[4]});
     my @sorted_tof_results = sort @{$tof_results[2]};
 
-    my $tof_title    = "TOF system";
+    my $tof_title    = "TOF/RPC";
     my $tof_value    = "OK";
     if ($num_tof_missing > 0) {$tof_value = "$num_tof_missing missing";} 
     if ($num_tof_mistake > 0) {$tof_value = "Check Script";} 
@@ -213,7 +218,7 @@ while(1) {
     if ($num_tof_mistake > 0) {$tof_longtext .= " Endp @{$tof_results[4]} not known";} 
 
     $qastate = QA::GetQAState('below',$num_tof_missing,@QA::TofEndpMissingLimits);
-    Hmon::Speak('tofmiss',"$num_tof_missing Tof Frontends missing") if($qastate > 60);
+    Hmon::Speak('tofmiss',"$num_tof_missing Tof/Rpc Frontends missing") if($qastate > 60);
     QA::WriteQALog($flog,"endp","tof",$waittime,$qastate,
                   $tof_title,$tof_value,$tof_longtext);
     if($qastate > 60) {
@@ -237,7 +242,7 @@ while(1) {
     my $num_rpc_mistake = (scalar @{$rpc_results[4]});
     my @sorted_rpc_results = sort @{$rpc_results[2]};
 
-    my $rpc_title    = "RPC system";
+    my $rpc_title    = "ECal";
     my $rpc_value    = "OK";
     if ($num_rpc_missing > 0) {$rpc_value = "$num_rpc_missing missing";} 
     if ($num_rpc_mistake > 0) {$rpc_value = "Check Script";} 
@@ -246,7 +251,7 @@ while(1) {
     if ($num_rpc_mistake > 0) {$rpc_longtext .= " Endp @{$rpc_results[4]} not known";} 
 
     $qastate = QA::GetQAState('below',$num_rpc_missing,@QA::RpcEndpMissingLimits);
-    Hmon::Speak('rpcmiss',"$num_rpc_missing RPC Frontends missing") if($qastate > 60);
+    Hmon::Speak('rpcmiss',"$num_rpc_missing ECal Frontends missing") if($qastate > 60);
     QA::WriteQALog($flog,"endp","rpc",$waittime,$qastate,
                   $rpc_title,$rpc_value,$rpc_longtext);
     if($qastate > 60) {

diff --git a/hmon/permanent/hmon_cpu.pl b/hmon/permanent/hmon_cpu.pl
index f6878b18c56700de2034b8aa5ee76729a6924c9f..5a960e935c3ad5a598e49fc6b98fa73e57a60d16 100755 (executable)
--- a/hmon/permanent/hmon_cpu.pl
+++ b/hmon/permanent/hmon_cpu.pl
@@ -30,8 +30,9 @@ my $fqa = QA::OpenQAFile();
 #     irq: servicing interrupts
 #     softirq: servicing softirqs
 
-#my @srv = qw(lxhadeb01 lxhadeb02 lxhadeb03 lxhadeb04 lxhadeb05 lxhadeb06 lxhadesdaq hadesdaq01 hadesdaq02 hades30 hades31 hades33);
-my @srv = qw(lxhadeb02 lxhadeb03 lxhadeb04 lxhadeb05 lxhadeb06 lxhadeb07 lxhadesdaq hadesdaq01 hadesdaq02 hades30 hadesp31 hades33);
+#my @srv = qw(lxhadeb01 lxhadeb02 lxhadeb03 lxhadeb04 lxhadeb05 lxhadeb06 lxhadesdaq hadesdaq01 hadesdaq02 hades30 hades31 hades33); #dcs02-07
+my @srv = qw(lxhadeb02 lxhadeb03 lxhadeb04 lxhadeb05 lxhadeb06 lxhadeb07 lxhadesdaq hadesdaqp02 hadesdaq03 hadesdaq04 hades30 hadesp31 hades33 
+lxhaddcs03 lxhaddcs04 lxhaddcs05 lxhaddcs06);
 
 
 my $template .= "\n<table class=\"colorfields\">\n<tr><th>";
@@ -65,7 +66,7 @@ while(1) {
   my $maxstr = "";
   my $busystr = "";
   if (defined $laststore->{0}->{0}->{'idle'}) {
-    $str = Hmon::MakeTitle(7,8,"Server CPU Usage");
+    $str = Hmon::MakeTitle(7,12,"Server CPU Usage");
     $str .= $template;
     for(my $s = 0; $s < scalar @srv; $s++) {
       $str .= "\n<tr><th class=\"title\">$srv[$s]";

diff --git a/hmon/permanent/hmon_trbnet.pl b/hmon/permanent/hmon_trbnet.pl
index 6d1beb1f79c60967fd981cf939d84f4f1306d0e8..725f080abcab60a6eefc043a8028358096345eb0 100755 (executable)
--- a/hmon/permanent/hmon_trbnet.pl
+++ b/hmon/permanent/hmon_trbnet.pl
@@ -10,7 +10,7 @@ my $fqa = QA::OpenQAFile();
 
 my $qastate = QA::OK;
 my $lastqastate = QA::OK;
-my $cmd = "trbcmd r 0x8001 0 2>&1";
+my $cmd = "trbcmd r 0x8013 0 2>&1";
 my $msg;
 my $status = "OK";
 my @out;
@@ -66,4 +66,4 @@ while(1) {
     }
        $lastqastate = $qastate;
        sleep 1;
-       }
\ No newline at end of file
+       }

diff --git a/hub/addresses_hub_trb3sc.db b/hub/addresses_hub_trb3sc.db
index 48b56d1d385efdf72f31b928b664e30791a5f031..740fcc24bc710a9e7c1f5e0ac63dc029f3124663 100644 (file)
--- a/hub/addresses_hub_trb3sc.db
+++ b/hub/addresses_hub_trb3sc.db
@@ -1,34 +1,34 @@
 #Address  #   S/N   #   FPGA  #   Design  #  TRB  #
 ###################################################
 #Central
-0x8000        161         1          0        0
+0x8000        1611         1          0        0
 #0x8010          0         1          0        0 #not used slot
-0x8800        142         1          0        0  #has GbE for CTS
-0x8012        157         1          0        0
-0x8013        149         1          0        0
+0x8800        1421         1          0        0
+0x8012        1571         1          0        0
+0x8013        1491         1          0        0
 #0x8014          0         1          0        0 #not used slot
-0x8015        155         1          0        0
-0x8016        160         1          0        0
-0x8017        156         1          0        0
-0x8018        146         1          0        0
+0x8015        1551         1          0        0
+0x8016        1601         1          0        0
+0x8017        1561         1          0        0
+0x8018        1461         1          0        0
 
 #Ecal
-0x8a00        134         1          0        0
-0x8a01          9         1          0        0
-0x8a02        130         1          0        0
-0x8a03        128         1          0        0
-0x8a04        131         1          0        0
-0x8a05        129         1          0        0
+0x8a00        1341         1          0        0
+0x8a01        0091         1          0        0
+0x8a02        1301         1          0        0
+0x8a03        1281         1          0        0
+0x8a04        1311         1          0        0
+0x8a05        1291         1          0        0
 
 #Rich
- 0x83c0        158        1          0        0
- 0x83c1        144        1          0        0
- 0x83c2        139        1          0        0
- 0x83c3        138        1          0        0
- 0x83c4        162        1          0        0
- 0x83c5        164        1          0        0
- 0x83c6        166        1          0        0
- 0x83c7        137        1          0        0
- 0x83c8        163        1          0        0
- 0x83c9        153        1          0        0
- 0x83ca        136        1          0        0
+ 0x83c0        1581        1          0        0
+ 0x83c1        1441        1          0        0
+ 0x83c2        1391        1          0        0
+ 0x83c3        1381        1          0        0
+ 0x83c4        1621        1          0        0
+ 0x83c5        1641        1          0        0
+ 0x83c6        1661        1          0        0
+ 0x83c7        1371        1          0        0
+ 0x83c8        1631        1          0        0
+ 0x83c9        1531        1          0        0
+ 0x83ca        1361        1          0        0

diff --git a/hub/configure_ports.script b/hub/configure_ports.script
index 3f8dbbe8eb137bae243c83a2637c76994b278842..16421a85e5804283818e4bec6e892bfb462b3496 100644 (file)
--- a/hub/configure_ports.script
+++ b/hub/configure_ports.script
@@ -1,187 +1,177 @@
 #Temporary: remove all other hubs in network from CTS hub despite used hub
 
-  trbcmd w 0x8001 0xc0 0xff81
-  trbcmd w 0x8001 0xc1 0xff81
-  trbcmd w 0x8001 0xc3 0xff81
-  trbcmd w 0x8002 0xc0 0xff81
-  trbcmd w 0x8002 0xc1 0xff81
-  trbcmd w 0x8002 0xc3 0xff81
-  trbcmd w 0x8003 0xc0 0xffff
-  trbcmd w 0x8003 0xc1 0xffff
-  trbcmd w 0x8003 0xc3 0xffff
-  trbcmd w 0x8004 0xc0 0xffff
-  trbcmd w 0x8004 0xc1 0xffff
-  trbcmd w 0x8004 0xc3 0xffff
-  trbcmd w 0x8000 0xc0 0xff37
-  trbcmd w 0x8000 0xc1 0xff37
-  trbcmd w 0x8000 0xc3 0xff37
-
-
-!ifdef RICH
-  trbcmd setbit 0x8001 0xc0 0x0070
-  trbcmd setbit 0x8001 0xc1 0x0070
-  trbcmd setbit 0x8001 0xc3 0x0070
-!endif
-
-!ifdef TOF
-  trbcmd setbit 0x8002 0xc0 0x0002
-  trbcmd setbit 0x8002 0xc1 0x0002
-  trbcmd setbit 0x8002 0xc3 0x0002
-!endif
-
-!ifdef RPC
-  trbcmd setbit 0x8001 0xc0 0x000e
-  trbcmd setbit 0x8001 0xc1 0x000e
-  trbcmd setbit 0x8001 0xc3 0x000e
-!endif
-
-!ifdef SHOWER
-  trbcmd setbit 0x8000 0xc0 0x0008
-  trbcmd setbit 0x8000 0xc1 0x0008
-  trbcmd setbit 0x8000 0xc3 0x0008
-!endif
-
-!ifdef WALL
-!endif
-  trbcmd setbit 0x8002 0xc0 0x0008
-  trbcmd setbit 0x8002 0xc1 0x0008
-  trbcmd setbit 0x8002 0xc3 0x0008
-
-# 
-# !ifdef MDC12
-#   trbcmd setbit 0x8001 0xc0 0x0008
-#   trbcmd setbit 0x8001 0xc1 0x0008
-#   trbcmd setbit 0x8001 0xc3 0x0008
-# !endif
-# 
-# !ifdef MDC34
-#   trbcmd setbit 0x8001 0xc0 0x0010
-#   trbcmd setbit 0x8001 0xc1 0x0010
-#   trbcmd setbit 0x8001 0xc3 0x0010
-# !endif
-# 
-# !ifdef MDC134
-#   trbcmd setbit 0x8001 0xc0 0x0018
-#   trbcmd setbit 0x8001 0xc1 0x0018
-#   trbcmd setbit 0x8001 0xc3 0x0018
-#   
-#   trbcmd clearbit 0x8101 0xc0 0x44
-#   trbcmd clearbit 0x8101 0xc1 0x44
-#   trbcmd clearbit 0x8101 0xc3 0x44
-#   trbcmd clearbit 0x1000 0xc0 0x0c
-#   trbcmd clearbit 0x1000 0xc1 0x0c
-#   trbcmd clearbit 0x1000 0xc3 0x0c
-#   trbcmd clearbit 0x1040 0xc0 0x0c
-#   trbcmd clearbit 0x1040 0xc1 0x0c
-#   trbcmd clearbit 0x1040 0xc3 0x0c
-# !endif
-# 
-# !ifdef MDC234
-#   trbcmd setbit 0x8001 0xc0 0x0018
-#   trbcmd setbit 0x8001 0xc1 0x0018
-#   trbcmd setbit 0x8001 0xc3 0x0018
-#   
-#   trbcmd clearbit 0x8101 0xc0 0x18
-#   trbcmd clearbit 0x8101 0xc1 0x18
-#   trbcmd clearbit 0x8101 0xc3 0x18
-#   trbcmd clearbit 0x1000 0xc0 0x03
-#   trbcmd clearbit 0x1000 0xc1 0x03
-#   trbcmd clearbit 0x1000 0xc3 0x03
-#   trbcmd clearbit 0x1040 0xc0 0x03
-#   trbcmd clearbit 0x1040 0xc1 0x03
-#   trbcmd clearbit 0x1040 0xc3 0x03
-# !endif
-# 
-# !ifdef MDC234_p1s24
-#   trbcmd setbit 0x8001 0xc0 0x0018
-#   trbcmd setbit 0x8001 0xc1 0x0018
-#   trbcmd setbit 0x8001 0xc3 0x0018
-#   
-#   trbcmd clearbit 0x8101 0xc0 0x10
-#   trbcmd clearbit 0x8101 0xc1 0x10
-#   trbcmd clearbit 0x8101 0xc3 0x10
-#   trbcmd clearbit 0x1030 0xc0 0x03
-#   trbcmd clearbit 0x1030 0xc1 0x03
-#   trbcmd clearbit 0x1030 0xc3 0x03
-#   trbcmd clearbit 0x1040 0xc0 0x03
-#   trbcmd clearbit 0x1040 0xc1 0x03
-#   trbcmd clearbit 0x1040 0xc3 0x03
-# !endif
-# 
-# !ifdef MDC234_p1s25
-#   trbcmd setbit 0x8001 0xc0 0x0018
-#   trbcmd setbit 0x8001 0xc1 0x0018
-#   trbcmd setbit 0x8001 0xc3 0x0018
-#   
-#   trbcmd clearbit 0x1000 0xc0 0x03
-#   trbcmd clearbit 0x1000 0xc1 0x03
-#   trbcmd clearbit 0x1000 0xc3 0x03
-#   trbcmd clearbit 0x1020 0xc0 0x03
-#   trbcmd clearbit 0x1020 0xc1 0x03
-#   trbcmd clearbit 0x1020 0xc3 0x03
-#   trbcmd clearbit 0x1030 0xc0 0x03
-#   trbcmd clearbit 0x1030 0xc1 0x03
-#   trbcmd clearbit 0x1030 0xc3 0x03     
-#   trbcmd clearbit 0x1040 0xc0 0x03
-#   trbcmd clearbit 0x1040 0xc1 0x03
-#   trbcmd clearbit 0x1040 0xc3 0x03
-# !endif
-# 
-# !ifdef MDC234_p1s1245
-#   trbcmd setbit 0x8001 0xc0 0x0018
-#   trbcmd setbit 0x8001 0xc1 0x0018
-#   trbcmd setbit 0x8001 0xc3 0x0018
-#     
-# #  trbcmd clearbit 0x1000 0xc0 0x03
-# #  trbcmd clearbit 0x1000 0xc1 0x03
-# #  trbcmd clearbit 0x1000 0xc3 0x03
-# 
-#   trbcmd clearbit 0x1020 0xc0 0x03
-#   trbcmd clearbit 0x1020 0xc1 0x03
-#   trbcmd clearbit 0x1020 0xc3 0x03
-#    
-#   trbcmd clearbit 0x1040 0xc0 0x03
-#   trbcmd clearbit 0x1040 0xc1 0x03
-#   trbcmd clearbit 0x1040 0xc3 0x03
-# !endif
-
-# 
-# !ifdef MDC234_p1s1245_p34s2
-#   trbcmd setbit 0x8001 0xc0 0x0018
-#   trbcmd setbit 0x8001 0xc1 0x0018
-#   trbcmd setbit 0x8001 0xc3 0x0018
-#     
-#   trbcmd clearbit 0x8111 0xc0 0x04
-#   trbcmd clearbit 0x8111 0xc1 0x04
-#   trbcmd clearbit 0x8111 0xc3 0x04
-# 
-#   trbcmd clearbit 0x1020 0xc0 0x03
-#   trbcmd clearbit 0x1020 0xc1 0x03
-#   trbcmd clearbit 0x1020 0xc3 0x03
-#    
-#   trbcmd clearbit 0x1040 0xc0 0x03
-#   trbcmd clearbit 0x1040 0xc1 0x03
-#   trbcmd clearbit 0x1040 0xc3 0x03
-# !endif
-
-
-!ifdef MDC
-  trbcmd setbit 0x8000 0xc0 0x00c0
-  trbcmd setbit 0x8000 0xc1 0x00c0
-  trbcmd setbit 0x8000 0xc3 0x00c0
-!endif
-
-!ifdef STARTCTS
-  trbcmd setbit 0x8002 0xc0 0x0004
-  trbcmd setbit 0x8002 0xc1 0x0004
-  trbcmd setbit 0x8002 0xc3 0x0004
-!endif
-
-trbcmd clearbit 0x8a00 0xc0 0x000c
-trbcmd clearbit 0x8a00 0xc1 0x000c
-trbcmd clearbit 0x8a00 0xc3 0x000c
+#  trbcmd w 0x8001 0xc0 0xff81
+#  trbcmd w 0x8001 0xc1 0xff81
+#  trbcmd w 0x8001 0xc3 0xff81
+#  trbcmd w 0x8002 0xc0 0xff81
+#  trbcmd w 0x8002 0xc1 0xff81
+#  trbcmd w 0x8002 0xc3 0xff81
+#  trbcmd w 0x8003 0xc0 0xffff
+#  trbcmd w 0x8003 0xc1 0xffff
+#  trbcmd w 0x8003 0xc3 0xffff
+#  trbcmd w 0x8004 0xc0 0xffff
+#  trbcmd w 0x8004 0xc1 0xffff
+#  trbcmd w 0x8004 0xc3 0xffff
+#  trbcmd w 0x8000 0xc0 0xff37
+#  trbcmd w 0x8000 0xc1 0xff37
+#  trbcmd w 0x8000 0xc3 0xff37
+#
+#
+#!ifdef RICH
+#  trbcmd setbit 0x8001 0xc0 0x0070
+#  trbcmd setbit 0x8001 0xc1 0x0070
+#  trbcmd setbit 0x8001 0xc3 0x0070
+#!endif
+#
+#!ifdef TOF
+#  trbcmd setbit 0x8002 0xc0 0x0002
+#  trbcmd setbit 0x8002 0xc1 0x0002
+#  trbcmd setbit 0x8002 0xc3 0x0002
+#!endif
+#
+#!ifdef RPC
+#  trbcmd setbit 0x8001 0xc0 0x000e
+#  trbcmd setbit 0x8001 0xc1 0x000e
+#  trbcmd setbit 0x8001 0xc3 0x000e
+#!endif
 
+#!ifdef WALL
+#!endif
+#  trbcmd setbit 0x8002 0xc0 0x0008
+#  trbcmd setbit 0x8002 0xc1 0x0008
+#  trbcmd setbit 0x8002 0xc3 0x0008
+#
+## 
+## !ifdef MDC12
+##   trbcmd setbit 0x8001 0xc0 0x0008
+##   trbcmd setbit 0x8001 0xc1 0x0008
+##   trbcmd setbit 0x8001 0xc3 0x0008
+## !endif
+## 
+## !ifdef MDC34
+##   trbcmd setbit 0x8001 0xc0 0x0010
+##   trbcmd setbit 0x8001 0xc1 0x0010
+##   trbcmd setbit 0x8001 0xc3 0x0010
+## !endif
+## 
+## !ifdef MDC134
+##   trbcmd setbit 0x8001 0xc0 0x0018
+##   trbcmd setbit 0x8001 0xc1 0x0018
+##   trbcmd setbit 0x8001 0xc3 0x0018
+##   
+##   trbcmd clearbit 0x8101 0xc0 0x44
+##   trbcmd clearbit 0x8101 0xc1 0x44
+##   trbcmd clearbit 0x8101 0xc3 0x44
+##   trbcmd clearbit 0x1000 0xc0 0x0c
+##   trbcmd clearbit 0x1000 0xc1 0x0c
+##   trbcmd clearbit 0x1000 0xc3 0x0c
+##   trbcmd clearbit 0x1040 0xc0 0x0c
+##   trbcmd clearbit 0x1040 0xc1 0x0c
+##   trbcmd clearbit 0x1040 0xc3 0x0c
+## !endif
+## 
+## !ifdef MDC234
+##   trbcmd setbit 0x8001 0xc0 0x0018
+##   trbcmd setbit 0x8001 0xc1 0x0018
+##   trbcmd setbit 0x8001 0xc3 0x0018
+##   
+##   trbcmd clearbit 0x8101 0xc0 0x18
+##   trbcmd clearbit 0x8101 0xc1 0x18
+##   trbcmd clearbit 0x8101 0xc3 0x18
+##   trbcmd clearbit 0x1000 0xc0 0x03
+##   trbcmd clearbit 0x1000 0xc1 0x03
+##   trbcmd clearbit 0x1000 0xc3 0x03
+##   trbcmd clearbit 0x1040 0xc0 0x03
+##   trbcmd clearbit 0x1040 0xc1 0x03
+##   trbcmd clearbit 0x1040 0xc3 0x03
+## !endif
+## 
+## !ifdef MDC234_p1s24
+##   trbcmd setbit 0x8001 0xc0 0x0018
+##   trbcmd setbit 0x8001 0xc1 0x0018
+##   trbcmd setbit 0x8001 0xc3 0x0018
+##   
+##   trbcmd clearbit 0x8101 0xc0 0x10
+##   trbcmd clearbit 0x8101 0xc1 0x10
+##   trbcmd clearbit 0x8101 0xc3 0x10
+##   trbcmd clearbit 0x1030 0xc0 0x03
+##   trbcmd clearbit 0x1030 0xc1 0x03
+##   trbcmd clearbit 0x1030 0xc3 0x03
+##   trbcmd clearbit 0x1040 0xc0 0x03
+##   trbcmd clearbit 0x1040 0xc1 0x03
+##   trbcmd clearbit 0x1040 0xc3 0x03
+## !endif
+## 
+## !ifdef MDC234_p1s25
+##   trbcmd setbit 0x8001 0xc0 0x0018
+##   trbcmd setbit 0x8001 0xc1 0x0018
+##   trbcmd setbit 0x8001 0xc3 0x0018
+##   
+##   trbcmd clearbit 0x1000 0xc0 0x03
+##   trbcmd clearbit 0x1000 0xc1 0x03
+##   trbcmd clearbit 0x1000 0xc3 0x03
+##   trbcmd clearbit 0x1020 0xc0 0x03
+##   trbcmd clearbit 0x1020 0xc1 0x03
+##   trbcmd clearbit 0x1020 0xc3 0x03
+##   trbcmd clearbit 0x1030 0xc0 0x03
+##   trbcmd clearbit 0x1030 0xc1 0x03
+##   trbcmd clearbit 0x1030 0xc3 0x03     
+##   trbcmd clearbit 0x1040 0xc0 0x03
+##   trbcmd clearbit 0x1040 0xc1 0x03
+##   trbcmd clearbit 0x1040 0xc3 0x03
+## !endif
+## 
+## !ifdef MDC234_p1s1245
+##   trbcmd setbit 0x8001 0xc0 0x0018
+##   trbcmd setbit 0x8001 0xc1 0x0018
+##   trbcmd setbit 0x8001 0xc3 0x0018
+##     
+## #  trbcmd clearbit 0x1000 0xc0 0x03
+## #  trbcmd clearbit 0x1000 0xc1 0x03
+## #  trbcmd clearbit 0x1000 0xc3 0x03
+## 
+##   trbcmd clearbit 0x1020 0xc0 0x03
+##   trbcmd clearbit 0x1020 0xc1 0x03
+##   trbcmd clearbit 0x1020 0xc3 0x03
+##    
+##   trbcmd clearbit 0x1040 0xc0 0x03
+##   trbcmd clearbit 0x1040 0xc1 0x03
+##   trbcmd clearbit 0x1040 0xc3 0x03
+## !endif
+#
+## 
+## !ifdef MDC234_p1s1245_p34s2
+##   trbcmd setbit 0x8001 0xc0 0x0018
+##   trbcmd setbit 0x8001 0xc1 0x0018
+##   trbcmd setbit 0x8001 0xc3 0x0018
+##     
+##   trbcmd clearbit 0x8111 0xc0 0x04
+##   trbcmd clearbit 0x8111 0xc1 0x04
+##   trbcmd clearbit 0x8111 0xc3 0x04
+## 
+##   trbcmd clearbit 0x1020 0xc0 0x03
+##   trbcmd clearbit 0x1020 0xc1 0x03
+##   trbcmd clearbit 0x1020 0xc3 0x03
+##    
+##   trbcmd clearbit 0x1040 0xc0 0x03
+##   trbcmd clearbit 0x1040 0xc1 0x03
+##   trbcmd clearbit 0x1040 0xc3 0x03
+## !endif
+#
+#
+#!ifdef MDC
+#  trbcmd setbit 0x8000 0xc0 0x00c0
+#  trbcmd setbit 0x8000 0xc1 0x00c0
+#  trbcmd setbit 0x8000 0xc3 0x00c0
+#!endif
+#
+#!ifdef STARTCTS
+#  trbcmd setbit 0x8002 0xc0 0x0004
+#  trbcmd setbit 0x8002 0xc1 0x0004
+#  trbcmd setbit 0x8002 0xc3 0x0004
+#!endif
+#
 
 #Remove both SCS from Trigger Distribution
-trbcmd clearbit 0x8000 0xc0 0x20 #remove pexor from trigger
-trbcmd clearbit 0x8000 0xc1 0x20
+trbcmd clearbit 0x8000 0xc0 0x200 #remove pexor from trigger
+trbcmd clearbit 0x8000 0xc1 0x200

diff --git a/hub/serials_trb3sc.db b/hub/serials_trb3sc.db
new file mode 100644 (file)
index 0000000..a37e891
--- /dev/null
+++ b/hub/serials_trb3sc.db
@@ -0,0 +1,81 @@
+#List of all serial numbers for TRB3sc. 3-digit serial, append a '1'
+
+#  Serial    #  Unique ID
+########################################
+
+   0011        0x610000050dec4328
+   0021        0x820000050dec0a28
+   0031        0xb00000050d277128
+   0041        0x7a0000050df02428
+   0051        0xff0000050de7e528 
+   0061        0x0000000000000000
+   0071        0xfc000006e90e8828
+   0081        0x67000006ea309a28
+   0091        0xf1000006e919a128
+   0101        0x5d000006e913bc28
+
+   1051        0x8400000941031228
+   1061        0xb300000941031328
+   1071        0xb000000940ce5228
+   1081        0xcd00000940ce5e28
+   1091        0x3500000940ce5528
+
+   1101        0xfc00000940ce6a28
+   1111        0x3f000009408c2e28
+   1131        0x4f000009408a9b28
+   1141        0x2000000940c1e928
+   1151        0x6f000009409d7428
+   1161        0xcc000009409d6f28
+   1171        0xf600000940c29928
+   1191        0x7100000940c28d28
+
+   1201        0xc100000940c29828
+   1211        0x4600000940c28c28   
+   1231        0x3b00000940c28028
+   1241        0x7d00000940880b28
+   1251        0xb1000009409d6328
+   1261        0x0200000940881428
+   1271        0x9b00000940876628
+   1281        0x0d00000940876f28
+   1291        0x9a00000940a5da28
+
+   1301        0x1d00000940a5ce28
+   1311        0xf600000940a5cb28
+   1321        0x6f00000940a61528
+   1331        0xea00000940a61228
+   1341        0x120000094094a928
+   1361        0xb100000940d69628
+   1371        0x4900000940a60928
+   1381        0x7700000940956828
+   1391        0x6100000940df2928
+
+   1401        0x6d00000940a60628
+   1411        0xa900000940a5fd28
+   1421        0x2c00000940a5fa28
+   1431        0x1600000940a63f28
+   1441        0x5c00000940a63228
+   1451        0xc300000940955b28
+   1461        0x4d00000940a62f28
+   1471        0x1c00000940a66028
+   1481        0x4600000940955c28
+   1491        0x3b00000940955028
+
+   1501        0x4f0000094093c328
+   1511        0x4400000940954f28
+   1531        0x3c0000094093b628
+   1541        0x1a0000094093aa28
+   1551        0x5600000940939228
+   1561        0x0f00000940939128
+   1571        0x430000094093a928
+   1581        0x2b00000940939e28
+   1591        0x7200000940939d28
+
+   1601        0xcd00000940943b28
+   1611        0xd100000940938628
+   1621        0x4800000940943c28
+   1631        0x840000094117ff28
+   1641        0x250000094117f728
+   1651        0xce0000094117f228
+   1661        0xf300000941240528
+   
+

diff --git a/hub/startup.script b/hub/startup.script
index 24698ae62908ad9810332627236171830151de84..6ed043f816f170f2851980ff02944de1d562afda 100644 (file)
--- a/hub/startup.script
+++ b/hub/startup.script
@@ -1,13 +1,12 @@
 #Assign addresses
 !ifndef RESTART 
   set_addresses  serials_hub.db  addresses_hub.db     #addresses for hubs
-  set_addresses  ../../daqtools/base/serials_trb3sc.db  addresses_hub_trb3sc.db     #addresses for hubs
+  set_addresses  serials_trb3sc.db  addresses_hub_trb3sc.db     #addresses for hubs
   set_addresses  serials_mdcaddon.db  addresses_mdcaddon.db     #addresses for addons  
 !endif
 wait
 
 #Switch off unused parts of the network
-
 exec_script{pexor}  ../hub/configure_ports.script
 
 
@@ -22,12 +21,17 @@ wait
 !endif
 
 #Remove TRB3 from this   - TODO needs update
-  trbcmd clearbit 0x8003 0xc3 0x01e   
-  trbcmd clearbit 0x8701 0xc3 0x020
-  trbcmd w 0xff7f 0x8000 0x8000
-  trbcmd w 0xff7f 0x8000 0x0000
-  trbcmd setbit 0x8003 0xc3 0x01e
-  trbcmd setbit 0x8701 0xc3 0x020
+  trbcmd w 0xfe11 0x8000 0x8000
+  trbcmd w 0x8400 0x8000 0x8000
+  trbcmd w 0x8410 0x8000 0x8000
+  trbcmd w 0x8600 0x8000 0x8000
+  trbcmd w 0x8700 0x8000 0x8000
+  trbcmd w 0xfe11 0x8000 0x0000
+  trbcmd w 0x8400 0x8000 0x0000
+  trbcmd w 0x8410 0x8000 0x0000
+  trbcmd w 0x8600 0x8000 0x0000
+  trbcmd w 0x8700 0x8000 0x0000
+  
 
 
 # Timeout setting for all hubs
@@ -35,53 +39,48 @@ wait
   trbcmd w 0xfe11 0xc5 0x1000
   trbcmd w 0xfc00 0xc5 0xffff
   trbcmd w 0x8000 0xc5 0x5000
-  trbcmd w 0x8001 0xc5 0x5000
 
 # Set the maximum subevents in the queue for TRB3s
-  trbcmd w 0x8900 0x830e 0x4
-  trbcmd w 0x8910 0x830e 0x4
-  trbcmd w 0x8880 0x830e 0x4
-  trbcmd w 0x8890 0x830e 0x4
+#  trbcmd w 0x8900 0x830e 0x4
+#  trbcmd w 0x8910 0x830e 0x4
+# trbcmd w 0x8880 0x830e 0x4
+#  trbcmd w 0x8890 0x830e 0x4
   
 #Load hub level setting for time-out for each hub in the system  
-  trbcmd loadbit 0xfe11 0xc5 0xffff0000 0x80300000  #with new hub (with auto-switch-off)
 
-  trbcmd loadbit 0xfe15 0xc5 0xffff0000 0x00080000
-  trbcmd loadbit 0xfe23 0xc5 0xffff0000 0x00080000
-  trbcmd loadbit 0x8890 0xc5 0xffff0000 0x00080000
+  trbcmd loadbit 0xfe52 0xc5 0xffff0000 0x00080000  #Combiner
+
+  trbcmd loadbit 0xfe61 0xc5 0xffff0000 0x00080000  #Ecal bkpl master
+ 
+  trbcmd loadbit 0xfe11 0xc5 0xffff0000 0x80300000  #with new hub (with auto-switch-off)
+  trbcmd loadbit 0xfe15 0xc5 0xffff0000 0x00080000  #MDC hubs
+  
+  trbcmd loadbit 0xfe66 0xc5 0xffff0000 0x00040000  #trb3sc gbe nobkpl RICH
   
-  trbcmd loadbit 0x8101 0xc5 0xffff0000 0x00060000
-  trbcmd loadbit 0x8111 0xc5 0xffff0000 0x00060000
-  trbcmd loadbit 0x8301 0xc5 0xffff0000 0x80260000  #new design 2014-08-18
-  trbcmd loadbit 0x8311 0xc5 0xffff0000 0x80260000  #new design 2014-08-18
-  trbcmd loadbit 0x8321 0xc5 0xffff0000 0x80260000  #new design 2014-08-18
   trbcmd loadbit 0x8401 0xc5 0xffff0000 0x00060000
   trbcmd loadbit 0x8411 0xc5 0xffff0000 0x00060000
-  trbcmd loadbit 0x8421 0xc5 0xffff0000 0x00060000
-  trbcmd loadbit 0x8501 0xc5 0xffff0000 0x00060000
   trbcmd loadbit 0x8601 0xc5 0xffff0000 0x00060000
   trbcmd loadbit 0x8701 0xc5 0xffff0000 0x00060000
-  trbcmd loadbit 0x8801 0xc5 0xffff0000 0x00060000
-  
 
-  trbcmd loadbit 0x8100 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8110 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8300 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8310 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8320 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8400 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8410 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8420 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8500 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8600 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8700 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8800 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8880 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8900 0xc5 0xffff0000 0x00040000
-  trbcmd loadbit 0x8910 0xc5 0xffff0000 0x00040000
-  
-  trbcmd loadbit 0x8001 0xc5 0xffff0000 0x00020000
-  trbcmd loadbit 0x8002 0xc5 0xffff0000 0x00020000
-  trbcmd loadbit 0x8003 0xc5 0xffff0000 0x00020000
-  trbcmd loadbit 0x8004 0xc5 0xffff0000 0x00020000
+  trbcmd loadbit 0x8400 0xc5 0xffff0000 0x00040000  #rpc
+  trbcmd loadbit 0x8410 0xc5 0xffff0000 0x00040000  
+  trbcmd loadbit 0x8600 0xc5 0xffff0000 0x00040000  #tof
+  trbcmd loadbit 0x8700 0xc5 0xffff0000 0x00040000  #wall
+ 
+# trbcmd loadbit 0x8880 0xc5 0xffff0000 0x00040000 #start
+# trbcmd loadbit 0x8890 0xc5 0xffff0000 0x00040000 #veto
 
+# trbcmd loadbit 0x8900 0xc5 0xffff0000 0x00040000 #pion
+# trbcmd loadbit 0x8910 0xc5 0xffff0000 0x00040000 #pion
+  
+  trbcmd loadbit 0x8800 0xc5 0xffff0000 0x00020000
+  trbcmd loadbit 0x8012 0xc5 0xffff0000 0x00020000
+  trbcmd loadbit 0x8013 0xc5 0xffff0000 0x00020000
+  trbcmd loadbit 0x8015 0xc5 0xffff0000 0x00020000
+  trbcmd loadbit 0x8016 0xc5 0xffff0000 0x00020000
+  trbcmd loadbit 0x8017 0xc5 0xffff0000 0x00020000  
+  trbcmd loadbit 0x8018 0xc5 0xffff0000 0x00020000
+  
+  trbcmd loadbit 0x8000 0xc5 0xffff0000 0x00000000
+  
+  

diff --git a/main/main_hades.script b/main/main_hades.script
index 9750215da57e549ff38539515235320d818ca068..b766f76cf988bbc7f59a61e019a44ca17b45e1b2 100644 (file)
--- a/main/main_hades.script
+++ b/main/main_hades.script
@@ -33,7 +33,7 @@ read_addrange_db ../main/address_range.db
 !endif
 
 !ifndef NOSTARTCTS   #Contains both Start and Veto TRBs!
-  read_trb_db ../start/trb.db
+#  read_trb_db ../start/trb.db
 !endif
 
 
@@ -114,9 +114,6 @@ wait
     exec_script{wall}  ../wall/configure_wall.script
   !endif
   
-  !ifndef NOSTARTCTS
-    exec_script{start} ../start/configure_startveto.script
-  !endif
   
   !ifndef NOTOF
     exec_script{tof}   ../tof/configure_tof.script
@@ -145,6 +142,12 @@ wait
   !endif  
   
 
+  !ifndef NOECAL
+    exec_cmd{con} echo "Configure ECAL"
+    exec_script{wall}  ../ecal/startup.script
+  !endif
+
+
 
 #Wall
   !ifndef NOWALL

diff --git a/main/startup.pl b/main/startup.pl
index fbf4064b90260886b8b11e13d2cf0bc9568a5e7a..3a54183c4860473078d6f598966b30633cffb829 100755 (executable)
--- a/main/startup.pl
+++ b/main/startup.pl
@@ -1321,7 +1321,6 @@ sub makeAddressesConf()
     #------------ Write config file for 'trbdhcp'
     my $outConf_trbdhcp = $var_dir . "/tmp/" . $outConf;
     my $ret_trbdhcp     = "/home/hadaq/tmp/" . $outConf; 
-
     $fh = new FileHandle(">$outConf_trbdhcp");
 
     foreach my $key (sort keys %$trbdhcp_href) {
@@ -1484,8 +1483,8 @@ sub checkConnection()
             }
 
             print "Try to start \'command_server -p 4712 &\' on these hosts by hand.\n";
-            print "Exit.\n";
-            exit(0);
+#             print "Exit.\n";
+#             exit(0);
         }
         else{
             print "Missing command_servers have been started! Continue...\n";
@@ -1509,7 +1508,7 @@ sub rmDeadHosts()
     
     foreach my $sys (%$trb_href){
 
-        next unless( @{$trb_href->{$sys}} && $#{$trb_href->{$sys}} > 0 );
+        next unless($trb_href->{$sys} && @{$trb_href->{$sys}} && $#{$trb_href->{$sys}} > 0 );
 
         foreach my $host (@$dead_hosts_aref){
             @{$trb_href->{$sys}} = grep { !($_ eq $host) } @{$trb_href->{$sys}};

diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh
index 5e46663f78fcc214e836cb1c392fadce1cbde830..4507aa4978c21ca5fc89e1eee94e0c5a66865b83 100755 (executable)
--- a/main/startup_briccolage.sh
+++ b/main/startup_briccolage.sh
@@ -35,18 +35,17 @@ notifyall.sh "DAQ" "<I> DAQ is going to be restarted." "STARTUP" &
 
 
 #2014-04-16 frquent reinits, still token missing 20114-08-13 CW
-switchport.pl 0x1151 8 off #2257
+#switchport.pl 0x1151 8 off #2257
 
 #Retransmission on as early as possible
-  trbcmd setbit 0xfffd 0x22 0x08000000   #enable retransmission on oep
-  trbcmd setbit 0xfe11 0x22 0x08000000   #enable retransmission on mdchub
-
+#  trbcmd setbit 0xfffd 0x22 0x08000000   #enable retransmission on oep
+#  trbcmd setbit 0xfe11 0x22 0x08000000   #enable retransmission on mdchub
 
 #Main Start-up
   echo "  <Startup>  Running Startup script"
   time ./startup.pl -f main_hades.script -eb off -o file \
-      -m TOF -m RPC -m WALL -m RICH  \
-      -m STARTCTS -m NORESET -m CONFIGONLY  -m MON_CTS \
+      -m TOF -m RPC -m WALL -m NORICH  -m WALL -m NOPION \
+      -m NOSTARTCTS -m NORESET -m CONFIGONLY  -m MON_CTS \
       -m MDC -m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv
 
 
@@ -58,7 +57,7 @@ switchport.pl 0x1151 8 off #2257
 
 
 #All calib to EB1
-trbcmd w 0x0003 0xa0f3 0xff1
+#trbcmd w 0x0003 0xa0f3 0xff1
 
 # turn off multi event queue, as these garble the data from the TRB2s
 stoptrigger.sh; trbcmd w 0xff7f 0x8307 0 ; starttrigger.sh

diff --git a/utils/allmonoff b/utils/allmonoff
index 59d580fa899696b444a53b4086f615ac6d1a3c7a..9f1cb9d37e43feeee17a7c7a42d52f3c11d7e010 100755 (executable)
--- a/utils/allmonoff
+++ b/utils/allmonoff
@@ -1,14 +1,14 @@
 #!/bin/bash
-ssh hades33 xset -display :0 dpms force off
+#ssh hades33 xset -display :0 dpms force off
 ssh hades30 xset -display :0 dpms force off
-ssh hades17 xset -display :0 dpms force off
-ssh hades25 xset -display :0 dpms force off
-ssh hades27 xset -display :0 dpms force off
-ssh hadeb04 xset -display :0 dpms force off
-ssh hadespcp001 xset -display :0 dpms force off
-ssh hadespcp004 xset -display :0 dpms force off
-ssh hadesdaq xset -display :0 dpms force off
+#ssh hades17 xset -display :0 dpms force off
+#ssh hades25 xset -display :0 dpms force off
+#ssh hades27 xset -display :0 dpms force off
+#ssh hadeb04 xset -display :0 dpms force off
+#ssh hadespcp001 xset -display :0 dpms force off
+#ssh hadespcp004 xset -display :0 dpms force off
+#ssh hadesdaq xset -display :0 dpms force off
 ssh hadaq@hades33 xset -display :0 dpms force off
-ssh hadesdaq01 xset -display :0 dpms force off
-ssh hadesdaq02 xset -display :0 dpms force off
+ssh hadesdaq03 xset -display :0 dpms force off
+ssh hadesdaq04 xset -display :0 dpms force off