Updated scripts to put list of boards into Oracle: added new tof trb3, fixed rpc...

also check in current state of other modified things

diff --git a/control/ctsmon/mon_cts.pl b/control/ctsmon/mon_cts.pl
index 26e062ea66a2d7bfcabd4743a489cf7dab14c469..77227013439faa986d3bcf1e38d848ab4d0bfa53 100755 (executable)
--- a/control/ctsmon/mon_cts.pl
+++ b/control/ctsmon/mon_cts.pl
@@ -2065,7 +2065,7 @@ sub set_registers()
        foreach my $addr (sort keys %$regs2write_href){
            my $val = &dec2hex($regs2write_href->{$addr});
 
-           my $trbcmd = "/home/hadaq/bin/trbcmd w 0x0003 0xa0" . $addr . " 0x" . $val;
+           my $trbcmd = "trbcmd w 0x0003 0xa0" . $addr . " 0x" . $val;
            print "trbcmd: $trbcmd\n";
            
            my @t = split("trbcmd w ", $trbcmd); # gk 28.03.12

diff --git a/control/gui/expert/Set_RICH_Thr b/control/gui/expert/Set_RICH_Thr
index a75331e49d1a2020be80f1a9a83dfe51074c8452..2c711868858999458de1ca4c1ed22fad744d99f7 100755 (executable)
--- a/control/gui/expert/Set_RICH_Thr
+++ b/control/gui/expert/Set_RICH_Thr
@@ -8,7 +8,8 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   echo \"  <RICH_Thr> Connected to lxhadesdaq...\"
   echo \"  <RICH_Thr> Setting Thresholds...\"
   /home/hadaq/trbsoft/hadesdaq/utils/RICH_Thr_Call.sh --loading-file /home/hadaq/hadesdaq/rich/trb_dirich_threshold/threshold_files/standard_baselines.thr -l 0 -t 0 70
-#  /home/hadaq/trbsoft/hadesdaq/utils/RICH_Thr_Call.sh --loading-file /home/hadaq/hadesdaq/rich/trb_dirich_threshold/threshold_files/standard_baselines.thr -l 0 -t 0 50
+#  /home/hadaq/trbsoft/hadesdaq/utils/RICH_Thr_Call.sh --loading-file /home/hadaq/hadesdaq/rich/trb_dirich_threshold/threshold_files/standard_baselines.thr -l 0 -n 0 1.2
+#  /home/hadaq/trbsoft/hadesdaq/utils/RICH_Thr_Call.sh --loading-file /home/hadaq/hadesdaq/rich/trb_dirich_threshold/threshold_files/standard_baselines.thr -l 0 -t 0 8
   echo \"Done\"
   sleep 10
 "

diff --git a/control/gui/monitor/30_EPICS_Power b/control/gui/monitor/30_EPICS_Power
index 7da4203325dbbf4377f6a85040097a90d514b250..b946ada792746f71ec510022f7e7a8aaefbb14ac 100755 (executable)
--- a/control/gui/monitor/30_EPICS_Power
+++ b/control/gui/monitor/30_EPICS_Power
@@ -1,2 +1,2 @@
 #!/bin/bash
-vncviewer-tigervnc -passwd /home/hadaq/.vnc/passwd_scs  lxhaddcs03:44
+vncviewer-tigervnc -shared -passwd /home/hadaq/.vnc/passwd_scs  lxhaddcs11:44

diff --git a/ecal/addresses_ecal.db b/ecal/addresses_ecal.db
index dde294a195042d3526b31358cf9c8d20e776e255..caea5762baa3ba233bbe2649133dac0fc6ef963f 100644 (file)
--- a/ecal/addresses_ecal.db
+++ b/ecal/addresses_ecal.db
@@ -24,13 +24,13 @@
     0x6025        1101         1        0        0
     0x6026        1401         1        0        0
 
-    0x6030        0         1        0        0
-    0x6031        0         1        0        0
-    0x6032        0         1        0        0
-    0x6033        0         1        0        0
-    0x6034        0         1        0        0
-    0x6035        0         1        0        0
-    0x6036        1071         1        0        0
+    0x6030        3111         1        0        0
+    0x6031        3121         1        0        0
+    0x6032        3131         1        0        0
+    0x6033        3241         1        0        0
+    0x6034        3231         1        0        0
+    0x6035        3221         1        0        0
+    0x6036        3211         1        0        0
 
     0x6040        1161         1        0        0
     0x6041        1151         1        0        0
@@ -41,7 +41,7 @@
     0x6046        1241         1        0        0
 
     0x6050        1221         1        0        0
-    0x6051        1271         1        0        0
+    0x6051        3051         1        0        0
     0x6052        1141         1        0        0
     0x6053        1191         1        0        0
     0x6054        1511         1        0        0

diff --git a/ecal/serials_trb3sc.db b/ecal/serials_trb3sc.db
deleted file mode 100644 (file)
index f969767bdb5b0b426f41feac8a9dc1ff9b91f55b..0000000000000000000000000000000000000000
--- a/ecal/serials_trb3sc.db
+++ /dev/null
@@ -1,83 +0,0 @@
-#List of all serial numbers for TRB3sc. 3-digit serial, append a '1'
-# JAM 23-03-18: comment all serials here that do not belong to ecal (for daq2stdout Oracle export)
-#  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/serials_trb3sc.db b/ecal/serials_trb3sc.db
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..7651acabd9da5412725bbcb688b0b672219b9de4
--- /dev/null
+++ b/ecal/serials_trb3sc.db
@@ -0,0 +1 @@
+../../daqtools/base/serials_trb3sc.db
\ No newline at end of file

diff --git a/ecal/startup.script b/ecal/startup.script
index b52130fdb6fada2a1be713287a9c6fa7cf925d74..7588db0dc2555109d5157ebb130eb5b79ef3b7c9 100644 (file)
--- a/ecal/startup.script
+++ b/ecal/startup.script
@@ -236,7 +236,7 @@ trbcmd w 0xfe71 0xc805 0xaaaaaaaa #invert TDCs for SLOW channels
 trbcmd w 0xfe71 0xc806 0xaaaaaaaa #invert TDCs for SLOW channels
 
 #exec_script{pexor} ../ecal/startupQFH.script #not working?
-exec_cmd{local} ../ecal/startupQFH.sh
+#exec_cmd{local} ../ecal/startupQFH.sh
 #trbcmd w 0x6036 0xc802 0x00000000 #deactivate TDCs on QFH board
 
 #wait

diff --git a/evtbuild/eb_bnet_fsd_newservers.conf b/evtbuild/eb_bnet_fsd_newservers.conf
index 286c1e9e900329ce55befdf5fb1b20e249e8fc95..d9b3f36ebbf538fc4b182dcbafce2cd13a4c085c 100644 (file)
--- a/evtbuild/eb_bnet_fsd_newservers.conf
+++ b/evtbuild/eb_bnet_fsd_newservers.conf
@@ -144,7 +144,8 @@ LTSM:          1  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1
 
 # LTSM default options for all EB processes
 
-LTSM_PATH:      /lustre/hades/raw/jun19test/default/tsm
+#LTSM_PATH:      /lustre/hades/raw/jun19test/default/tsm
+LTSM_PATH:      /lustre/hades/raw/sep20test
 #LTSM_PATH:      /hebetest/hades/raw/jun19test/
 #LTSM_Server:  lxltsm01-tsm-server
 LTSM_Server: lxltsm01

diff --git a/evtbuild/start_eb_gbe.sh b/evtbuild/start_eb_gbe.sh
index c45cfe6640e3190373e29052e3aa0fce53cc8b19..1b3e9d1c9dd455b41c50d6b39e6167f23f76daf6 100755 (executable)
--- a/evtbuild/start_eb_gbe.sh
+++ b/evtbuild/start_eb_gbe.sh
@@ -1 +1 @@
-./start_eb_gbe.pl -e restart -n 1-16 -d on -p te -b 1;
+./start_eb_gbe.pl -e restart -n 1-16 -d on -p te -b 4;

diff --git a/evtbuild/start_eb_gbe_newservers_fsd.pl b/evtbuild/start_eb_gbe_newservers_fsd.pl
index b4d2eec3b30a2ad8daab5b78cbd26a234b68f9a1..1c54483dec5f77ee5389f8f8ec437658383f2984 100755 (executable)
--- a/evtbuild/start_eb_gbe_newservers_fsd.pl
+++ b/evtbuild/start_eb_gbe_newservers_fsd.pl
@@ -674,17 +674,22 @@ my (@process_list);
 # setup for first EB
 my $ebproc =0; # setup for first EB will define the BNET
   my $username = "hadaq";
-  my $dabclogin = ". /home/hadaq/soft/dabc/bin/dabclogin.head; ";
-# here test special installations:
   my $cdworkdir = "cd /home/hadaq/oper;";
-
+   
+  # here the default installation. always the most recent... 
+  my $dabclogin = ". /home/hadaq/soft/dabc/bin/dabclogin.head; ";
   my $cmd_dabc = "/home/hadaq/soft/dabc/bin/dabc_exe.head ";
 #   my $cmd_dabc = "/usr/bin/gdb  -x /home/hadaq/soft/dabc/head/base/run/gdbcmd.txt --args /home/hadaq/soft/dabc/bin/dabc_exe.head ";
-
-   
   my $conf_bnet_inp = " BnetInputHades.head.xml";
   #my $conf_bnet_bld = " BnetBuilderHades.head.xml";
   my $conf_bnet_bld = " BnetBuilderHadesFSD.head.xml";
+  
+ # JAM2020- enable this to switch different dabc version: 
+#    my $dabclogin = ". /home/hadaq/soft/dabc/bin/dabclogin.jun20; ";
+#    my $cmd_dabc = "/home/hadaq/soft/dabc/bin/dabc_exe.jun20 ";
+#    my $conf_bnet_inp = " BnetInputHades.jun20.xml";
+#    my $conf_bnet_bld = " BnetBuilderHadesFSD.jun20.xml";
+   
    
 #  my @bnetservers = ("192.168.100.8","192.168.100.9","192.168.100.10","192.168.105.11", "192.168.105.12");
 

diff --git a/hmon/QA.pm_kate_delme b/hmon/QA.pm_kate_delme
deleted file mode 100644 (file)
index ef37579..0000000
--- a/hmon/QA.pm_kate_delme
+++ /dev/null
@@ -1,284 +0,0 @@
-package QA;
-
-use Hmon;
-###############################################################################
-# Screen Configuration
-###############################################################################
-# List of categories & names
-our $cats = {'main'=>"Main",
-             'daq'=>"DAQ",
-             'trg'=>"Trig",
-             'rate'=>"Rate",
-             'server'=>"Srv",
-             'eb'=>"EB",
-             'mdc'=>"MDC",
-             'endp'=>"Endp",
-             'feeerr'=>"Fee",
-             'other'=>"Other",
-             'pion'=>"Pion",
-             'rich'=>'RICH',
-             'ecal'=>'ECal'};
-
-# Order of categories
-our $entries->{'cats'} = ["main",
-                          "daq",
-                          "trg",
-                          "rate",
-                          "server",
-                          "eb",
-                          "mdc",
-                          "endp",
-                          "feeerr",
-#                          "pion",
-                          "rich",
-                         "ecal",
-                          "other",
-
-];
-
-# Order of entries in each cat
-$entries->{'main'}    = ['time', 'rate','onlineqa','up','speech'];
-$entries->{'daq'}     = ['trbnet', 'timeouts', 'busy','readout','spillcount'];
-$entries->{'trg'}     = ['spill', 'accepted', 'source','pt1rate',  'start']; #, 
-$entries->{'rate'}    = ['pt1','start','hodo','pion1','pion2'];
-$entries->{'server'}  = ['fill', 'cpu', 'icinga', 'etrax', 'pwrsup'];
-$entries->{'eb'}      = ['run', 'rate','bytes', 'lostevt', 'errbits'];
-$entries->{'mdc'}     = ['token', 'blocked', 'temp', 'linkqual', 'voltage'];
-$entries->{'endp'}    = ['mdc','rich', 'tof', 'rpc', 'other'];
-$entries->{'feeerr'}  = ['mdcinvalid', 'trb', 'feeerr','trginp','trgqual'];
-$entries->{'pion'}    = ['nxstatus', 'HV', 'HVcurr', 'cooling','seu'];
-$entries->{'other'}   = ['magnet','goofy','','','sequencer'];
-$entries->{'rich'}    = ['temp','volt','curr','bkpl',''];
-$entries->{'ecal'}    = ['','','','',''];
-
-
-our $QAServer = "hades33";
-
-###############################################################################
-#  Thresholds
-###############################################################################
-# #MDC Temperatures
-# use constant {MdcTempOk   => 78, MdcTempWarn => 85,   MdcTempErr  => 90};
-#
-# #MDC locked OEP
-# use constant {MdcLockOk   => 0,  MdcLockWarn => 3,   MdcLockErr  => 5};
-#
-# #MDC OEP Numbers
-# use constant {MdcOepOk    => 326};
-# use constant {MdcOepWarn  => MdcOepOk-2};
-# use constant {MdcOepErr   => MdcOepOk-4};
-#
-# #Frontend errors
-# use constant {  FeeErrOk    => 0,  FeeErrWarn  => 2,  FeeErrErr   => 5};
-
-our @FeeErrLimits     = (0, 5, 10);
-our @MdcOepLimits     = (372, 372-1, 372-3);
-our @MdcVoltageLimits = (50, 60, 100);
-our @MdcLockLimits    = (0, 3, 5);
-our @MdcTempLimits    = (75, 80, 85);
-our @RichInnerTempLimits = (29,30,31);
-our @TrgErrLimits     = (100, 1000, 10000);
-our @CPULimits        = (95, 100, 100);
-our @TimeoutLimits    = (0, 0, 1);
-our @LinkErrLimits     = (50, 500, 1000);
-our @MdcEndpMissingLimits   =  (0, 1, 2);
-our @RichEndpMissingLimits   = (0, 2, 4); #!!!!
-our @TofEndpMissingLimits   = (0, 0, 0);
-our @RpcEndpMissingLimits   = (0, 0, 1);
-our @OtherEndpMissingLimits   = (0, 0, 0);#!!!
-our @EBDeltaRateLimits = (10, 15, 25);
-our $TrgCheckPolarity = 1;
-our @Eventsbroken     = (.5,5,10);
-our @MdcTokenMissLimits = (10,50,100);
-our @MdcNominalHV = (1750,1770,1500,1700);
-our @MdcHVOffsetLimits = (5,10,20);
-
-our @PionLvCurrLimits = (4,5,6);
-
-our $MdcHvOff = 1;
-our $RichHvOff = 1;
-our $MagnetOff = 1;
-
-our @LimitTriggerPerSpill = (1000, 0, 0);
-our $AcceleratorCycle = 7;
-use constant {CTSAddress => 0x0003};
-
-###############################################################################
-#  Missing Boards
-###############################################################################
-
-our @mdc_boards_removed =(); #(0x2257, 0x2029); # 2233 added 2014-08-28 , 2203 at 2014/09/03, 2029 2014/09/23
-our @mdc_chambers_removed =();
-our @rich_boards_removed =(0x);
-our @tof_boards_removed =();
-our @rpc_boards_removed =();
-our @other_boards_removed =();
-
-
-###############################################################################
-#  Error Levels
-###############################################################################
-use constant {
-  SCRIPTERROR => -1,
-  NA => 0,
-  OK => 10,
-  NOTE => 20,
-  NOTE_2 => 22,
-  WARN => 40,
-  WARN_2 => 42,
-  ERROR => 70,
-  ERROR_2 => 72,
-  LETHAL => 100,
-  FATAL => 100
-};
-
-###############################################################################
-#  Functions
-###############################################################################
-
-
-############################################
-# Opens QA Logfile and gives back a filehandle
-sub OpenQAFile {
-  my $fh;
-  open($fh, ">>",Hmon::HMONDIR."/files/qalog");
-  $fh->autoflush(1);
-  return $fh;
-}
-
-
-
-############################################
-# Writes an entry to the QA file. Arguments:
-# $fh        file handle of logfile
-# $cat       category of entry
-# $entry     name of entry
-# $ttl       time the entry is valid (in seconds)
-# $status    Status, one of the constants defined above
-# $title     First line of monitor entry
-# $value     Second line of monitor entry
-# $longtext  Long description text (PopUp)
-sub WriteQALog {
-  my ($fh, $category, $entry, $ttl, $status, $title, $value, $longtext) = @_;
-  my $close = 0;
-  my $tmp = time()."\t$category\t$entry\t$ttl\t$status\t$title\t$value\t$longtext\n";
-
-  if ($fh eq "remote") {
-    system("ssh $QAServer \"echo '$tmp' >> /home/hadaq/trbsoft/daq/hmon/files/qalog\"");
-    return;
-    }
-
-  #   $format =~ s/\s/\t/g;
-  if ($fh == 0) {
-    $fh = OpenQAfile();
-    $close = 1;
-    }
-
-  print $fh $tmp;
-  close $fh if($close);
-}
-
-############################################
-# Returns the appropriate status flag (simplified). Arguments:
-# $mode     how to determine status, supported: "below","above"
-# $val      the value
-# @limits   Array with limits
-sub GetQAState {
-  my ($mode, $val, @limits) = @_;
-  my ($ok, $warn, $err) = @limits;
-  if (!defined($val)) {
-    return NA;
-  }
-  if ($val eq "err") {
-    return SCRIPTERROR;
-  }
-  if ($_[0] eq 'below') {
-    if ($val <= $ok) {
-      return OK;
-    }
-    if ($val <= $warn) {
-      return WARN;
-    }
-    if ($val <= $err) {
-      return ERROR;
-    }
-    if ($val >  $err) {
-      return FATAL;
-    }
-  } elsif ($_[0] eq 'above') {
-    if ($val >= $ok) {
-      return OK;
-    }
-    if ($val >= $warn) {
-      return WARN;
-    }
-    if ($val >= $err) {
-      return ERROR;
-    }
-    if ($val <  $err) {
-      return FATAL;
-    }
-  } elsif ($_[0] eq 'inside') {
-    if (abs($val) <= $ok) {
-      return OK;
-    }
-    if (abs($val) <= $warn) {
-      return WARN;
-    }
-    if (abs($val) <= $err) {
-      return ERROR;
-    }
-    return FATAL;
-  }
-  return SCRIPTERROR;
-}
-
-############################################
-#Returns a string matching the given severity level
-sub LevelName {
-  my ($level) = @_;
-  if ($level == SCRIPTERROR) {
-    return "Script Error";
-    }
-  if ($level == NA) {
-    return "Not available";
-    }
-  if ($level < NOTE ) {
-    return "OK";
-    }
-  if ($level < WARN ) {
-    return "Note";
-    }
-  if ($level < ERROR ) {
-    return "Warning";
-    }
-  if ($level < FATAL ) {
-    return "Error";
-    }
-  return "Severe Error";
-  }
-
-############################################
-# Tries to nicely format an integer
-sub SciNotation {
-  my $v = shift;
-  return "undef" if (!defined $v);
-  return "0" if $v == 0;
-#   print $v."\n";
-  if(abs($v) >= 1) {
-    return  sprintf("%i", $v) if (abs($v) < 1000) ;
-    return  sprintf("%.1fk", $v / 1000.) if (abs($v) < 20000) ;
-    return  sprintf("%ik", $v / 1000.) if (abs($v) < 1E6) ;
-    return  sprintf("%.1fM", $v / 1000000.) if (abs($v) < 20E6) ;
-    return  sprintf("%iM", $v / 1000000.) if (abs($v) < 1E9) ;
-    return  sprintf("%i",$v);
-    }
-  else {
-    return sprintf("%in", $v*1E9) if (abs($v) < 1E-6) ;
-    return sprintf("%iu", $v*1E6) if (abs($v) < 1E-3) ;
-    return sprintf("%.1fm", $v*1E3);
-    }
-}
-
-1;
-__END__

diff --git a/hmon/hmon_tofrate.pl b/hmon/hmon_tofrate.pl
index 8dbe969d16473f5328fde1b3a13f84451def210c..964d88f7ec63f32679380c0c4eb01cf13638f9f1 100755 (executable)
--- a/hmon/hmon_tofrate.pl
+++ b/hmon/hmon_tofrate.pl
@@ -20,7 +20,7 @@ name    => "TofRate",
 file    => "files/TofRate",
 title   => "TOF Rate",
 entries => 32,
-curves  => 70,
+curves  => 60,
 type    => HPlot::TYPE_HEATMAP,
 output  => HPlot::OUT_PNG,
 zlabel  => "Hitrate",
@@ -28,7 +28,7 @@ sizex   => 470,
 sizey   => 420,
 nokey   => 1,
 buffer  => 1,
-ymin    => 69.5,
+ymin    => 59.5,
 ymax    => -0.5,
 xmin    => -0.5,
 xmax    => 31.5,
@@ -63,7 +63,7 @@ while(1) {
   #my $max = 0 ;
   #my $min = 5E9;
   
-  my $o = trb_register_read_mem(0xfe73,0xc000,0,33) or die trb_strerror() or sleep 5 and next;
+  my $o = trb_register_read_mem(0xfe47,0xc000,0,33) or die trb_strerror() or sleep 5 and next;
 
   if (defined $old) {
     my $tdiff = (time() - $oldtime)|1;

diff --git a/main/address_range.db b/main/address_range.db
index 73c26af58127161c6e578d995f08852a549bcf13..15555a24bca4873e8222c7bb7951bdb87caf4f74 100644 (file)
--- a/main/address_range.db
+++ b/main/address_range.db
@@ -11,7 +11,7 @@ RPC          0x4800    0x4BFF     TRB
 TOF          0x4C00    0x4FFF     TRB
 StartTrb3    0x5000    0x50FF     TRB3
 SEB          0x5555    0x5555     TRBnet
-RPC          0x5800    0x5900     TRB3
+RPC          0x5800    0x5900     TRB3sc
 TOF          0x5c00    0x5cff     TRB3  
 ECal         0x6000    0x60FF     TRB3sc
 STS         0x6400    0x64FF     TRB3
@@ -20,7 +20,8 @@ Central-Hub  0x8000    0x80FF     TRB3sc
 Rich-Comb    0x8200    0x82ff     DiRichConcentrator
 Rich-Hub     0x83c0    0x83df     TRB3sc
 RPC-Hub      0x8400    0x84FF     TRB3sc
-TOF-Hub      0x8600    0x86FF     TRB3sc
+#TOF-Hub      0x8600    0x86FF     TRB3sc
+TOF-Hub      0x8600    0x86FF     TRB3
 Wall-Hub     0x8700    0x87FF     TRB3sc
 CTS-Hub      0x8800    0x887F     TRB3sc
 StartTrb3Hub 0x8880    0x88FF     TRB3

diff --git a/main/data_sources.db b/main/data_sources.db
index bec7da5db205640ff33e33153a01d965f3307a71..bc727b18c9edebcad71b36b27abada11c3055a04 100644 (file)
--- a/main/data_sources.db
+++ b/main/data_sources.db
@@ -3,26 +3,25 @@
 # Addr     On/Off     Name              DataSize
 #Start must be the first for EvtId
 0x8800      1         CentralCTS       low
-0x8810      0         CentralAux        low
-0x8400      0         RPC123            mid
-0x8410      0         RPC456            mid
+#0x8810      0         CentralAux        low
+#0x8400      0         RPC123            mid
+#0x8410      0         RPC456            mid
 0x84c0      1         RPCnew1           mid
 0x84c1      1         RPCnew2           mid
 0x84c2      1         RPCnew3           mid
 0x84c3      1         RPCnew4           mid
 0x84c4      1         RPCnew5           mid
 0x84c5      1         RPCnew6           mid
-0x8600      0         TOF               low
-0x86c0      0         TOFnew1           mid
-0x86c1      0         TOFnew2           mid
-0x86c2      0         TOFnew3           mid
-0x86c3      1         TOFnew4           mid
-0x86c4      0         TOFnew5           mid
-0x86c5      0         TOFnew6           mid
-#0x86c6      1         TOFnew7           mid
+#0x8600      0         TOF               low
+0x86c0      1         TOFnew1           mid
+0x86c1      1         TOFnew2           mid
+0x86c2      1         TOFnew3           mid
+0x86c3      1        TOFnew4           mid
+0x86c4      1         TOFnew5           mid
+0x86c5      1         TOFnew6           mid
 0x86c6      0         TOFnew7           mid
-0x8700      0         FW                low
-0x8880      0         StartTRB3         low
+#0x8700      0         FW                low
+#0x8880      0         StartTRB3         low
 #0x8890      0         VetoTRB3          low5t
 #0x8900      0         Pion1             mid
 #0x8910      0         Pion2             mid
@@ -38,11 +37,11 @@
 0x1130      1         MDC34sec4         mid
 0x1140      1         MDC34sec5         high
 0x1150      1         MDC34sec6         high
-0x8a00      0         ECal0             mid
-0x8a01      0         ECal1             mid
-0x8a02      0         ECal2             mid
-0x8a03      0         ECal3             mid
-0x8a04      0         ECal4             mid
+0x8a00      1         ECal0             mid
+0x8a01      1         ECal1             mid
+0x8a02      1         ECal2             mid
+0x8a03      1         ECal3             mid
+0x8a04      1         ECal4             mid
 0x8a05      0         ECal5             mid
 0x83c0      0         RICH0             mid
 0x83c1      0         RICH1             mid
@@ -56,6 +55,10 @@
 0x83c9      0         RICH9             mid
 0x83ca      0         RICHa             mid
 0x83cb      0         RICHb             mid
+0x8b00      0         STS1-0             mid
+0x8b01      0         STS1-1             mid
+0x8b02      0         STS1-2             mid
+0x8b03      0         STS1-3             mid
 0x8b10      1         STS2-0             mid
 0x8b11      1         STS2-1             mid
 0x8b12      1         STS2-2             mid

diff --git a/main/main_hades.script b/main/main_hades.script
index 041380c992ea841764ab2a814b9c8d08071a51c5..e9aedc675e5600cdfb40b46ffa0bacffcc5d0121 100644 (file)
--- a/main/main_hades.script
+++ b/main/main_hades.script
@@ -20,9 +20,9 @@ read_addrange_db ../main/address_range.db
 #  read_trb_db ../rpc/trb.db
 #!endif
 
-#!ifndef NOTOF
-#  read_trb_db ../tof/trb.db
-#!endif
+!ifndef NOTOF
+  read_trb_db ../tof/trb.db
+!endif
 
 !ifndef NOHUB
   read_trb_db ../hub/trb.db
@@ -106,18 +106,18 @@ wait
 
 #Configuration on TRBs
   exec_cmd{con} echo "Configuring TDC on TRBs & BLR"
-  !ifndef NORPC
-    exec_script{rpc}   ../rpc/configure_rpc.script
-  !endif
+#  !ifndef NORPC
+#    exec_script{rpc}   ../rpc/configure_rpc.script
+#  !endif
 
-  !ifndef NOWALL
-    exec_script{wall}  ../wall/configure_wall.script
-  !endif
+#  !ifndef NOWALL
+#    exec_script{wall}  ../wall/configure_wall.script
+#  !endif
   
   
-  !ifndef NOTOF
-    exec_script{tof}   ../tof/configure_tof.script
-  !endif 
+#  !ifndef NOTOF
+#    exec_script{tof}   ../tof/configure_tof.script
+#  !endif 
   
   !ifndef NOCTS
     exec_script{blr}   ../cts/configure_blr.script

diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh
index f60e601e712344a545637eded00a358bf30b4f25..4a2babe54d9abb0d34911a01c2b018cfa38a9e91 100755 (executable)
--- a/main/startup_briccolage.sh
+++ b/main/startup_briccolage.sh
@@ -77,7 +77,7 @@ switchport.pl 0x1024 7 off  #2057, 19/03/12
 #Retransmission on as early as possible
  trbcmd setbit 0xfffd 0x22 0x08000000   #enable retransmission on oep
  trbcmd setbit 0xfe11 0x22 0x08000000   #enable retransmission on mdchub
- #/home/hadaq/trbsoft/hadesdaq/rich/retransmission.sh 2>/dev/null
+# /home/hadaq/trbsoft/hadesdaq/rich/retransmission.sh 2>/dev/null
 
 #Main Start-up
   echo "  <Startup>  Running Startup script"

diff --git a/oracle/boards.txt b/oracle/boards.txt
index 709504ca3b8f3a0c43831a134c24b72fdadb1e87..785b5a29b131cda9debbbc0f95397bd6f91ad473 100644 (file)
--- a/oracle/boards.txt
+++ b/oracle/boards.txt
@@ -1,6 +1,9 @@
        CTS  900  9300000270e8dd28   0002
     TRB3sc 1421  2c00000940a5fa28   8800
+    TRB3sc 3101  2900000a63092028   8810
     TRB3sc 1461  4d00000940a62f28   8018
+    TRB3sc 1471  1c00000940a66028   8011
+    TRB3sc 1481  4600000940955c28   8014
     TRB3sc 1491  3b00000940955028   8013
     TRB3sc 1551  5600000940939228   8015
     TRB3sc 1561  0f00000940939128   8017
@@ -9,7 +12,6 @@
     TRB3sc 1611  d100000940938628   8000
     TRB3sc 1051  8400000941031228   6015
     TRB3sc 1061  b300000941031328   6016
-    TRB3sc 1071  b000000940ce5228   6056
     TRB3sc 1081  cd00000940ce5e28   6022
     TRB3sc 1091  3500000940ce5528   6021
     TRB3sc 1101  fc00000940ce6a28   6025
@@ -27,7 +29,7 @@
     TRB3sc 1231  3b00000940c28028   6012
     TRB3sc 1241  7d00000940880b28   6046
     TRB3sc 1251  b1000009409d6328   6043
-    TRB3sc 1271  9b00000940876628   6051
+    TRB3sc 1261  0200000940881428   6056
     TRB3sc 1321  6f00000940a61528   6055
     TRB3sc 1331  ea00000940a61228   6045
     TRB3sc 1401  6d00000940a60628   6026
@@ -35,6 +37,14 @@
     TRB3sc 1541  1a0000094093aa28   6023
     TRB3sc 1591  7200000940939d28   6014
     TRB3sc 1651  ce0000094117f228   6011
+    TRB3sc 3051  b600000a63054c28   6051
+    TRB3sc 3111  5100000a63052328   6030
+    TRB3sc 3121  2a00000a63051a28   6031
+    TRB3sc 3131  9900000a627d9d28   6032
+    TRB3sc 3211  6e00000a62959328   6036
+    TRB3sc 3221  a000000a624b3128   6035
+    TRB3sc 3231  8900000a63050128   6034
+    TRB3sc 3241  2200000a625a1628   6033
     TRB3sc   91  f1000006e919a128   8a01
     TRB3sc 1281  0d00000940876f28   8a03
     TRB3sc 1291  9a00000940a5da28   8a05
@@ -113,6 +123,7 @@
    MDC-OEP   89  d2000001fc2eb328   220d
    MDC-OEP   90  91000001ff3a7228   2222
    MDC-OEP   91  cf000001ff3ac128   2351
+   MDC-OEP   92  c1000001ff3ab828   234d
    MDC-OEP   95  bb000001ff463c28   2109
    MDC-OEP   96  5c000001ff465328   2212
    MDC-OEP   97  56000001ff253a28   201c
@@ -144,6 +155,7 @@
    MDC-OEP  129  30000001fc5dc028   2357
    MDC-OEP  130  0e000001fc431f28   235e
    MDC-OEP  131  4d000001fc2c4128   225b
+   MDC-OEP  133  b8000001fc2bea28   234e
    MDC-OEP  135  ba000001fc2bf928   201b
    MDC-OEP  136  ce000001fc44a628   2143
    MDC-OEP  140  74000001fc774528   2314
@@ -188,9 +200,9 @@
    MDC-OEP  186  1b000001fc32a928   224d
    MDC-OEP  187  60000001fc329028   212d
    MDC-OEP  188  8b000001fc329528   2015
-   MDC-OEP  189  bc000001fc31bf28   234d
-   MDC-OEP  190  10000001fc2c6428   234e
-   MDC-OEP  191  6f000001fc491b28   234f
+   MDC-OEP  189  bc000001fc31bf28   2030
+   MDC-OEP  190  10000001fc2c6428   2032
+   MDC-OEP  191  6f000001fc491b28   2036
    MDC-OEP  192  f1000001fc757028   2233
    MDC-OEP  193  e6000001fc755828   2057
    MDC-OEP  194  06000001fc673c28   2335
@@ -223,6 +235,7 @@
    MDC-OEP  226  90000001fc641e28   230a
    MDC-OEP  228  d1000001fc64c928   2056
    MDC-OEP  230  52000001fc547928   2031
+   MDC-OEP  232  2c000001fc665328   234f
    MDC-OEP  233  e1000001fc664a28   2050
    MDC-OEP  234  b8000001fc664928   2055
    MDC-OEP  235  a9000001fc665428   2004
@@ -243,7 +256,6 @@
    MDC-OEP  252  02000001fc643128   200a
    MDC-OEP  253  48000001fc643c28   2023
    MDC-OEP  254  46000001fc644528   2044
-   MDC-OEP  256  5b000001fc3f4e28   2030
    MDC-OEP  258  63000001fc3eaa28   2005
    MDC-OEP  261  99000001fc66e528   2200
    MDC-OEP  262  9a000001fc77e328   203a
@@ -266,7 +278,6 @@
    MDC-OEP  285  db000001fc507028   224b
    MDC-OEP  286  16000001fc506928   214d
    MDC-OEP  288  22000001fc441328   2232
-   MDC-OEP  289  35000001242c9928   2036
    MDC-OEP  290  92000001242ca428   214e
    MDC-OEP  291  e300000123f27e28   2156
    MDC-OEP  292  ca00000123efa228   2155
@@ -293,7 +304,6 @@
    MDC-OEP  323  16000001fc39a528   213a
    MDC-OEP  324  ee000001fc39ae28   2033
    MDC-OEP  326  21000001fc39a428   2149
-   MDC-OEP  327  10000001fc399028   2032
    MDC-OEP  328  86000001fc399928   2006
    MDC-OEP  329  67000001fc39c328   2105
    MDC-OEP  330  8d000001fc423428   2054
@@ -427,32 +437,66 @@
    MDC-OEP  497  f8000001fc769228   2035
    MDC-OEP  498  85000001fc778728   2145
    MDC-OEP  500  46000001fc76fe28   213e
-       TRB   31  0a0000012410fa28   4821
-       TRB   40  9500000123f4fe28   4822
-       TRB   50  e500000123f24b28   4853
-       TRB   51  6200000123f25f28   4843
-       TRB   52  7700000123f26428   4802
-       TRB   53  ad00000123f25528   4841
-       TRB   54  e200000124172628   4840
-       TRB   55  4600000123f25028   4810
-       TRB   59  ff00000123f5c328   4800
-       TRB   61  f500000123f59c28   4833
-       TRB   63  e500000124052d28   4813
-       TRB   65  ca000001241bef28   4812
-       TRB   67  fb000001241bdb28   4801
-       TRB   74  fa000001c17e8428   4823
-       TRB   75  6f000001fc5df628   4832
-       TRB   78  5c000001fc5dd128   4852
-       TRB   80  22000001fc5e6028   4851
-       TRB   83  60000001c17b9a28   4831
-       TRB   85  8c000001fc5e9428   4811
-       TRB   89  c0000001ff590b28   4820
-       TRB   91  71000001fc2bd528   4850
-       TRB   92  df000001fc5bb528   4830
-       TRB  110  90000001c1712728   4842
-       TRB  124  3c000001c170d928   4803
-    TRB3sc    6  5400000270caa228   8400
-    TRB3sc   14  fa00000270f02e28   8410
+    TRB3sc 2011  3300000a62e98e28   5813
+    TRB3sc 2021  9900000a6244ce28   5818
+    TRB3sc 2031  5400000a631eea28   5826
+    TRB3sc 2041  ec00000a6300a428   5847
+    TRB3sc 2051  4600000a628e9c28   5827
+    TRB3sc 2061  a700000a628ec628   5837
+    TRB3sc 2071  a800000a62955028   5833
+    TRB3sc 2091  1800000a631ed228   5854
+    TRB3sc 2111  e000000a62e97628   5822
+    TRB3sc 2121  e900000a62442d28   5810
+    TRB3sc 2131  9400000a63057628   5843
+    TRB3sc 2141  8e00000a6244e628   5838
+    TRB3sc 2161  7b00000a63067e28   5802
+    TRB3sc 2171  4200000a628eba28   5844
+    TRB3sc 2181  4e00000a62e98228   5853
+    TRB3sc 2191  7000000a631ee528   5851
+    TRB3sc 2201  2200000a628ec128   5840
+    TRB3sc 2221  5400000a63092c28   5812
+    TRB3sc 2231  7200000a631ef628   5817
+    TRB3sc 2241  f700000a631ef128   5811
+    TRB3sc 2251  4f00000a62e0d628   5855
+    TRB3sc 2261  3b00000a6295fa28   5823
+    TRB3sc 2271  5d00000a628ede28   5832
+    TRB3sc 2281  e000000a631ed928   5824
+    TRB3sc 2291  0800000a63005d28   5857
+    TRB3sc 2311  d200000a62ce9028   5828
+    TRB3sc 2321  e100000a628ea128   5846
+    TRB3sc 2341  1a00000a62829028   5814
+    TRB3sc 2351  4300000a63068328   5841
+    TRB3sc 2361  ae00000a63059828   5820
+    TRB3sc 2371  d000000a6310f628   5830
+    TRB3sc 2381  e100000a63061d28   5800
+    TRB3sc 2391  9c00000a63061128   5821
+    TRB3sc 2401  2900000a63058c28   5825
+    TRB3sc 2411  6500000a631ede28   5858
+    TRB3sc 2421  d100000a63058728   5845
+    TRB3sc 2431  e200000a63068b28   5808
+    TRB3sc 2441  ed00000a63067728   5835
+    TRB3sc 2451  8000000a6305c828   5815
+    TRB3sc 2461  4300000a628e3f28   5852
+    TRB3sc 2471  aa00000a63104a28   5836
+    TRB3sc 2481  cb00000a62e98528   5848
+    TRB3sc 2491  6700000a628f2928   5807
+    TRB3sc 2501  b700000a631d8828   5804
+    TRB3sc 2511  9e00000a63005428   5856
+    TRB3sc 2521  8c00000a630a2528   5816
+    TRB3sc 2531  c400000a63069728   5831
+    TRB3sc 2541  2b00000a63059f28   5801
+    TRB3sc 2551  f300000a6304a428   5806
+    TRB3sc 2561  d000000a624bd228   5805
+    TRB3sc 2571  4b00000a6304fd28   5803
+    TRB3sc 2581  8a00000a631efd28   5842
+    TRB3sc 2591  c400000a62e97928   5834
+    TRB3sc 2601  0b00000a62954b28   5850
+    TRB3sc 3151  1100000a63057128   84c1
+    TRB3sc 3161  7800000a6305c328   84c3
+    TRB3sc 3171  e900000a62958728   84c4
+    TRB3sc 3181  dd00000a624b3d28   84c2
+    TRB3sc 3191  5800000a63218528   84c5
+    TRB3sc 3201  5500000a6310f128   84c0
     DiRich    1  ca00000711f93828   7000
     DiRich   50  e000000a52311328   7034
     DiRich   51  6100000a522d1728   7140
@@ -470,26 +514,21 @@
     DiRich   67  ff00000a48b0fd28   71b5
     DiRich   68  a200000a48afd628   7284
     DiRich   69  ef00000a48af6b28   7073
-    DiRich   70  1a00000a48af8f28   7584
+    DiRich   70  1a00000a48af8f28   7585
     DiRich   71  d800000a529e4e28   7094
     DiRich   72  3700000a5291ea28   7594
-    DiRich   73  1000000a5287ac28   7685
     DiRich   74  8400000a529a8a28   7723
     DiRich   75  d200000a52865028   7084
-    DiRich   76  2600000a529e7028   7695
     DiRich   77  4400000a5297c928   7595
-    DiRich   78  0300000a52136328   7674
     DiRich   79  9400000a529f6f28   7175
     DiRich   80  1300000a528cd928   71a5
     DiRich   81  c500000a5288e628   7075
-    DiRich   84  5600000a529f8a28   7694
     DiRich   85  4800000a52a17728   7092
     DiRich   86  f700000a48eeb028   7192
     DiRich   87  9900000a49498228   7085
     DiRich   88  e000000a48ee9828   7474
-    DiRich   89  3300000a48ed4b28   7585
-    DiRich   90  3a00000a48eea928   7495
-    DiRich   91  0b00000a48ee9d28   7684
+    DiRich   89  3300000a48ed4b28   7584
+    DiRich   90  3f00000a520cb628   7495
     DiRich   92  2900000a49237028   7184
     DiRich   93  6c00000a49238128   7675
     DiRich   94  c200000a49237528   7275
@@ -547,6 +586,7 @@
     DiRich  155  8800000a49c06228   7297
     DiRich  156  f500000a4931cf28   7016
     DiRich  157  0a00000a48b56428   7043
+    DiRich  158  1d00000a48b66728   7270
     DiRich  159  5f00000a49dfb228   7012
     DiRich  160  4600000a493fd228   7493
     DiRich  161  4700000a49769028   7033
@@ -592,11 +632,9 @@
     DiRich  207  2900000a494df328   7632
     DiRich  209  6200000a49eb0a28   7432
     DiRich  212  8900000a49eb0f28   7533
-    DiRich  213  e600000a48abc628   7875
     DiRich  214  5100000a48e3bd28   7422
     DiRich  215  4c00000a48e3ca28   7633
     DiRich  216  3f00000a48dda328   7643
-    DiRich  218  d900000a48dd4928   7725
     DiRich  219  8e00000a49251b28   7133
     DiRich  220  d200000a49078228   7212
     DiRich  221  f800000a49b47128   7833
@@ -644,21 +682,15 @@
     DiRich  269  b100000a48afd828   7145
     DiRich  270  2700000a48afd128   7283
     DiRich  271  4200000a49092028   7282
-    DiRich  272  5a00000a48afdd28   7765
     DiRich  274  5900000a49f00b28   7554
     DiRich  275  4e00000a49f02328   7565
-    DiRich  276  7f00000a49f01728   7945
     DiRich  277  e400000a49efff28   7035
     DiRich  278  1300000a4885b728   7273
-    DiRich  279  8300000a48b62228   7855
     DiRich  280  c700000a49083e28   7264
-    DiRich  281  c900000a49084728   7745
-    DiRich  282  9200000a491aec28   7845
     DiRich  283  ba00000a49083228   7254
     DiRich  284  2c00000a49083b28   7655
     DiRich  285  5300000a4886ce28   7435
     DiRich  286  a500000a48925128   7654
-    DiRich  287  c700000a48923928   7854
     DiRich  288  1500000a48924428   7564
     DiRich  289  c500000a4886c728   7464
     DiRich  290  4a00000a49f11c28   7165
@@ -668,7 +700,6 @@
     DiRich  294  0100000a495f2d28   7265
     DiRich  295  cf00000a48961128   7355
     DiRich  296  7c00000a495f2128   7832
-    DiRich  297  4800000a49286d28   71b2
     DiRich  298  3b00000a49281828   7455
     DiRich  299  d000000a49281d28   7555
     DiRich  300  2c00000a49283028   7365
@@ -689,17 +720,10 @@
     DiRich  317  9600000a4927fd28   7635
     DiRich  318  6e00000a4927f628   7154
     DiRich  319  5f00000a494b7328   7272
-    DiRich  320  7100000a48dbde28   7944
-    DiRich  321  fc00000a494b6828   7744
-    DiRich  322  4000000a48dbea28   7955
     DiRich  323  7700000a48bbf628   7664
     DiRich  324  a100000a4882fe28   7182
-    DiRich  325  a600000a48bf7928   7844
     DiRich  326  8700000a48868628   7183
-    DiRich  327  c900000a48a7bf28   7755
-    DiRich  328  3200000a4973ad28   7954
     DiRich  329  4f00000a4973a128   7665
-    DiRich  330  3f00000a49c5ba28   7754
     DiRich  331  8300000a49c5c528   7334
     DiRich  332  da00000a49c5c628   7344
     DiRich  333  cc00000a49c33d28   7445
@@ -709,7 +733,6 @@
     DiRich  337  bd00000a49380028   7a07
     DiRich  339  ba00000a48bbef28   7514
     DiRich  342  bf00000a49c34828   7610
-    DiRich  343  8d00000a48b57028   7915
     DiRich  344  df00000a497b5528   7521
     DiRich  345  8800000a4931c328   7646
     DiRich  346  3a00000a497b2928   7111
@@ -725,7 +748,6 @@
     DiRich  361  2e00000a488f1328   7525
     DiRich  363  3f00000a488f0e28   7425
     DiRich  364  5000000a48919e28   7373
-    DiRich  365  6b00000a49784d28   7874
     DiRich  366  9800000a49789c28   7593
     DiRich  367  7500000a4978ac28   7414
     DiRich  369  4d00000a496aea28   7693
@@ -799,12 +821,7 @@
     DiRich  447  7a00000a48b6ac28   7104
     DiRich  448  ab00000a49082f28   7307
     DiRich  449  c500000a48b64528   7106
-    DiRich  450  3d00000a4907a128   7825
-    DiRich  451  5100000a4907b028   7734
-    DiRich  452  4000000a4907ad28   7824
-    DiRich  453  c700000a4907b928   7724
     DiRich  454  db00000a48e25f28   7935
-    DiRich  455  7b00000a48b35428   7924
     DiRich  456  ca00000a49f1b828   7834
     DiRich  457  2a00000a49a82928   7835
     DiRich  458  d200000a49a82228   7206
@@ -829,7 +846,6 @@
     DiRich  485  c300000a48f77f28   7816
     DiRich  486  b100000a48b1cf28   7b12
     DiRich  487  9b00000a491c7328   7241
-    DiRich  488  1e00000a491c7428   7735
     DiRich  489  5b00000a48b43228   7b32
     DiRich  490  bb00000a48e9c728   70b1
     DiRich  491  d900000a48b59c28   70b7
@@ -846,16 +862,13 @@
     DiRich  502  4800000a4927ea28   7866
     DiRich  504  e800000a4895a328   7200
     DiRich  506  2900000a495c6328   7b10
-    DiRich  507  5600000a48b28b28   7864
     DiRich  508  1c00000a48b28628   70a1
     DiRich  509  4200000a48b32c28   70a0
     DiRich  511  7d00000a49dca328   7760
-    DiRich  512  b900000a49549728   7704
     DiRich  514  1000000a4992bf28   70b0
     DiRich  516  1000000a488fdb28   7b17
     DiRich  518  6b00000a488fe228   72a4
     DiRich  519  8900000a49279928   7296
-    DiRich  520  c300000a49279428   7775
     DiRich  521  f700000a48c44128   7061
     DiRich  524  0700000a49dd0628   73a5
     DiRich  525  cc00000a49dd2a28   7b25
@@ -917,21 +930,16 @@
     DiRich  602  a700000a49b76c28   7910
     DiRich  604  2200000a49b67228   7510
     DiRich  605  2a00000a49ec5b28   7321
-    DiRich  606  0600000a49b67d28   7705
     DiRich  607  af00000a49ec5c28   7900
     DiRich  609  c900000a491be528   7b20
-    DiRich  610  b000000a491c8028   7805
     DiRich  611  2c00000a491dcf28   7800
     DiRich  612  5900000a491bd928   7627
     DiRich  613  0400000a48da8728   7511
     DiRich  614  e000000a49673d28   7901
-    DiRich  615  0b00000a49673828   7905
     DiRich  616  eb00000a49ddb328   7426
     DiRich  619  9d00000a49673128   7527
-    DiRich  621  2600000a49923b28   7904
     DiRich  622  a200000a49db7e28   7410
     DiRich  623  1a00000a49db2728   73a3
-    DiRich  624  8a00000a49db1b28   71b3
     DiRich  625  a300000a49923c28   73b2
     DiRich  626  c600000a4992e428   7526
     DiRich  627  4300000a4992e328   7517
@@ -945,13 +953,10 @@
     DiRich  639  b100000a48f3eb28   7536
     DiRich  642  c500000a49bfcc28   7196
     DiRich  643  f200000a49bfcd28   7436
-    DiRich  644  2800000a49858428   7270
     DiRich  645  be00000a49858d28   7311
     DiRich  646  5900000a499cba28   7546
     DiRich  647  c300000a49858128   7626
-    DiRich  649  ce00000a48f3f428   7715
     DiRich  650  3700000a496a5628   7a32
-    DiRich  651  6200000a496a3f28   7804
     DiRich  652  9800000a492c6728   70a7
     DiRich  653  1100000a496a4a28   7637
     DiRich  654  2600000a496a4b28   72b2
@@ -960,7 +965,6 @@
     DiRich  657  4300000a48e01d28   7802
     DiRich  658  c600000a48e01a28   7702
     DiRich  660  6500000a48e00128   7170
-    DiRich  661  1b00000a48e5e628   7914
     DiRich  662  4d00000a4912b628   7703
     DiRich  663  6100000a49261328   7803
     DiRich  667  da00000a48924e28   7912
@@ -975,7 +979,6 @@
     DiRich  676  0300000a49f09e28   7596
     DiRich  677  4900000a49f09328   7a22
     DiRich  678  2200000a48924528   7447
-    DiRich  679  e900000a49e3bc28   7815
     DiRich  681  9a00000a49e3c928   7b14
     DiRich  682  8b00000a49e3d428   7171
     DiRich  683  4000000a49e3f828   7547
@@ -983,13 +986,11 @@
     DiRich  685  2c00000a49124828   7437
     DiRich  686  6300000a4912e628   7b01
     DiRich  687  f300000a4912da28   7421
-    DiRich  688  3a00000a4912e528   7714
     DiRich  689  0000000a49dbe028   7211
     DiRich  690  1c00000a49d6a728   7310
     DiRich  691  9b00000a49d6b328   7537
     DiRich  692  fd00000a49dc0728   7520
     DiRich  693  e700000a49924828   7621
-    DiRich  694  3800000a49d6a828   7814
     DiRich  695  e300000a493b9828   7a12
     DiRich  696  9c00000a493b8728   7280
     DiRich  697  1900000a493b8028   7317
@@ -1048,7 +1049,6 @@
     DiRich  760  e100000a491ccf28   7010
     DiRich  761  c900000a491caa28   7b05
     DiRich  762  9c00000a491cc328   70b5
-    DiRich  763  cf00000a491c9f28   7764
     DiRich  764  9700000a49128728   7180
     DiRich  765  9800000a49127b28   7290
     DiRich  766  d800000a491cb728   7181
@@ -1167,7 +1167,6 @@
     DiRich  910  9100000a498fa228   7b07
     DiRich  912  d600000a4907a428   7b04
     DiRich  917  9c00000a4941e928   7762
-    DiRich  918  2000000a49966a28   7865
     DiRich  919  bf00000a48e45428   70b2
     DiRich  920  9100000a4949ce28   7767
     DiRich  925  8900000a48dfb128   7a04
@@ -1204,7 +1203,6 @@
     DiRich 1069  4900000a4955c928   7376
     DiRich 1070  4a00000a49555f28   7286
     DiRich 1072  c000000a49d58828   7177
-    DiRich 1073  d200000a49d35528   7774
     DiRich 1074  c500000a49562c28   7476
     DiRich 1075  ed00000a490e1e28   7356
     DiRich 1076  dc00000a49555628   7041
@@ -1310,6 +1308,52 @@
     DiRich 1198  d200000a49c92628   7066
     DiRich 1199  e700000a49f34c28   7067
     DiRich 1200  e600000a49bc5828   7160
+    DiRich 1202  b800000bb6d00828   7904
+    DiRich 1209  b400000bb6cf6c28   7814
+    DiRich 1211  d900000bb732ad28   7805
+    DiRich 1214  6900000bb754f328   7905
+    DiRich 1216  0700000bb732ba28   7685
+    DiRich 1217  ba00000bb7772b28   7864
+    DiRich 1218  7400000bb7bf5628   7815
+    DiRich 1220  ae00000bb7a8a128   7694
+    DiRich 1222  9100000bb754f828   7915
+    DiRich 1225  9f00000bb7617e28   7695
+    DiRich 1228  c600000bb6cf9c28   7684
+    DiRich 1229  8a00000bb6cfa428   7714
+    DiRich 1231  fb00000bb6c99428   7674
+    DiRich 1232  e600000bb6cfb528   7914
+    DiRich 1233  fd00000bb6c9a128   71b2
+    DiRich 1240  dd00000bb6c98828   7804
+    DiRich 1241  0600000bb7618b28   7715
+    DiRich 1242  4e00000bb778cd28   7725
+    DiRich 1244  8b00000bb7771f28   7825
+    DiRich 1245  a800000bb708b328   7924
+    DiRich 1246  cb00000bb778ca28   7734
+    DiRich 1248  2900000bb793d428   7705
+    DiRich 1250  3e00000bb708ba28   7704
+    DiRich 1252  3e00000bb7bf5b28   7724
+    DiRich 1254  ae00000bb7bf6728   7824
+    DiRich 1256  bb00000bb7d78928   7735
+    DiRich 1259  e200000bb7617228   71b3
+    DiRich 1260  2000000bb7619728   7745
+    DiRich 1262  c600000bb7617d28   7845
+    DiRich 1263  1800000bb793e028   7945
+    DiRich 1264  5200000bb7a88c28   7755
+    DiRich 1265  4b00000bb7797728   7855
+    DiRich 1266  9100000bb708cb28   7744
+    DiRich 1267  ee00000bb7c55b28   7844
+    DiRich 1268  5c00000bb708d228   7944
+    DiRich 1271  3300000bb778c128   7754
+    DiRich 1272  4c00000bb7d77e28   7954
+    DiRich 1273  1100000bb761a328   7955
+    DiRich 1274  2600000bb761a228   7854
+    DiRich 1275  d200000bb7327728   7765
+    DiRich 1276  6900000bb7c54f28   7865
+    DiRich 1277  2c00000bb7772228   7775
+    DiRich 1278  d600000bb7093028   7774
+    DiRich 1279  c400000bb708a228   7875
+    DiRich 1280  b900000bb7bf4f28   7874
+    DiRich 1281  6600000bb7316f28   7764
 DiRichConcentrator   10  4100000a51caa828   8289
 DiRichConcentrator   11  6900000a529fc728   826a
 DiRichConcentrator   12  fd00000a52914328   8268
@@ -1322,13 +1366,13 @@ DiRichConcentrator   19  6500000a52332628   8287
 DiRichConcentrator   21  bc00000a51cb1928   8258
 DiRichConcentrator   22  1100000a52027828   8279
 DiRichConcentrator   23  b500000a51d87228   8217
-DiRichConcentrator   25  9c00000a52065728   8297
 DiRichConcentrator   29  7c00000a52570e28   825a
+DiRichConcentrator   33  ab00000a51d89328   8297
+DiRichConcentrator   36  4f00000a52534d28   8298
 DiRichConcentrator   37  0c00000a525a5828   8211
 DiRichConcentrator   38  5a00000a52598c28   8291
 DiRichConcentrator   43  5f00000a51e39328   8261
 DiRichConcentrator   44  8400000a51f7ca28   8285
-DiRichConcentrator   45  5a00000a51e56628   8298
 DiRichConcentrator   46  7500000a51fdf228   8218
 DiRichConcentrator   47  de00000a525f5828   8250
 DiRichConcentrator   48  9100000a51d7fa28   82a5
@@ -1396,25 +1440,90 @@ DiRichConcentrator  109  6800000a5236b428   8266
     TRB3sc 1631  840000094117ff28   83c8
     TRB3sc 1641  250000094117f728   83c5
     TRB3sc 1661  f300000941240528   83c6
-      TRB3   60  b5000003482d3d28   5000
-      TRB3   61  d5000003481eef28   5001
-      TRB3   62  ec00000348284328   5002
-      TRB3   63  34000003482d1c28   5003
+      TRB3  310  0500000390172728   6460
+      TRB3  311  8c00000390146128   6461
+      TRB3  312  2700000390171d28   6462
+      TRB3  313  2300000390173b28   6463
+      TRB3  640  d10000046f465028   6420
+      TRB3  641  850000046f20f728   6421
+      TRB3  642  460000046f209728   6422
+      TRB3  643  700000046f394b28   6423
+      TRB3  710  8d000003131c6328   6440
+      TRB3  711  1b000003131c6a28   6441
+      TRB3  712  30000003131fb228   6442
+      TRB3  713  69000003131fb128   6443
+      TRB3 1080  3d000004fa143328   6410
+      TRB3 1081  a3000004fa147628   6411
+      TRB3 1082  50000004fa0dff28   6412
+      TRB3 1083  d6000004f9ecae28   6413
+      TRB3 1180  95000005ed3c0a28   6430
+      TRB3 1181  73000005ed388428   6431
+      TRB3 1182  ef000005ed1aeb28   6432
+      TRB3 1183  06000005ed1afd28   6433
+      TRB3 1220  08000005ed4c4d28   6444
+      TRB3 1221  42000005ed6b0428   6445
+      TRB3 1222  e0000005ed1c4128   6454
+      TRB3 1223  29000005ed4bae28   6455
+      TRB3 1250  27000005ed8af428   6400
+      TRB3 1251  92000005ed912828   6401
+      TRB3 1252  35000005ed86d328   6402
+      TRB3 1253  08000005ed905228   6403
+      TRB3 1540  070000070ee3cc28   6464
+      TRB3 1541  b80000070ee46a28   6465
+      TRB3 1542  800000070ee3d828   6474
+      TRB3 1543  160000070ee3d128   6475
+      TRB3 1550  4a0000070f35cc28   6450
+      TRB3 1551  150000070f3b6428   6451
+      TRB3 1552  010000070f366f28   6452
+      TRB3 1553  5a0000070ef42f28   6453
+      TRB3 1570  e90000070ecab028   6470
+      TRB3 1571  050000070f310628   6471
+      TRB3 1572  6e0000070ecaa428   6472
+      TRB3 1573  360000070f3ea628   6473
+      TRB3  315  9c00000390194c28   8b13
+      TRB3  645  f50000046f394c28   8b02
+      TRB3  715  b1000003131f9328   8b10
+      TRB3 1085  ef000004fa0e3d28   8b01
+      TRB3 1185  e7000005ed389e28   8b03
+      TRB3 1225  f9000005ed797028   8b12
+      TRB3 1255  e7000005ed7ede28   8b00
+      TRB3 1545  9e0000070ee47628   8b15
+      TRB3 1555  360000070f366e28   8b11
+      TRB3 1575  b90000070f3dd528   8b14
       TRB3 1060  68000004f9e34528   5010
       TRB3 1061  40000004f9e00b28   5011
       TRB3 1062  ea000004fa000028   5012
       TRB3 1063  c7000004fa00c628   5013
-      TRB3   65  c4000003481ef228   8880
-      TRB3 1065  4b000004f9decd28   8890
-       TRB   62  df000001c17f1728   4c30
-       TRB   64  910000012419cd28   4c10
-       TRB   72  71000001c17b8728   4c31
-       TRB   79  58000001fc5ba128   4c00
-       TRB   81  5a000001fc5de428   4c40
-       TRB   84  be00000123ec4c28   4c50
-       TRB   86  34000001fc5bb028   4c20
-    TRB3sc    9  3c00000270ca9528   8600
+      TRB3   60  b5000003482d3d28   5c20
+      TRB3   61  d5000003481eef28   5c21
+      TRB3   62  ec00000348284328   5c22
+      TRB3   63  34000003482d1c28   5c23
+      TRB3  880  04000003133e3728   5c10
+      TRB3  881  8e0000031321c228   5c11
+      TRB3  882  e1000003133e4b28   5c12
+      TRB3  883  ef000003133e3228   5c13
+      TRB3  940  05000004f9db9b28   5c50
+      TRB3  941  4e000004fa20a028   5c51
+      TRB3  942  a5000004fa24c128   5c52
+      TRB3  943  c7000004fa24a928   5c53
+      TRB3 1130  0d000005ed1d6828   5c40
+      TRB3 1131  8e000005ed272228   5c41
+      TRB3 1132  66000005ed2b1d28   5c42
+      TRB3 1133  b9000005ed217528   5c43
+      TRB3 2410  d9000008138f7228   5c00
+      TRB3 2411  93000008129bca28   5c01
+      TRB3 2412  df0000081244c628   5c02
+      TRB3 2413  25000008129bea28   5c03
+      TRB3 2420  dd0000081361fb28   5c30
+      TRB3 2421  6500000812740e28   5c31
+      TRB3 2422  d2000008135a6628   5c32
+      TRB3 2423  4b00000813706228   5c33
+      TRB3   65  c4000003481ef228   86c2
+      TRB3  885  650000031321c728   86c1
+      TRB3  945  81000004fa286228   86c5
+      TRB3 1135  ae000005ed215d28   86c4
+      TRB3 2415  5b0000081391d228   86c0
+      TRB3 2425  22000008135a2128   86c3
        TRB   60  7e00000123f4fb28   4400
        TRB   90  28000001fc4bcb28   4410
        TRB  108  c9000001c1712428   4420
-    TRB3sc    7  ad00000270ce4828   8700

diff --git a/oracle/daq2stdout.pl b/oracle/daq2stdout.pl
index b63a4d2ca6d98c1e4315ef75579bc05baad9c5ab..fdb606a36a8c51546f516d482b00d2f7a6e2442a 100755 (executable)
--- a/oracle/daq2stdout.pl
+++ b/oracle/daq2stdout.pl
@@ -110,7 +110,8 @@ sub readDB()
 &readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Ecal-Hub",0);
 &readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Rich-Hub",0);
 &readSerialsDB("../../daqtools/base/serials_trb3sc.db", "RPC-Hub",0);
-&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "TOF-Hub",0);
+#&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "TOF-Hub",0);
+&readSerialsDB("../../daqtools/base/serials_trb3.db", "TOF-Hub",0);
 
 &readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Central-Hub",0);
 &readSerialsDB("../../daqtools/base/serials_trb3.db", "STS-Hub",0);
@@ -134,6 +135,7 @@ sub readDB()
     #&readSerialsDB("../shower/serials_shower.db", "Shw-AddOn");
     #&readSerialsDB("../tof/serials_tof.db", "TOF",0);
     &readSerialsDB("../tof/serials_trb3sc.db", "TOF",0);
+    &readSerialsDB("../tof/serials_trb3.db", "TOF",0);
     
     &readSerialsDB("../wall/serials_wall.db", "Wall",0);
     &readSerialsDB("../sts/serials_trb3.db", "STS",0);
@@ -147,7 +149,8 @@ sub readDB()
      &readAddressesDB("../hub/addresses_hub_trb3sc.db","Ecal-Hub");
      &readAddressesDB("../hub/addresses_hub_trb3sc.db","Rich-Hub");
      &readAddressesDB("../hub/addresses_hub_trb3sc.db","RPC-Hub");
-     &readAddressesDB("../hub/addresses_hub_trb3sc.db","TOF-Hub");
+     #&readAddressesDB("../hub/addresses_hub_trb3sc.db","TOF-Hub");
+     &readAddressesDB("../hub/addresses_hub_trb3.db","TOF-Hub");
       
     &readAddressesDB("../hub/addresses_hub_trb3.db","STS-Hub");
      

diff --git a/oracle/subevtids.txt b/oracle/subevtids.txt
index 3df3da20e2bd99ed19d7eae6401f17ca81296cf9..bd975f106cd53be7d5e86cb2c19270f4d9ff3e68 100644 (file)
--- a/oracle/subevtids.txt
+++ b/oracle/subevtids.txt
@@ -18,8 +18,12 @@
  MDC-AddOn   1020  MDC-AddOn
  MDC-AddOn   1050  MDC-AddOn
  MDC-AddOn   1000  MDC-AddOn
-    TRB3sc   8400    RPC-Hub
-    TRB3sc   8410    RPC-Hub
+    TRB3sc   84c1    RPC-Hub
+    TRB3sc   84c3    RPC-Hub
+    TRB3sc   84c4    RPC-Hub
+    TRB3sc   84c2    RPC-Hub
+    TRB3sc   84c5    RPC-Hub
+    TRB3sc   84c0    RPC-Hub
     TRB3sc   83ca   Rich-Hub
     TRB3sc   83c7   Rich-Hub
     TRB3sc   83c3   Rich-Hub
@@ -31,7 +35,15 @@
     TRB3sc   83c8   Rich-Hub
     TRB3sc   83c5   Rich-Hub
     TRB3sc   83c6   Rich-Hub
-      TRB3   8880 StartTrb3Hub
-      TRB3   8890 StartTrb3Hub
-    TRB3sc   8600    TOF-Hub
-    TRB3sc   8700   Wall-Hub
+      TRB3   8b13    STS-Hub
+      TRB3   8b10    STS-Hub
+      TRB3   8b12    STS-Hub
+      TRB3   8b15    STS-Hub
+      TRB3   8b11    STS-Hub
+      TRB3   8b14    STS-Hub
+      TRB3   86c2    TOF-Hub
+      TRB3   86c1    TOF-Hub
+      TRB3   86c5    TOF-Hub
+      TRB3   86c4    TOF-Hub
+      TRB3   86c0    TOF-Hub
+      TRB3   86c3    TOF-Hub

diff --git a/rich/trb_dirich_threshold b/rich/trb_dirich_threshold
index ac56f9ee2bc5b30623ed0118368a9423e9c6228f..e1cf4da6fb5154b7c57475a411786f6692cbb5cd 160000 (submodule)
--- a/rich/trb_dirich_threshold
+++ b/rich/trb_dirich_threshold
@@ -1 +1 @@
-Subproject commit ac56f9ee2bc5b30623ed0118368a9423e9c6228f
+Subproject commit e1cf4da6fb5154b7c57475a411786f6692cbb5cd

diff --git a/start/addresses_start_trb3.db b/start/addresses_start_trb3.db
index 7a73863f7c6162bbd22f864df5d0ba9d6ecf8cf6..fd73fbf439078073f6ccf9804d6f8c1a19bc75e7 100644 (file)
--- a/start/addresses_start_trb3.db
+++ b/start/addresses_start_trb3.db
@@ -1,9 +1,9 @@
 #Address  #   S/N   #   FPGA  #   Design  #  TRB  #
 ###################################################
-0x5000       0060        0           0       0
-0x5001       0061        1           0       0
-0x5002       0062        2           0       0
-0x5003       0063        3           0       0
+#0x5000       0060        0           0       0
+#0x5001       0061        1           0       0
+#0x5002       0062        2           0       0
+#0x5003       0063        3           0       0
 
 0x5010       1060        0           0       0
 0x5011       1061        1           0       0

diff --git a/sts/addresses_sts.db b/sts/addresses_sts.db
index f1887affd4af74102be02a6c63269bb925a9a302..92df92e1d70af3545b475b9cd386aa1e68f89779 100644 (file)
--- a/sts/addresses_sts.db
+++ b/sts/addresses_sts.db
@@ -15,7 +15,7 @@
 
 # STS2-3
 0x6444     1220      0
-0x6445     1221      1  -- has endpoint id 3?
+0x6445     1221      1  # has endpoint id 3?
 0x6454     1222      2
 0x6455     1223      3
 
@@ -37,3 +37,30 @@
 0x6472     1572      2
 0x6473     1573      3
 
+# STS1-1
+0x6400     1250      0
+0x6401     1251      1
+0x6402     1252      2
+0x6403     1253      3
+
+# STS1-2
+0x6410     1080      0
+0x6411     1081      1
+0x6412     1082      2
+0x6413     1083      3
+
+# STS1-3
+0x6420     0640      0
+0x6421     0641      1
+0x6422     0642      2
+0x6423     0643      3
+
+# STS1-4
+0x6430     1180      0
+0x6431     1181      1
+0x6432     1182      2
+0x6433     1183      3
+
+
+
+

diff --git a/tof/addresses_tofnew.db b/tof/addresses_tofnew.db
index 89d33f22e78747b2e11e7d6d3daadd7a5b89144a..6e312132bfb49604d1162565523f3c2091157ff4 100644 (file)
--- a/tof/addresses_tofnew.db
+++ b/tof/addresses_tofnew.db
@@ -1,17 +1,32 @@
 #Address  #   S/N   #   FPGA  #   Design  #  TRB  #
 ###################################################
-0x5C30        2550       0 
-0x5C31        2551       1 
-0x5C32        2552       2 
-0x5C33        2553       3
+0x5C00        2410       0 
+0x5C01        2411       1 
+0x5C02        2412       2 
+0x5C03        2413       3
 
-#0x5C60        2500       0 
-#0x5C61        2501       1 
-#0x5C62        2502       2 
-#0x5C63        2503       3
+0x5C10        0880       0 
+0x5C11        0881       1 
+0x5C12        0882       2 
+0x5C13        0883       3
+
+0x5C20        0060       0 
+0x5C21        0061       1 
+0x5C22        0062       2 
+0x5C23        0063       3
+
+0x5C30        2420       0 
+0x5C31        2421       1 
+0x5C32        2422       2 
+0x5C33        2423       3
+
+0x5C40        1130       0 
+0x5C41        1131       1 
+0x5C42        1132       2 
+0x5C43        1133       3
+
+0x5C50        0940       0 
+0x5C51        0941       1 
+0x5C52        0942       2 
+0x5C53        0943       3
 
- 
-0x5C30        3041       1
-0x5C31        3081       1 
-0x5C32        3091       1 
-0x5C33        3141       1

diff --git a/tof/startup.script b/tof/startup.script
index b20ec1768dcdb2be6a68e98e4de8c759762cdfa0..64d59b44e37f9da3b465b07c4244a384abec7e51 100644 (file)
--- a/tof/startup.script
+++ b/tof/startup.script
@@ -1,20 +1,18 @@
 
 #Set all addresses
 !ifndef RESTART
-  set_addresses  serials_tof.db  addresses_tof.db     #addresses for TOF TRB
+#  set_addresses  serials_tof.db  addresses_tof.db     #addresses for TOF TRB
   set_addresses  serials_trb3.db  addresses_tofnew.db     #addresses for TOF TRB
-  set_addresses  serials_trb3sc.db  addresses_tofnew.db     #addresses for TOF TRB
 !endif
 
 
-trbcmd w 0xfe47 0x7111 500  #max number of words per board
-trbcmd w 0xfe47 0x7114 0x00050000 #min number of words per board
+trbcmd w 0xfe48 0x7111 500  #max number of words per board
+trbcmd w 0xfe48 0x7114 0x00050000 #min number of words per board
 
 #Load TDC settings
 load_register  register_tdc_tof.db
 
-
-
+exec_cmd{local} /home/hadaq/trbsoft/daq/tof/setThreshold.sh