JAM: updated eventbuilder config for new servers

changed storage archive to mar19
restart previous file type automatically when restarting daq
check in everything that has changed

diff --git a/control/gui/eb/25_Restart_BNET_9_Builders b/control/gui/eb/25_Restart_BNET_9_Builders
deleted file mode 100755 (executable)
index 4c2bcd8..0000000
--- a/control/gui/eb/25_Restart_BNET_9_Builders
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# notifyall.sh "DAQ" "<I> Eventbuilders are being restarted." "EB" &
-
-ssh -X hadaq@lxhadesdaq "
- xterm -geometry 80x24 -bg orange -fg black -e bash -c '
-  echo "Starting Eventbuilders  with 9 BNET builder nodes"
-  cd ~/trbsoft/hadesdaq/evtbuild/
-  ./start_eb_gbe.pl -e restart -n 1-16  -d on -p te -b 9
-  sleep 2
- '
- "
-
-/home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been restarted using 9 BNET builder nodes" "EB" &
-

diff --git a/control/gui/expert/Set_RICH_HV b/control/gui/expert/Set_RICH_HV
index 58bf5aa4a852044d80f8719b67d31327d2b6045f..6f26ba6a5b71dd4d10a709fc5c0504296f213b52 100755 (executable)
--- a/control/gui/expert/Set_RICH_HV
+++ b/control/gui/expert/Set_RICH_HV
@@ -10,8 +10,12 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   cd /home/hadaq/JoF/HV_RICH/
   . epics
   ./setCrate.sh 1
-  ./setHV.sh gain_alignement_HV_1.5E+06.dat
-  ./setHVon_off.sh gain_alignement_HV_1.5E+06.dat 2
+  ./setHV.sh gain_alignement_HV_1.5E+06_fifth.dat
+#  ./setHV.sh gain_alignement_HV_1.5E+06.dat
+#  ./setHV.sh gain_alignement_HV_2.0E+06.dat
+  ./setHVon_off.sh gain_alignement_HV_1.5E+06_fifth.dat 2
+#  ./setHVon_off.sh gain_alignement_HV_1.5E+06.dat 2
+#  ./setHVon_off.sh gain_alignement_HV_2.0E+06.dat 2
   echo \"Done\"
   sleep 10
 "

diff --git a/control/gui/expert/Set_RICH_Thr b/control/gui/expert/Set_RICH_Thr
index 4f1424442f08fa22870291a5625c5f8afeb30f7f..f5b2461b989265e7cc890e8e0b2bc640b6ded9a4 100755 (executable)
--- a/control/gui/expert/Set_RICH_Thr
+++ b/control/gui/expert/Set_RICH_Thr
@@ -11,7 +11,7 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   source ./setLD
   #./HADESthreshscan_v1
   #./HADESthreshscan_v1 --loading-file /home/hadaq/trbsoft/daqtools/thresholds/threshold_wuppertal/trb_dirich_threshold/standard_baselines.thr -l 0 -n 0 5
-  ./HADESthreshscan_v1 --loading-file /home/hadaq/trbsoft/daqtools/thresholds/threshold_wuppertal/trb_dirich_threshold/standard_baselines.thr -l 0 -t 0 50
+  ./HADESthreshscan_v1 --loading-file /home/hadaq/trbsoft/daqtools/thresholds/threshold_wuppertal/trb_dirich_threshold/threshold_files/standard_baselines.thr -l 0 -t 0 50
   echo \"Done\"
   sleep 10
 "

diff --git a/ecal/register_monitoring_trigger_simpleor.db b/ecal/register_monitoring_trigger_simpleor.db
index cc5dfa66038429bea9da441aad975b8de64046ba..3ee33418521bfcf456e27aabece6cf59fb20bdb5 100644 (file)
--- a/ecal/register_monitoring_trigger_simpleor.db
+++ b/ecal/register_monitoring_trigger_simpleor.db
@@ -32,8 +32,9 @@
  0x8a04       1                  0x00000015                0x00015400
  0x8a05       1                  0x00000000                0x00015400
         #left half of crate on output 1, right half on output 2
-        
- 0x0100       0      0x00007c7c   0x00007c7c   0x00000000   0x00000000   0x00000000   0x00007c7c   0x00000000    0x00000000   0x00000000
+    
+    
+ 0x0100       0      0x00007c7c   0x00007c7c   0x00000000   0x00000000   0x00000000   0x00007e7e   0x00000000    0x00000000   0x00000000
         #1..6: output 1, #9..14 output 2
         
  0x0100       2     0x00007c7c   0x00020000   0x00000200

diff --git a/evtbuild/eb.conf b/evtbuild/eb.conf
index 786c207fe9673c017546c99fde1708e2f9735c72..3d136d82dae700accde08132f5daf647686af730 120000 (symlink)
--- a/evtbuild/eb.conf
+++ b/evtbuild/eb.conf
@@ -1 +1 @@
-eb_bnet_ltsm.conf
\ No newline at end of file
+eb_bnet_ltsm_newservers.conf
\ No newline at end of file

diff --git a/evtbuild/eb_bnet_ltsm_newservers.conf b/evtbuild/eb_bnet_ltsm_newservers.conf
index 648b0d138323ff4444f48356496e5eb4b85ce8e8..c9c5a25f80c4f0f0ca39d060a9b3df754078335e 100644 (file)
--- a/evtbuild/eb_bnet_ltsm_newservers.conf
+++ b/evtbuild/eb_bnet_ltsm_newservers.conf
@@ -144,7 +144,7 @@ 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/hebe/hades/raw/jul18/default/tsm
+LTSM_PATH:      /lustre/hebe/hades/raw/mar19/default/tsm
 #LTSM_Server:  lxltsm01-tsm-server
 LTSM_Server: lxltsm01
 

diff --git a/evtbuild/start_eb_gbe.pl b/evtbuild/start_eb_gbe.pl
index 6fc7c8a30398c56c72563044c17d27bda44a254f..197735fe6bd478312b310371f28d1c2ae56db414 120000 (symlink)
--- a/evtbuild/start_eb_gbe.pl
+++ b/evtbuild/start_eb_gbe.pl
@@ -1 +1 @@
-start_eb_gbe_oldservers.pl
\ No newline at end of file
+start_eb_gbe_newservers.pl
\ No newline at end of file

diff --git a/evtbuild/start_eb_gbe_newservers.pl b/evtbuild/start_eb_gbe_newservers.pl
index b25703820d3ac9c9d37583ba342d64c98c60c88a..da45991f9441805ef4c04ebfb2cfdd9ebcc2a6cd 100755 (executable)
--- a/evtbuild/start_eb_gbe_newservers.pl
+++ b/evtbuild/start_eb_gbe_newservers.pl
@@ -256,14 +256,40 @@ sub init_CPU_status()
            
         }
     }  
-
+ # alternative setup: specifiy cpu bitmasks for different roles:
+    
+    $EB_CPU_status_href->{'192.168.100.15'}->{'input'} = "2-23";
+    $EB_CPU_status_href->{'192.168.100.15'}->{'build'} = "2-23";
+    
+    # JAM12-2018: reserve lower 32 cpus for network interrupts
+    $EB_CPU_status_href->{'192.168.100.8'}->{'input'} = "32-47";
+    $EB_CPU_status_href->{'192.168.100.8'}->{'build'} = "48-63";
+    $EB_CPU_status_href->{'192.168.100.9'}->{'input'} = "32-47";
+    $EB_CPU_status_href->{'192.168.100.9'}->{'build'} = "48-63";
+    $EB_CPU_status_href->{'192.168.100.10'}->{'input'} = "32-47";
+    $EB_CPU_status_href->{'192.168.100.10'}->{'build'} = "48-63";
+    $EB_CPU_status_href->{'192.168.105.11'}->{'input'} = "32-47";
+    $EB_CPU_status_href->{'192.168.105.11'}->{'build'} = "48-63";
+    $EB_CPU_status_href->{'192.168.105.12'}->{'input'} = "32-47";
+    $EB_CPU_status_href->{'192.168.105.12'}->{'build'} = "48-63";
+    
 }
 
+
 sub getCoreNr()
 {
-    my ($ip) = @_;
-
+    #my ($ip) = @_;
+    my ($ip, $role) = @_;
     my $core_nr;
+    if(defined $role)
+    {
+    
+       $core_nr = $EB_CPU_status_href->{$ip}->{$role}
+ 
+    }
+    else
+    {
+ ################### begin old       
 
     foreach my $eb_ip (sort keys %$EB_CPU_status_href){
         next unless($ip eq $eb_ip);
@@ -295,15 +321,21 @@ sub getCoreNr()
             }
         }
     }
-
+    
+################### end old    
+}
     unless( defined $core_nr ){
         print "No free cores left on CPU $ip. Exit.\n";
         exit(0);
     }
 
+    print "found core numbers $core_nr for node $ip, role $role\n";  
     return $core_nr;
 }
 
+
+
+
 sub setArgs()
 {
     my @active_EBs;
@@ -1894,7 +1926,10 @@ sub readActiveSources()
     &isFileDefined($fh, $file);
 
     my $SPACE = "";
-
+    
+   # this one contains list of deactivated data sources
+    my $log="/home/hadaq/trbsoft/hadesdaq/evtbuild/tmp/EB_NotActiveSources.txt";
+    system("truncate -s 0 $log ;");
     while(<$fh>){
         
         #- Remove all comments
@@ -1909,8 +1944,10 @@ sub readActiveSources()
 
         my ($addr, $astat, $sys, $size)  = split(" ", $_);
 
-        next if($astat == 0);
-
+      if($astat == 0){
+         system("echo $addr >> $log 2>&1;");       
+        next;
+        }
         push( @{$activeSources_href->{'addr_list'}}, $addr);
         push( @{$activeSources_href->{'bufsize_list'}}, &getBufSize($size)); 
     }

diff --git a/evtbuild/start_eb_gbe_oldservers.pl b/evtbuild/start_eb_gbe_oldservers.pl
index 8bebe6015588c2dd282f6f2b4e79428055dbfdf3..b6ea629daf3b102528e6aef530b8ec8d3fb827ef 100755 (executable)
--- a/evtbuild/start_eb_gbe_oldservers.pl
+++ b/evtbuild/start_eb_gbe_oldservers.pl
@@ -202,19 +202,19 @@ sub init_CPU_status()
 #     }
 #        
 ## after upgrade to debian 7: ethernet reserved cores are below 6
-  foreach my $core (0..11){
-        if(($core < 6) ){
-            $EB_CPU_status_href->{'192.168.100.12'}->{$core} = "res"; #reserved
-            $EB_CPU_status_href->{'192.168.100.13'}->{$core} = "res"; #reserved
-            $EB_CPU_status_href->{'192.168.100.14'}->{$core} = "res"; #reserved
-        }
-        else{
-            $EB_CPU_status_href->{'192.168.100.12'}->{$core} = "free";
-            $EB_CPU_status_href->{'192.168.100.13'}->{$core} = "free";
-            $EB_CPU_status_href->{'192.168.100.14'}->{$core} = "free";
-            
-        }
-    }
+#   foreach my $core (0..11){
+#         if(($core < 6) ){
+#             $EB_CPU_status_href->{'192.168.100.12'}->{$core} = "res"; #reserved
+#             $EB_CPU_status_href->{'192.168.100.13'}->{$core} = "res"; #reserved
+#             $EB_CPU_status_href->{'192.168.100.14'}->{$core} = "res"; #reserved
+#         }
+#         else{
+#             $EB_CPU_status_href->{'192.168.100.12'}->{$core} = "free";
+#             $EB_CPU_status_href->{'192.168.100.13'}->{$core} = "free";
+#             $EB_CPU_status_href->{'192.168.100.14'}->{$core} = "free";
+#             
+#         }
+#     }
     
 # eth0 ir is set above core 11   
     foreach my $core (0..23){
@@ -228,7 +228,9 @@ sub init_CPU_status()
     
     # add cores for new EB servers JAM2018
    foreach my $core (0..63){
-        if( ($core < 2) ||( $core > 60) ){
+    #    if( ($core < 2) ||( $core > 60) ){
+    # JAM2018: we only want cores of the lower half with common memory access for input nodes
+        if( ( $core > 31) ){ 
             $EB_CPU_status_href->{'192.168.100.8'}->{$core} = "res"; #reserved
            $EB_CPU_status_href->{'192.168.100.9'}->{$core} = "res"; #reserved
            $EB_CPU_status_href->{'192.168.100.10'}->{$core} = "res"; #reserved
@@ -240,13 +242,35 @@ sub init_CPU_status()
         }
     }  
 
+    # alternative setup: specifiy cpu bitmasks for different roles:
+    
+    $EB_CPU_status_href->{'192.168.100.15'}->{'input'} = "0-23";
+    $EB_CPU_status_href->{'192.168.100.15'}->{'build'} = "0-23";
+    
+    # JAM12-2018: reserve lower 32 cpus for network interrupts, ebs use only upper half
+    $EB_CPU_status_href->{'192.168.100.8'}->{'input'} = "32-47";
+    $EB_CPU_status_href->{'192.168.100.8'}->{'build'} = "48-63";
+    $EB_CPU_status_href->{'192.168.100.9'}->{'input'} = "32-47";
+    $EB_CPU_status_href->{'192.168.100.9'}->{'build'} = "48-63";
+    $EB_CPU_status_href->{'192.168.100.10'}->{'input'} = "32-47"; #"32-55"; #0-31
+    $EB_CPU_status_href->{'192.168.100.10'}->{'build'} = "48-63"; # 32-63
+    
 }
 
 sub getCoreNr()
 {
-    my ($ip) = @_;
-
+    #my ($ip) = @_;
+    my ($ip, $role) = @_;
     my $core_nr;
+    if(defined $role)
+    {
+    
+       $core_nr = $EB_CPU_status_href->{$ip}->{$role}
+ 
+    }
+    else
+    {
+ ################### begin old       
 
     foreach my $eb_ip (sort keys %$EB_CPU_status_href){
         next unless($ip eq $eb_ip);
@@ -278,12 +302,15 @@ sub getCoreNr()
             }
         }
     }
-
+    
+################### end old    
+}
     unless( defined $core_nr ){
         print "No free cores left on CPU $ip. Exit.\n";
         exit(0);
     }
 
+    print "found core numbers $core_nr for node $ip, role $role\n";  
     return $core_nr;
 }
 
@@ -779,10 +806,13 @@ for ( my $ebserver=0; $ebserver<4; $ebserver=$ebserver+1){
          # todo: how to configure situation with more than one bnet input per node? hadaqports must be distributed on them...
          #     
                
-         #my $core_nr = &getCoreNr($cpu) . "," . &getCoreNr($cpu);
+       #  my $core_nr = &getCoreNr($cpu) . "," . &getCoreNr($cpu);
      
         # my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports taskset -c $core_nr  $cmd_dabc $conf_bnet_inp 1</dev/null &\"";
-         my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports   $cmd_dabc $conf_bnet_inp >senderlog_$cpu.log 2>&1  &\"";
+        my $core_nr = &getCoreNr($cpu, 'input');
+        # my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports   $cmd_dabc $conf_bnet_inp >senderlog_$cpu.log 2>&1  &\"";
+        #my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports  taskset -c 0-23 $cmd_dabc $conf_bnet_inp >senderlog_$cpu.log 2>&1  &\"";
+        my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports  taskset -c $core_nr $cmd_dabc $conf_bnet_inp >senderlog_$cpu.log 2>&1  &\"";
 
 
          my $log = $log_path . "/log_" . $ebserver . "_" . "startBnetInp_". $sender. ".txt";
@@ -883,9 +913,10 @@ for ( my $ebserver=0; $ebserver<4; $ebserver=$ebserver+1){
          }
   
        #my $core_nr = &getCoreNr($cpu) . "," . &getCoreNr($cpu);
-     
+        my $core_nr = &getCoreNr($cpu, 'build');
        #my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports taskset -c $core_nr  $cmd_dabc $conf_bnet_bld 1</dev/null &\"";
-       my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports   $cmd_dabc $conf_bnet_bld  >builderlog_$cpu.log 2>&1  &\"";
+       #my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports   $cmd_dabc $conf_bnet_bld  >builderlog_$cpu.log 2>&1  &\"";
+        my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports  taskset -c $core_nr $cmd_dabc $conf_bnet_bld  >builderlog_$cpu.log 2>&1  &\"";
 
 
        my $log = $log_path . "/log_" . $ebserver . "_" . "startBnetBld_". $builder . ".txt";
@@ -1877,7 +1908,10 @@ sub readActiveSources()
     &isFileDefined($fh, $file);
 
     my $SPACE = "";
-
+    
+    # this one contains list of deactivated data sources
+    my $log="/home/hadaq/trbsoft/hadesdaq/evtbuild/tmp/EB_NotActiveSources.txt";
+    system("truncate -s 0 $log ;");
     while(<$fh>){
         
         #- Remove all comments
@@ -1892,7 +1926,11 @@ sub readActiveSources()
 
         my ($addr, $astat, $sys, $size)  = split(" ", $_);
 
-        next if($astat == 0);
+        if($astat == 0){
+         system("echo $addr >> $log 2>&1;");       
+        next;
+        }
+        
 
         push( @{$activeSources_href->{'addr_list'}}, $addr);
         push( @{$activeSources_href->{'bufsize_list'}}, &getBufSize($size)); 

diff --git a/evtbuild/tdc_calib_start.sh b/evtbuild/tdc_calib_start.sh
index 5d9bb0d93f482eac3051df5de89e885128a88067..ec2846aff498e767a82fb42f607120bb7cfa3231 100755 (executable)
--- a/evtbuild/tdc_calib_start.sh
+++ b/evtbuild/tdc_calib_start.sh
@@ -5,7 +5,8 @@ export DAQOPSERVER=hadesp31;
    trbcmd r 0x003 0xa0c7 > /home/hadaq/tmp/precalibctsregs.txt 2> /home/hadaq/tmp/precalibctserr.txt ;
    echo disabled output mask: `cat /home/hadaq/tmp/precalibctsregs.txt`;
    trbcmd w 0x003 0xa0c7 0;
-   trbcmd setbit 0x003 0xa0c0 0x1D;
+   trbcmd clearbit 0x003 0xa0c0 0x1F;
+   trbcmd setbit   0x003 0xa0c0 0x1D;
    trbcmd w 0x003 0xa0e3  0x1E8480;
    echo Setting file prefix tc;
    /usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt "http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=tc&oninit=10";

diff --git a/hmon/QA.pm b/hmon/QA.pm
index d38b37120bceac8fb9a34ddf0c3a0fe4d8a81d35..c3c2a514148bc0fb263ddb428a3a7b8866789ae9 100644 (file)
--- a/hmon/QA.pm
+++ b/hmon/QA.pm
@@ -40,7 +40,7 @@ our $entries->{'cats'} = ["main",
 ];
 
 # Order of entries in each cat
-$entries->{'main'}    = ['time', 'rate','onlineqa','up','speech'];
+$entries->{'main'}    = ['time', 'rate','onlineqa','up',''];
 $entries->{'daq'}     = ['trbnet', 'timeouts', 'busy','readout','spillcount'];
 $entries->{'trg'}     = ['spill', 'accepted', 'source','pt1rate',  'start']; #, 
 $entries->{'rate'}    = ['pt1','start','hodo','pion1','pion2'];

diff --git a/hmon/doc/other-magnet.htt b/hmon/doc/other-magnet.htt
deleted file mode 100644 (file)
index e712229..0000000
--- a/hmon/doc/other-magnet.htt
+++ /dev/null
@@ -1,18 +0,0 @@
-<h3>Magnet</h3>
-<p>
-This button shows the status of the Magnet systems. 
-</p>
-<h4>Error Handling in case it is not <font color="gree">Green</font> for > 2 min.</h4>
-
-<p>The script might show red precisely at midnight due to change of logfiles. Don't worry in this case.
-
-Call <b>Torsten Heinz</b> (mobile: 0175 388 4066 or home: 06162 982292 or work: 2781<br>
-and <b>Wolfgang Koenig</b> (mobile: 0172 877 50 49 or home: 06071 35998 or work: 2720)!
-
-
-<p>If no ssh connection to the magnet PC is possible (hadesp28), check if the machine is still running (upstairs, next to cryo)
-
-
-
-
-

diff --git a/hmon/doc/other-sequencer.htt b/hmon/doc/other-sequencer.htt
deleted file mode 100644 (file)
index d76c428..0000000
--- a/hmon/doc/other-sequencer.htt
+++ /dev/null
@@ -1,7 +0,0 @@
-<h3>EPICS HV Sequencer</h3>
-
-<p>Some high voltage control is not working any more. Please inform the MDC operator before taking any action.
-<h4>Error Handling</h4>
-<p>Click the 'Restart Sequencer' button in the control window or run on lxhadeb06:
-<br><pre>ssh scs@lxhadeb06 'echo -en "\x18" | netcat -w 1 localhost 4813</pre>
-<br>Restarting might take a minute until the button is green again.

diff --git a/hmon/doc/restartEBguideline.htm b/hmon/doc/restartEBguideline.htm
deleted file mode 100644 (file)
index ec76330..0000000
--- a/hmon/doc/restartEBguideline.htm
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-   
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>Tactical Overview Documentation</title>
-<meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
-
-<link href="../files/indexstyles.css" rel="stylesheet" type="text/css"/>
-</head>
-<body class=index>
-<div class="button" style="right:-8px;" onclick="history.back();">&nbsp;back&nbsp;</div>
-<h1>Restart EB Guideline</h1>
-<h2>In case EB has to be restarted</h2>
-</body>
-</html>
\ No newline at end of file

diff --git a/hmon/doc/trg-ptrate.htt b/hmon/doc/trg-ptrate.htt
deleted file mode 100644 (file)
index d3e5978..0000000
--- a/hmon/doc/trg-ptrate.htt
+++ /dev/null
@@ -1,9 +0,0 @@
-<h3>PT3 Rate</h3>
-<p>
-This button shows the triggered high multiplicity events per second compared to the countrate in the Start-detector. 
-The second number should be around 0.7% during beam time since the interaction rate is around 1%. The first value is the rate
-of PT3 triggers provided to the CTS.
-<br>
-If something goes wrong, ask your shift leader.
-
-

diff --git a/hmon/hmon_mdc_plotmissingboards.pl b/hmon/hmon_mdc_plotmissingboards.pl
index 99a273167bf9f3070f53cc145647d8872c031746..412667af739947b576074bcbcfd42705d2fe158e 100755 (executable)
--- a/hmon/hmon_mdc_plotmissingboards.pl
+++ b/hmon/hmon_mdc_plotmissingboards.pl
@@ -19,11 +19,11 @@ my ($max,$min);
 my $lasttime = 0;
 my $store = {};
 
-  my @out = qx(ssh lxhadesdaq cat /home/hadeslog/messages | grep 'Endp 0x\\w\\w\\w\\w missing' | grep -v 2006 | grep -v 2022 | grep -v 2358);
+  my @out = qx(ssh lxhadesdaq cat /home/hadeslog/messages | grep 'Endp 0x\\w\\w\\w\\w .* missing');
 
 
   foreach my $s ( @out) {
-    my ($h,$m,$s,$id_0,$id_1,$id_2) = $s =~ m/(\d\d):(\d\d):(\d\d) .* Endp 0x2(\w)(\w)(\w) missing/;
+    my ($h,$m,$s,$id_0,$id_1,$id_2) = $s =~ m/(\d\d):(\d\d):(\d\d) .* Endp 0x2(\w)(\w)(\w) .* missing/;
     my $time = ($h||0)*3600+($m||0)*60+($s||0);
     if(defined $id_0 && defined $id_1 && defined $id_2 && $time>$lasttime+70) {
       $id_2 = hex($id_2);

diff --git a/hmon/hmon_rate2.pl b/hmon/hmon_rate2.pl
index 8dbfe4ece1b8fcab9cf8c0ac33caccba739671fb..e7c968f6e6d21628c8202e7c524c49614d47404d 100755 (executable)
--- a/hmon/hmon_rate2.pl
+++ b/hmon/hmon_rate2.pl
@@ -18,6 +18,8 @@ my $starterrorcnt = 0;
 
 sub getCorrected {
   my ($val,$cor) = @_;
+  $cor //= 0;
+  $val //= 0;
   my $value = max($val-$cor,0);
   if ($value < $cor/20) {$value = 0;}
   return QA::SciNotation($value);

diff --git a/hmon/permanent/hmon_archiver.pl b/hmon/permanent/hmon_archiver.pl
old mode 100644 (file)
new mode 100755 (executable)
index 7421740..959e3f2
--- a/hmon/permanent/hmon_archiver.pl
+++ b/hmon/permanent/hmon_archiver.pl
@@ -4,6 +4,8 @@ use warnings;
 use strict;
 use POSIX qw(strftime);
 use Data::Dumper;
+use LWP::Simple;
+
 
 my $header = qq@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -51,43 +53,47 @@ function blink() {
 my $footer = "</div></body></html>";
 
 while(1) {
-  my $time = strftime("%Y%m%d%H%M",localtime());
-#     my $time = "201204111356";
+  my $filetype = get("http://lxhadeb07:8099/Master/BNET/RunPrefix/get.json?field=%22value%22");
+  if ($filetype =~ /be/ || $filetype =~ /co/) {
 
-  system("mkdir /home/hadaq/trbsoft/daq/hmon/archive/$time");
-  system("cp /home/hadaq/trbsoft/daq/hmon/files/*.htt /home/hadaq/trbsoft/daq/hmon/files/*.png /home/hadaq/trbsoft/daq/hmon/archive/$time");
-  system("mkdir /home/hadaq/trbsoft/daq/hmon/archive/$time/files");
-  system("mv /home/hadaq/trbsoft/daq/hmon/archive/$time/*.png /home/hadaq/trbsoft/daq/hmon/archive/$time/files/");
-  
-  my @files = qx(ls /home/hadaq/trbsoft/daq/hmon/archive/$time/*.htt);
-  foreach my $f (@files) {
-    my @n = split('/',$f);
-    my $newf = $n[-1];
-    chop $n[-1];
-    chop $newf;chop $newf;
-    $newf .='m';
-#     print $newf."\n";
-    my $fh;
-    open($fh,'>',"/home/hadaq/trbsoft/daq/hmon/archive/$time/$newf");
-    print $fh $header;
-    my @g = qx(cat /home/hadaq/trbsoft/daq/hmon/archive/$time/$n[-1]);
-    foreach my $h (@g) {
-      if($h =~ m!^(.*)\%ADDPNG\s+(.+)\%(.*)$!) {
-        print $fh $1.$2.$3;
-        }
-      else {
-        print $fh $h;
+
+    my $time = strftime("%Y%m%d%H%M",localtime());
+  #     my $time = "201204111356";
+
+    system("mkdir /home/hadaq/trbsoft/daq/hmon/archive/$time");
+    system("cp /home/hadaq/trbsoft/daq/hmon/files/*.htt /home/hadaq/trbsoft/daq/hmon/files/*.png /home/hadaq/trbsoft/daq/hmon/archive/$time");
+    system("mkdir /home/hadaq/trbsoft/daq/hmon/archive/$time/files");
+    system("mv /home/hadaq/trbsoft/daq/hmon/archive/$time/*.png /home/hadaq/trbsoft/daq/hmon/archive/$time/files/");
+    
+    my @files = qx(ls /home/hadaq/trbsoft/daq/hmon/archive/$time/*.htt);
+    foreach my $f (@files) {
+      my @n = split('/',$f);
+      my $newf = $n[-1];
+      chop $n[-1];
+      chop $newf;chop $newf;
+      $newf .='m';
+  #     print $newf."\n";
+      my $fh;
+      open($fh,'>',"/home/hadaq/trbsoft/daq/hmon/archive/$time/$newf");
+      print $fh $header;
+      my @g = qx(cat /home/hadaq/trbsoft/daq/hmon/archive/$time/$n[-1]);
+      foreach my $h (@g) {
+        if($h =~ m!^(.*)\%ADDPNG\s+(.+)\%(.*)$!) {
+          print $fh $1.$2.$3;
+          }
+        else {
+          print $fh $h;
+          }
         }
+      
+      
+      
+      print $fh $footer;
+      close($fh);
+      
       }
-    
-    
-    
-    print $fh $footer;
-    close($fh);
-    
+    system("mv /home/hadaq/trbsoft/daq/hmon/archive/$time/*.htt /home/hadaq/trbsoft/daq/hmon/archive/$time/files/");
     }
-  system("mv /home/hadaq/trbsoft/daq/hmon/archive/$time/*.htt /home/hadaq/trbsoft/daq/hmon/archive/$time/files/");
-
   sleep(590);
   }
   

diff --git a/hmon/permanent/hmon_hldlastfiles.pl b/hmon/permanent/hmon_hldlastfiles.pl
index 4c1c3edf0b7cbb0424adcd49383bd81dac823200..2123dbec29252bfced5c2810c81704ee8c2f4270 100755 (executable)
--- a/hmon/permanent/hmon_hldlastfiles.pl
+++ b/hmon/permanent/hmon_hldlastfiles.pl
@@ -11,11 +11,11 @@ use QA;
 
 
 while(1) {
-  my $out  = Hmon::MakeTitle(6,7,"Last *.hld files"); 
+  my $out  = Hmon::MakeTitle(5,8,"Last *.hld files"); 
   $out .= "<pre style='text-align:left'> ";
-  foreach my $i (8,9,10,5) {
+  foreach my $i (8,9,10,11) {
     my $server = sprintf("lxhadeb%02i",$i);
-    $out .= "$server\n";
+    $out .= "<b>$server</b>\n";
     my $cmd = "ssh $server \"ls -rtlh /data*/data/*.hld | tail -n4\"";
     my @a = qx($cmd);
     foreach my $s (@a) {
@@ -28,4 +28,4 @@ while(1) {
   Hmon::WriteFile("hldlast",$out);
     
   sleep(10);
-  }
\ No newline at end of file
+  }

diff --git a/hmon/permanent/hmon_vertexplots.pl b/hmon/permanent/hmon_vertexplots.pl
index c1246e0df87a13669aec937763f786fc3099b387..f037afcf95582dc7b0c8f51e887bdbe5ef76f95b 100755 (executable)
--- a/hmon/permanent/hmon_vertexplots.pl
+++ b/hmon/permanent/hmon_vertexplots.pl
@@ -44,6 +44,7 @@ while(1) {
     my @n = split('/',$files[$i]);
     chop $n[-1];
     my ($y,$d,$h,$m,$s) = $n[-1] =~ /.*_(\d\d)(\d\d\d)(\d\d)(\d\d)(\d\d)_.*/;
+    map {$_//=0;} ($y,$d,$h,$m,$s);
     $out .= qq@20$y-$d $h:$m:$s<br><div class=\"linkbox\" style=\"width:567px\"><img src="../vertex/$n[-1]" style="padding:10px;background:white;"></div>@;
     }
 
@@ -53,6 +54,8 @@ while(1) {
     my @n = split('/',$files2[$i]);
     chop $n[-1];
     my ($y1,$d1,$h1,$m1,$s1,$y2,$d2,$h2,$m2,$s2) = $n[-1] =~ /.*_(\d\d)(\d\d\d)(\d\d)(\d\d)(\d\d)-[\w-][\w-](\d\d)(\d\d\d)(\d\d)(\d\d)(\d\d).*/;
+    map {$_//=0;} ($y1,$d1,$h1,$m1,$s1,$y2,$d2,$h2,$m2,$s2);
+    
     $out .= qq@20$y1-$d1 $h1:$m1:$s1 - $h2:$m2:$s2<br><div class=\"linkbox\" style=\"width:567px\"><img src="../vertex/$n[-1]" style="padding:11px 10px;background:white;"></div>\n@;
     }
     

diff --git a/hub/register_configgbe_ip.db b/hub/register_configgbe_ip.db
index f60a3b47efcf86ad75ecdd5afe15509a23a61873..2ffd95190209da199b2a631ca37fc40065c1dca4 120000 (symlink)
--- a/hub/register_configgbe_ip.db
+++ b/hub/register_configgbe_ip.db
@@ -1 +1 @@
-register_configgbe_ip_oldservers.db
\ No newline at end of file
+register_configgbe_ip_newservers.db
\ No newline at end of file

diff --git a/hub/register_configgbe_ip_newservers.db b/hub/register_configgbe_ip_newservers.db
index 2b2c1e0ef4e5143b3efe6b85a8f39e3233a5c565..334a17b5a9478e35d690d40497fd04c0a51862c8 100644 (file)
--- a/hub/register_configgbe_ip_newservers.db
+++ b/hub/register_configgbe_ip_newservers.db
@@ -134,7 +134,7 @@
 #lxhadebXX, EB15 XX
   0x8000     0        0xc65B     0xdead8000   0xc0a86480     0xc65B     0xc0a86408 0  # OLD cts  -lxhadeb08
   0x8100     0        0xc651     0xdead8100   0xc0a86481     0xc651     0xc0a86408 0  # OLD    mdc old?  lxhadeb08
-  0x8110     0        0xc652     0xdead8110   0xc0a86482     0xc652     0xc0a86408 0  # OLD    mdc old   lxhadeb08
+#  0x8110     0        0xc652     0xdead8110   0xc0a86482     0xc652     0xc0a8690b 0  # OLD    mdc old   lxhadeb11
   0x8400     0        0xc656     0xdead8400   0xc0a864AF     0xc67F     0xc0a8640a 0  # rpc lxhadeb10
   0x8410     0        0xc657     0xdead8410   0xc0a864AF     0xc67F     0xc0a8640a 0  # rpc lxhadeb10 
   0x8420     0        0xc658     0xdead8420   0xc0a86488     0xc658     0xc0a8690b 0  # OLD    rpc old   lxhadeb11 
@@ -933,9 +933,11 @@
  # 0xff7f    100     0xbaf79bb5     0x90e2     0xc0a86408      0x0230       0x0578     #lxhadeb08  EB0 90:e2:ba:f7:9b:b5  192.168.100.8
  # JAM 27-apr-2018: for DABC-BNET (Type 100) the destination ips have to be set here for individual hubs
 # the ip entries in above table for eb1 needs to match this to configure EBs!
+ # 0xff7f    100     0x2157b095     0x001B     0xc0a8640f      0x0230       0x0578     #dummies to lxhadeb05, EB3 00:1b:21:57:b0:95  192.168.100.15
+#
   0x8000     100    0xbaf79bb5     0x90e2    0xc0a86408     0x0230        0x0578 #     OLD old cts -lxhadeb08 ####
   0x8100     100    0xbaf79bb5     0x90e2    0xc0a86408     0x0230        0x0578 #     OLD mdc old?  lxhadeb08
-  0x8110     100    0x6b662a29     0xac1f    0xc0a8690b     0x0230        0x0578 #     OLD mdc old   lxhadeb11
+#  0x8110     100    0x6b662a29     0xac1f    0xc0a8690b     0x0230        0x0578 #     OLD mdc old   lxhadeb11
   0x8400     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578  #  rpc lxhadeb10
   0x8410     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578  #  rpc lxhadeb10
   0x8420     100    0x6b662a29     0xac1f    0xc0a8690b     0x0230        0x0578 #     OLD rpc old   lxhadeb11 ######

diff --git a/main/data_sources.db b/main/data_sources.db
index 2cc13f70dfcaa194b1bfe65d518dc34069370919..d3fb1f9729d9f709cd416769da7eb08e2499f009 100644 (file)
--- a/main/data_sources.db
+++ b/main/data_sources.db
@@ -7,14 +7,14 @@
 0x8410      1         RPC456             mid
 0x8600      1         TOF               low
 0x8700      1         FW                low
-0x8880      1         StartTRB3         low
-0x8890      0         VetoTRB3          low5t
-0x8900      0         Pion1             mid
-0x8910      0         Pion2             mid
+0x8880      0         StartTRB3         low
+#0x8890      0         VetoTRB3          low5t
+#0x8900      0         Pion1             mid
+#0x8910      0         Pion2             mid
 0x1000      1         MDC12sec1         high
 0x1010      1         MDC12sec2         high
-0x1020      1         MDC12sec3         mid
-0x1030      1         MDC12sec4         mid
+0x1020      1         MDC12sec3         high
+0x1030      1         MDC12sec4         high
 0x1040      1         MDC12sec5         high
 0x1050      1         MDC12sec6         high
 0x1100      1         MDC34sec1         high
@@ -29,15 +29,15 @@
 0x8a03      1         ECal3             mid
 0x8a04      1         ECal4             mid
 0x8a05      1         ECal5             mid
-0x83c0      1         RICH0             mid
-0x83c1      1         RICH1             mid
-0x83c2      1         RICH2             mid
-0x83c3      1         RICH3             mid
-0x83c4      1         RICH4             mid
-0x83c5      1         RICH5             mid
-0x83c6      1         RICH6             mid
-0x83c7      1         RICH7             mid
-0x83c8      1         RICH8             mid
-0x83c9      1         RICH9             mid
-0x83ca      1         RICHa             mid
-0x83cb      1         RICHb             mid
+0x83c0      0         RICH0             mid
+0x83c1      0         RICH1             mid
+0x83c2      0         RICH2             mid
+0x83c3      0         RICH3             mid
+0x83c4      0         RICH4             mid
+0x83c5      0         RICH5             mid
+0x83c6      0         RICH6             mid
+0x83c7      0         RICH7             mid
+0x83c8      0         RICH8             mid
+0x83c9      0         RICH9             mid
+0x83ca      0         RICHa             mid
+0x83cb      0         RICHb             mid

diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh
index c078b3f1253dcecfe0344f6a4c04dcc1ce11d7d6..c7fbc50aa01b355fd95174d83723543c7c0e77b7 100755 (executable)
--- a/main/startup_briccolage.sh
+++ b/main/startup_briccolage.sh
@@ -17,9 +17,20 @@ notifyall.sh "DAQ" "<I> DAQ is going to be restarted." "STARTUP" &
 #   ./restartEB.sh  >/dev/null 2>/dev/null &
   
 # JAM 29-06-2018 instead restarting, just close run, drop buffers and reopen the file below:
+
+# JAM 23-01-2019: get last run prefix from bnet master:
+if [ ! -f "/tmp/EB_prefix.txt" ]
+then
+/usr/bin/wget  -a /tmp/EB_restart.log -O /tmp/EB_prefix.txt "http://lxhadeb07:8099/Master/BNET/RunPrefix/value/get.json"
+fi
+prefix="$(/bin/cat /tmp/EB_prefix.txt)"
+echo "  <EB>     DAQ restart: Found previous prefix $prefix";
+
+
 echo "  <EB>     DAQ restart: Closing file run";
 /usr/bin/wget  -a /tmp/EB_restart.log -O /tmp/EB_fileres.txt "http://lxhadeb07:8099/Master/BNET/StopRun/execute"
-
+#echo "  <EB>     DAQ restart: Resetting Eventbuilder buffers...";
+#/usr/bin/wget  -a /tmp/EB_restart.log -O /tmp/EB_fileres.txt "http://lxhadeb07:8099/Master/BNET/ResetDAQ/execute"
 
   
   
@@ -79,11 +90,13 @@ echo "  <EB>     DAQ restart: Closing file run";
 scp /home/hadaq/oper/daq2ora/daq2ora_current.txt hadesp33:/home/hadaq/trbsoft/hadesdaq/hmon/files/ 1>/dev/null &
 
 # JAM 29-06-2018 instead restarting, just drop buffers and reopen the most recent file type:
-echo "  <EB>     DAQ restart: Resetting Eventbuilder buffers, restarting file run";
+echo "  <EB>     DAQ restart: Resetting Eventbuilder buffers...";
 /usr/bin/wget  -a /tmp/EB_restart.log -O /tmp/EB_fileres.txt "http://lxhadeb07:8099/Master/BNET/ResetDAQ/execute"
-/usr/bin/wget  -a /tmp/EB_restart.log -O /tmp/EB_fileres.txt "http://lxhadeb07:8099/Master/BNET/StartRun/execute"
 
-  
+echo "  <EB>     DAQ restart: Restarting file run with prefix $prefix";
+/usr/bin/wget  -a /tmp/EB_restart.log -O /tmp/EB_fileres.txt "http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=$prefix"
+
+rm /tmp/EB_prefix.txt  
 
   #Start-up finished
   notifyall.sh "DAQ" "<N> DAQ has been started." "STARTUP" &

diff --git a/mdc/addresses_oep.db b/mdc/addresses_oep.db
index 88320a8bf6f44c487e76fdf5d5e98f5722930be3..f4938e8bad1471006be7befc17804a97c2e12ec9 100644 (file)
--- a/mdc/addresses_oep.db
+++ b/mdc/addresses_oep.db
@@ -501,9 +501,9 @@
 0x234a       283         1          12        0
 0x234b       474         1          12        0 #AT (29.06.11) exchange OEPB 279->092 // 14.02.12 092->474
 0x234c       488         1          12        0 ## 30.8.2018 OEP switch with 0x2154 due to many faults there, (old #197 now at 0x2154)
-0x234d       189         1          12        0 
-0x234e       190         1          12        0 
-0x234f       191         1          12        0
+0x234d       092         1          12        0 ## 11.1.2019 OEP exchange, old 189
+0x234e       133         1          12        0 ## 11.1.2019 OEP exchange, old 190
+0x234f       232         1          12        0 ## 11.1.2019 OEP exchange, old 191
 ###################################################
 0x2350       210         1          12        0 #AT 20110518 was 143, now 210
 0x2351       091         1          12        0

diff --git a/mdc/register_tdcreg0_current.db b/mdc/register_tdcreg0_current.db
index acb20e64715191f6ec3b5015fdd0d08169b8e20d..5f9295d8f5de2812270fcc7d9a7b5b5d9d053cc2 120000 (symlink)
--- a/mdc/register_tdcreg0_current.db
+++ b/mdc/register_tdcreg0_current.db
@@ -1 +1 @@
-register/register_interface_tdcreg0_P1sr18_P2sr13s3458_P34sr23.db
\ No newline at end of file
+register/register_interface_tdcreg0_all_spikerejp12-18ns-34-23ns.db
\ No newline at end of file

diff --git a/nettools/reviveoep.pl b/nettools/reviveoep.pl
index 820f3f81c58f0e8b40b5b2164514086d1df2dd97..cd604c87992a80a418b2f41004e85d22d938ee3b 100755 (executable)
--- a/nettools/reviveoep.pl
+++ b/nettools/reviveoep.pl
@@ -12,7 +12,7 @@ use Time::HiRes qw( gettimeofday usleep time );
 Hmon::TraceDBLoad();
 
 trb_init_ports() or die trb_strerror();
-# print "WARNING: This script is not yet tested, but might already be working... \n";
+print "WARNING: This script is not yet tested, but might already be working... \n";
 # my $dummy = <STDIN>;
 
 my $msg = "";

diff --git a/oracle/boards.txt b/oracle/boards.txt
index 99f5face97bce5567083c0c4a93f3a73a33be8fe..709504ca3b8f3a0c43831a134c24b72fdadb1e87 100644 (file)
--- a/oracle/boards.txt
+++ b/oracle/boards.txt
@@ -505,6 +505,7 @@
     DiRich  106  ce00000a49003f28   7292
     DiRich  107  8400000a48e26928   7732
     DiRich  108  b000000a4907ea28   7285
+    DiRich  109  8700000a4907eb28   7a05
     DiRich  110  fd00000a49400e28   7141
     DiRich  111  5200000a495c5a28   7485
     DiRich  112  8100000a495bed28   7174
@@ -531,7 +532,6 @@
     DiRich  134  5300000a48b56728   7446
     DiRich  136  d800000a49dfa628   7a15
     DiRich  139  6000000a52013528   7932
-    DiRich  140  9600000a52636828   7382
     DiRich  142  5600000a48b0b928   7024
     DiRich  143  c300000a48e4dd28   7015
     DiRich  144  3c00000a5204e828   7014
@@ -592,6 +592,7 @@
     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
@@ -705,6 +706,7 @@
     DiRich  334  aa00000a496b9c28   7234
     DiRich  335  3800000a49380728   7434
     DiRich  336  e300000a4938b328   7345
+    DiRich  337  bd00000a49380028   7a07
     DiRich  339  ba00000a48bbef28   7514
     DiRich  342  bf00000a49c34828   7610
     DiRich  343  8d00000a48b57028   7915
@@ -716,12 +718,14 @@
     DiRich  350  2c00000a497dd228   7110
     DiRich  352  7a00000a49855d28   7121
     DiRich  353  6d00000a49857528   7417
+    DiRich  354  8300000a49084a28   70a2
     DiRich  356  2200000a4907c528   7132
     DiRich  357  1400000a49785228   7a31
     DiRich  359  7300000a49091428   7483
     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
@@ -830,6 +834,7 @@
     DiRich  490  bb00000a48e9c728   70b1
     DiRich  491  d900000a48b59c28   70b7
     DiRich  492  4200000a49dcee28   7a02
+    DiRich  493  8200000a49dd0128   70a5
     DiRich  494  af00000a4982df28   7b27
     DiRich  495  c500000a49dcfa28   7b34
     DiRich  496  6300000a49824328   7b35
@@ -850,6 +855,7 @@
     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
@@ -935,6 +941,7 @@
     DiRich  632  dd00000a48adfb28   7636
     DiRich  634  c300000a4920db28   73a2
     DiRich  635  b400000a48b35e28   7516
+    DiRich  638  e800000a48f3e828   7382
     DiRich  639  b100000a48f3eb28   7536
     DiRich  642  c500000a49bfcc28   7196
     DiRich  643  f200000a49bfcd28   7436
@@ -1011,6 +1018,7 @@
     DiRich  726  a800000a497b0628   7316
     DiRich  727  7f00000a49313428   72b3
     DiRich  728  8c00000a497b0928   7327
+    DiRich  730  c000000a497b3128   7a06
     DiRich  731  4500000a497b3628   7676
     DiRich  732  2400000a48c81528   7597
     DiRich  733  4c00000a48c82228   7697
@@ -1162,6 +1170,9 @@
     DiRich  918  2000000a49966a28   7865
     DiRich  919  bf00000a48e45428   70b2
     DiRich  920  9100000a4949ce28   7767
+    DiRich  925  8900000a48dfb128   7a04
+    DiRich 1033  0600000a49897828   70a4
+    DiRich 1037  7000000a49bc5128   70a3
     DiRich 1038  5300000a49d52228   7056
     DiRich 1039  1b00000a49d36a28   7057
     DiRich 1040  5700000a49d35228   7873
@@ -1193,6 +1204,7 @@
     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
@@ -1311,9 +1323,9 @@ DiRichConcentrator   21  bc00000a51cb1928   8258
 DiRichConcentrator   22  1100000a52027828   8279
 DiRichConcentrator   23  b500000a51d87228   8217
 DiRichConcentrator   25  9c00000a52065728   8297
+DiRichConcentrator   29  7c00000a52570e28   825a
 DiRichConcentrator   37  0c00000a525a5828   8211
 DiRichConcentrator   38  5a00000a52598c28   8291
-DiRichConcentrator   40  ec00000a52048628   825a
 DiRichConcentrator   43  5f00000a51e39328   8261
 DiRichConcentrator   44  8400000a51f7ca28   8285
 DiRichConcentrator   45  5a00000a51e56628   8298

diff --git a/oracle/runinfo2orastart_parallel.sh b/oracle/runinfo2orastart_parallel.sh
index cfecc4b8bd530af9b94badc40d7da548df14ab96..bae727ed4d4309ad5bf3be9696fabd8147762f24 100755 (executable)
--- a/oracle/runinfo2orastart_parallel.sh
+++ b/oracle/runinfo2orastart_parallel.sh
@@ -16,7 +16,7 @@ sleep 1
 sleep 1
 /home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb10/eb_runinfo2ora_3.txt  > /home/hadaq/log/runinfo2ora_3_log.txt 2>&1 &
 sleep 1
-/home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb05/eb_runinfo2ora_4.txt  > /home/hadaq/log/runinfo2ora_4_log.txt 2>&1 &
+/home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb11/eb_runinfo2ora_4.txt  > /home/hadaq/log/runinfo2ora_4_log.txt 2>&1 &
 sleep 1
 /home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb08/eb_runinfo2ora_5.txt  > /home/hadaq/log/runinfo2ora_5_log.txt 2>&1 &
 sleep 1
@@ -24,7 +24,7 @@ sleep 1
 sleep 1
 /home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb10/eb_runinfo2ora_7.txt  > /home/hadaq/log/runinfo2ora_7_log.txt 2>&1 &
 sleep 1
-/home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb05/eb_runinfo2ora_8.txt  > /home/hadaq/log/runinfo2ora_8_log.txt 2>&1 &
+/home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb11/eb_runinfo2ora_8.txt  > /home/hadaq/log/runinfo2ora_8_log.txt 2>&1 &
 sleep 1
 /home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb08/eb_runinfo2ora_9.txt  > /home/hadaq/log/runinfo2ora_9_log.txt 2>&1 &
 sleep 1
@@ -32,7 +32,7 @@ sleep 1
 sleep 1
 /home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb10/eb_runinfo2ora_11.txt > /home/hadaq/log/runinfo2ora_11_log.txt 2>&1 &
 sleep 1
-/home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb05/eb_runinfo2ora_12.txt > /home/hadaq/log/runinfo2ora_12_log.txt 2>&1 &
+/home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb11/eb_runinfo2ora_12.txt > /home/hadaq/log/runinfo2ora_12_log.txt 2>&1 &
 sleep 1
 /home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb08/eb_runinfo2ora_13.txt > /home/hadaq/log/runinfo2ora_13_log.txt 2>&1 &
 sleep 1
@@ -40,4 +40,4 @@ sleep 1
 sleep 1
 /home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb10/eb_runinfo2ora_15.txt > /home/hadaq/log/runinfo2ora_15_log.txt 2>&1 &
 sleep 1
-/home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb05/eb_runinfo2ora_16.txt > /home/hadaq/log/runinfo2ora_16_log.txt 2>&1 &
+/home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/lxhadeb11/eb_runinfo2ora_16.txt > /home/hadaq/log/runinfo2ora_16_log.txt 2>&1 &

diff --git a/rich/startup.script b/rich/startup.script
index 2884b43f55478b64b191882bbf6ca094e4dadc98..ddff93977fc0ce8f63c5774d74f9296f71376c2f 100644 (file)
--- a/rich/startup.script
+++ b/rich/startup.script
@@ -10,3 +10,5 @@ trbcmd loadbit 0xfe51 0x7111 0x0000ffff 170  #max event size
 trbcmd loadbit 0xfe51 0x7114 0x00ff0000 0x00050000   #minimum event size
 
 load_register register_tdc_rich.db
+
+trbcmd w 0x0110 0xe120 0x240

diff --git a/rpc/utilities/remTestSignalS1L.sh b/rpc/utilities/remTestSignalS1L.sh
index f5654f809368a4f6e627c6ad982566a4820d541e..afc62fc81f28b869a34998e88243a751cfeb332d 100755 (executable)
--- a/rpc/utilities/remTestSignalS1L.sh
+++ b/rpc/utilities/remTestSignalS1L.sh
@@ -1,4 +1,4 @@
 command_client.pl -e etraxp059 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
 command_client.pl -e etraxp067 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
-command_client.pl -e etraxp110 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
-command_client.pl -e etraxp056 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
+command_client.pl -e etraxp052 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
+command_client.pl -e etraxp124 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'

diff --git a/rpc/utilities/remTestSignalS2L.sh b/rpc/utilities/remTestSignalS2L.sh
index b856cf250e88eef462d4f5b7017af3094e7f126e..f42f75d1ef22371687a226e5d5a7fd32f8238e69 100755 (executable)
--- a/rpc/utilities/remTestSignalS2L.sh
+++ b/rpc/utilities/remTestSignalS2L.sh
@@ -1,4 +1,4 @@
-command_client.pl -e etraxp094 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
+command_client.pl -e etraxp055 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
 command_client.pl -e etraxp085 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
 command_client.pl -e etraxp065 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
 command_client.pl -e etraxp063 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'

diff --git a/rpc/utilities/remTestSignalS4L.sh b/rpc/utilities/remTestSignalS4L.sh
index 43bec0f118d5fdea7d41289b7b5793a08134f0ec..06734d4dd000dddd473013ec73364d7f63b1b9c2 100755 (executable)
--- a/rpc/utilities/remTestSignalS4L.sh
+++ b/rpc/utilities/remTestSignalS4L.sh
@@ -1,4 +1,4 @@
-command_client.pl -e etraxp091 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
-command_client.pl -e etraxp080 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
-command_client.pl -e etraxp078 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
-command_client.pl -e etraxp122 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
+command_client.pl -e etraxp092 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
+command_client.pl -e etraxp083 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
+command_client.pl -e etraxp075 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
+command_client.pl -e etraxp061 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'

diff --git a/rpc/utilities/remTestSignalS5L.sh b/rpc/utilities/remTestSignalS5L.sh
index c3a4ea3d1d0c153bc7a898545c63f34ec543e096..2aa0540ba00a7352d0f61895ca45d3f202a6f727 100755 (executable)
--- a/rpc/utilities/remTestSignalS5L.sh
+++ b/rpc/utilities/remTestSignalS5L.sh
@@ -1,4 +1,4 @@
 command_client.pl -e etraxp054 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
 command_client.pl -e etraxp053 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
-command_client.pl -e etraxp052 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
+command_client.pl -e etraxp110 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
 command_client.pl -e etraxp051 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'

diff --git a/rpc/utilities/remTestSignalS6L.sh b/rpc/utilities/remTestSignalS6L.sh
index 06734d4dd000dddd473013ec73364d7f63b1b9c2..f3e9b2eb5c5d4b8620e1d52654e0915d3d62d5b2 100755 (executable)
--- a/rpc/utilities/remTestSignalS6L.sh
+++ b/rpc/utilities/remTestSignalS6L.sh
@@ -1,4 +1,4 @@
-command_client.pl -e etraxp092 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
-command_client.pl -e etraxp083 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
-command_client.pl -e etraxp075 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
-command_client.pl -e etraxp061 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
+command_client.pl -e etraxp091 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
+command_client.pl -e etraxp080 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
+command_client.pl -e etraxp078 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'
+command_client.pl -e etraxp050 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400000'

diff --git a/rpc/utilities/setTestSignalS1L.sh b/rpc/utilities/setTestSignalS1L.sh
index 6476794382bb6a6872620dbc500b2a5f83ba17a4..56c6d0f1143db217d47d52f3357ec4119f425846 100755 (executable)
--- a/rpc/utilities/setTestSignalS1L.sh
+++ b/rpc/utilities/setTestSignalS1L.sh
@@ -1,4 +1,4 @@
 command_client.pl -e etraxp059 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
 command_client.pl -e etraxp067 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
-command_client.pl -e etraxp110 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
-command_client.pl -e etraxp056 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
+command_client.pl -e etraxp052 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
+command_client.pl -e etraxp124 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'

diff --git a/rpc/utilities/setTestSignalS2L.sh b/rpc/utilities/setTestSignalS2L.sh
index 418997354ddfbb2719f144708cc3ea3c61eff791..f82c5e235e1db803354fdc2fb63326d309725232 100755 (executable)
--- a/rpc/utilities/setTestSignalS2L.sh
+++ b/rpc/utilities/setTestSignalS2L.sh
@@ -1,4 +1,4 @@
-command_client.pl -e etraxp094 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
+command_client.pl -e etraxp055 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
 command_client.pl -e etraxp085 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
 command_client.pl -e etraxp065 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
 command_client.pl -e etraxp063 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'

diff --git a/rpc/utilities/setTestSignalS4L.sh b/rpc/utilities/setTestSignalS4L.sh
index 190191b309c2075c2fc3af8646ec307e0e2be78b..89f9b4956e3343be6feb776245ce2e74c76769c0 100755 (executable)
--- a/rpc/utilities/setTestSignalS4L.sh
+++ b/rpc/utilities/setTestSignalS4L.sh
@@ -1,4 +1,4 @@
-command_client.pl -e etraxp091 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
-command_client.pl -e etraxp080 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
-command_client.pl -e etraxp078 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
-command_client.pl -e etraxp122 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
+command_client.pl -e etraxp092 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
+command_client.pl -e etraxp083 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
+command_client.pl -e etraxp075 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
+command_client.pl -e etraxp061 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'

diff --git a/rpc/utilities/setTestSignalS5L.sh b/rpc/utilities/setTestSignalS5L.sh
index a6fcb71c2e4746be594b16119732aecb2183e768..671938dce8cced56a6bbb8d0f9d6e07928a273d8 100755 (executable)
--- a/rpc/utilities/setTestSignalS5L.sh
+++ b/rpc/utilities/setTestSignalS5L.sh
@@ -1,4 +1,4 @@
 command_client.pl -e etraxp054 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
 command_client.pl -e etraxp053 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
-command_client.pl -e etraxp052 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
+command_client.pl -e etraxp110 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
 command_client.pl -e etraxp051 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'

diff --git a/rpc/utilities/setTestSignalS5R.sh b/rpc/utilities/setTestSignalS5R.sh
index 4e75773521467d534ffd2fa5ddbeecc3589952da..a3038c1f823e835495345b16d7452068c5c27064 100755 (executable)
--- a/rpc/utilities/setTestSignalS5R.sh
+++ b/rpc/utilities/setTestSignalS5R.sh
@@ -1,4 +1,4 @@
 command_client.pl -e etraxp054 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x4000CC'
 command_client.pl -e etraxp053 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x4000CC'
-command_client.pl -e etraxp052 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x4000CC'
+command_client.pl -e etraxp110 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x4000CC'
 command_client.pl -e etraxp051 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x4000CC'

diff --git a/rpc/utilities/setTestSignalS6L.sh b/rpc/utilities/setTestSignalS6L.sh
index 89f9b4956e3343be6feb776245ce2e74c76769c0..c9f67d9a8b62c373e9ad3b484018992e195f0f6a 100755 (executable)
--- a/rpc/utilities/setTestSignalS6L.sh
+++ b/rpc/utilities/setTestSignalS6L.sh
@@ -1,4 +1,4 @@
-command_client.pl -e etraxp092 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
-command_client.pl -e etraxp083 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
-command_client.pl -e etraxp075 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
-command_client.pl -e etraxp061 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
+command_client.pl -e etraxp091 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
+command_client.pl -e etraxp080 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
+command_client.pl -e etraxp078 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'
+command_client.pl -e etraxp050 -c '/home/hadaq/bin/rw_trbv2 --trb w 0 c2 0x400033'

diff --git a/rpc/utilities/setThresholdsS1.sh b/rpc/utilities/setThresholdsS1.sh
index e22bcc28af6ad706b9ce07f1433c5ac086c142a8..c006cdbc9599b122e4292dcc324070d8f1bac839 100755 (executable)
--- a/rpc/utilities/setThresholdsS1.sh
+++ b/rpc/utilities/setThresholdsS1.sh
@@ -1,4 +1,4 @@
 command_client.pl -e etraxp059 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
 command_client.pl -e etraxp067 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
-command_client.pl -e etraxp110 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
-command_client.pl -e etraxp056 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' 
+command_client.pl -e etraxp052 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
+command_client.pl -e etraxp124 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' 

diff --git a/rpc/utilities/setThresholdsS2.sh b/rpc/utilities/setThresholdsS2.sh
index e1ac5d45c525e8951cb0d442c604302e07331b7c..bec3aab356c6f166b928796f4cbaa112c2f04e59 100755 (executable)
--- a/rpc/utilities/setThresholdsS2.sh
+++ b/rpc/utilities/setThresholdsS2.sh
@@ -1,4 +1,4 @@
-command_client.pl -e etraxp094 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
+command_client.pl -e etraxp055 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
 command_client.pl -e etraxp085 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
 command_client.pl -e etraxp065 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
 command_client.pl -e etraxp063 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' 

diff --git a/rpc/utilities/setThresholdsS4.sh b/rpc/utilities/setThresholdsS4.sh
index 1f18d288ecdb82e0f82419769ab3bdd4e65d8c79..dff2454883c7eec37947d86d60ef69c2776bbdac 100755 (executable)
--- a/rpc/utilities/setThresholdsS4.sh
+++ b/rpc/utilities/setThresholdsS4.sh
@@ -1,4 +1,4 @@
-command_client.pl -e etraxp091 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
-command_client.pl -e etraxp080 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
-command_client.pl -e etraxp078 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
-command_client.pl -e etraxp122 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' 
+command_client.pl -e etraxp092 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
+command_client.pl -e etraxp083 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
+command_client.pl -e etraxp075 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
+command_client.pl -e etraxp061 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' 

diff --git a/rpc/utilities/setThresholdsS5.sh b/rpc/utilities/setThresholdsS5.sh
index fd9267c04db02ce1dfabfc0ab2c9e5948ad2edaa..13d2e145806d18efda06c6db1cb2ea5766aea07a 100755 (executable)
--- a/rpc/utilities/setThresholdsS5.sh
+++ b/rpc/utilities/setThresholdsS5.sh
@@ -1,4 +1,4 @@
 command_client.pl -e etraxp054 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
 command_client.pl -e etraxp053 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
-command_client.pl -e etraxp052 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
+command_client.pl -e etraxp110 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
 command_client.pl -e etraxp051 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' 

diff --git a/rpc/utilities/setThresholdsS6.sh b/rpc/utilities/setThresholdsS6.sh
index dff2454883c7eec37947d86d60ef69c2776bbdac..b18bb0a12fe73035e1930783935a583ccefcaead 100755 (executable)
--- a/rpc/utilities/setThresholdsS6.sh
+++ b/rpc/utilities/setThresholdsS6.sh
@@ -1,4 +1,4 @@
-command_client.pl -e etraxp092 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
-command_client.pl -e etraxp083 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
-command_client.pl -e etraxp075 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
-command_client.pl -e etraxp061 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' 
+command_client.pl -e etraxp091 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
+command_client.pl -e etraxp080 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
+command_client.pl -e etraxp078 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' &
+command_client.pl -e etraxp050 -c '/home/hadaq/bin/spi_trbv2_5 /home/hadaq/rpc/configFile_40mV' 

diff --git a/rpc/utilities/setTriggerBoardS2.sh b/rpc/utilities/setTriggerBoardS2.sh
index 1c05342068857d0937307b188738ce763c367b5b..e28dc0de2ad2d2ef241292f92d93adbe569146a6 100755 (executable)
--- a/rpc/utilities/setTriggerBoardS2.sh
+++ b/rpc/utilities/setTriggerBoardS2.sh
@@ -1 +1 @@
-command_client.pl -e etraxp094 -c 'spi_trbv2_5 /home/hadaq/rpc/triggerBoards/triggerBoard_094'
+command_client.pl -e etraxp055 -c 'spi_trbv2_5 /home/hadaq/rpc/triggerBoards/triggerBoard_094'

diff --git a/start/ThreshNinoStart.db b/start/ThreshNinoStart.db
index 489be3a2692a3d5634fe5cf7c4340a0e644bb126..3b017d6ef353eff7f8262274613ac30932570d92 100644 (file)
--- a/start/ThreshNinoStart.db
+++ b/start/ThreshNinoStart.db
@@ -1,5 +1,6 @@
+# 1. NINO (StartX)
 # Board   Chain   ChainLen  DAC   Channel   Command   Value
-  5000    1       2         0     0         3         0x4000 # ---Glob. Thres  #1                 
+  5000    1       2         0     0         3         0x5500 # ---Glob. Thres  #1                 
   5000    1       2         0     1         3         0x7000 #                                
   5000    1       2         0     2         3         0x7000 # --- Str. 9-10ns, 7-20ns, 6 - 30ns, 5-70ns
   5000    1       2         0     3         3         0x7000 #                                
@@ -15,8 +16,9 @@
   5000    1       2         1     5         3         0x7000 # ch. 6
   5000    1       2         1     6         3         0x7000 # ch. 7
   5000    1       2         1     7         3         0x7000 # ch. 8
+# 2.NINO  (StartX)
 #############################################################################
-  5000    2       2         0     0         3         0x4000 # ---Glob. Thres  #2                 
+  5000    2       2         0     0         3         0x5500 # ---Glob. Thres  #2                 
   5000    2       2         0     1         3         0x5000 #                                  
   5000    2       2         0     2         3         0x7000 # --- Str. 9-20ns, 7-30ns, 5-80ns  
   5000    2       2         0     3         3         0x5000 #                                  
@@ -26,7 +28,7 @@
   5000    2       2         0     7         3         0x9000  
   5000    2       2         1     0         3         0x7000 ### ch. 4  
   5000    2       2         1     1         3         0x7000 ### ch. 3  
-  5000    2       2         1     2         3         0x9000 ### ch. 2  
+  5000    2       2         1     2         3         0x7000 ### ch. 2  
   5000    2       2         1     3         3         0x7000 ### ch. 1  
   5000    2       2         1     4         3         0x7000 ### ch. 5  
   5000    2       2         1     5         3         0x7000 ### ch. 6  
@@ -35,8 +37,9 @@
 ######7
 #######   Next TDC
 #######
+# 3.NINO (Start Y)
 # Board   Chain   ChainLen  DAC   Channel   Command   Value
-  5001    1       2         0     0         3         0x4000 # ---Glob. Thres #3                  
+  5001    1       2         0     0         3         0x5500 # ---Glob. Thres #3                  
   5001    1       2         0     1         3         0x7000 #                                
   5001    1       2         0     2         3         0x7000 # --- Str. 9-20ns, 7-30ns, 5-80ns
   5001    1       2         0     3         3         0x7000 #                                
@@ -52,8 +55,9 @@
   5001    1       2         1     5         3         0x7000 ### ch. 6
   5001    1       2         1     6         3         0x7000 ### ch. 7
   5001    1       2         1     7         3         0x7000 ### ch. 8
+# 4.NINO  (Start Y)
 #############################################################################
-  5001    2       2         0     0         3         0x4000 # ---Glob. Thres  #4                 
+  5001    2       2         0     0         3         0x5500 # ---Glob. Thres  #4                 
   5001    2       2         0     1         3         0x5000 #                                  
   5001    2       2         0     2         3         0x7000 # --- Str. 9-20ns, 7-30ns, 5-80ns  
   5001    2       2         0     3         3         0x5000 #                                  
@@ -72,8 +76,9 @@
 #######
 #######   Next TDC
 #######
+# 5. NINO (Veto)
 # Board   Chain   ChainLen  DAC   Channel   Command   Value
-  5002    1       2         0     0         3         0x2000 # ---Glob. Thres  #5                 
+  5002    1       2         0     0         3         0x3000 # ---Glob. Thres  #5                 
   5002    1       2         0     1         3         0x5000 #                                
   5002    1       2         0     2         3         0x7000 # --- Str. 9-10ns, 7-20ns, 6 - 30ns, 5-70ns
   5002    1       2         0     3         3         0x6000 #                                
@@ -81,16 +86,17 @@
   5002    1       2         0     5         3         0x8000                                  
   5002    1       2         0     6         3         0x9000                                  
   5002    1       2         0     7         3         0x9000 
-  5002    1       2         1     0         3         0x3000 ### ch. 4
-  5002    1       2         1     1         3         0x3000 ### ch. 3
-  5002    1       2         1     2         3         0x3000 ### ch. 2
-  5002    1       2         1     3         3         0x3000 ### ch. 1
-  5002    1       2         1     4         3         0x3000 ### ch. 5
-  5002    1       2         1     5         3         0x3000 ### ch. 6
-  5002    1       2         1     6         3         0x3000 ### ch. 7
-  5002    1       2         1     7         3         0x3000 ### ch. 8
+  5002    1       2         1     0         3         0x5000 ### ch. 4
+  5002    1       2         1     1         3         0x5000 ### ch. 3
+  5002    1       2         1     2         3         0x5000 ### ch. 2
+  5002    1       2         1     3         3         0x5000 ### ch. 1
+  5002    1       2         1     4         3         0x5000 ### ch. 5
+  5002    1       2         1     5         3         0x5000 ### ch. 6
+  5002    1       2         1     6         3         0x5000 ### ch. 7
+  5002    1       2         1     7         3         0x5000 ### ch. 8
+# 6. NINO (HALO)
 #############################################################################
-  5002    2       2         0     0         3         0x8000 # ---Glob. Thres  #6                 
+  5002    2       2         0     0         3         0x2500 # ---Glob. Thres  #6                 
   5002    2       2         0     1         3         0x5000 #                                  
   5002    2       2         0     2         3         0x7000 # --- Str. 9-20ns, 7-30ns, 5-80ns  
   5002    2       2         0     3         3         0x5000 #                                  
@@ -98,14 +104,14 @@
   5002    2       2         0     5         3         0x9000                                    
   5002    2       2         0     6         3         0x9000                                    
   5002    2       2         0     7         3         0x9000  
-  5002    2       2         1     0         3         0x8000 ### ch. 4  
-  5002    2       2         1     1         3         0x8000 ### ch. 3  
-  5002    2       2         1     2         3         0x9500 ### ch. 2  
-  5002    2       2         1     3         3         0x8000 ### ch. 1  
-  5002    2       2         1     4         3         0x8000 ### ch. 5  
-  5002    2       2         1     5         3         0x8000 ### ch. 6  
-  5002    2       2         1     6         3         0x8000 ### ch. 7  
-  5002    2       2         1     7         3         0x9000 ### ch. 8    
+  5002    2       2         1     0         3         0x7000 ### ch. 4  
+  5002    2       2         1     1         3         0x7000 ### ch. 3  
+  5002    2       2         1     2         3         0x7500 ### ch. 2  
+  5002    2       2         1     3         3         0x7000 ### ch. 1  
+  5002    2       2         1     4         3         0x7000 ### ch. 5  
+  5002    2       2         1     5         3         0x7000 ### ch. 6  
+  5002    2       2         1     6         3         0x7000 ### ch. 7  
+  5002    2       2         1     7         3         0x7000 ### ch. 8    
 ######6
 #######   Next TDC
 #######

diff --git a/start/startup.script b/start/startup.script
index 73c2dea6db25d4900d4389fea21375f4aabcabb2..19889188b28a8a17e91a1d7d26fd3f7334cd6b58 100644 (file)
--- a/start/startup.script
+++ b/start/startup.script
@@ -47,7 +47,7 @@ trbcmd w 0xfe48 0x7111 1024        #1024 words per FPGA
 
 trbcmd w 0x5000 0xc802 0xffff # enable 16 channels in 0x5000
 trbcmd w 0x5001 0xc802 0xffff # enable 16 channels in 0x5001
-trbcmd w 0x5002 0xc802 0x00ff # enable 8 channels in 0x5002
+trbcmd w 0x5002 0xc802 0x0fff # enable 8 (Veto) and 4 (HALO) channels in 0x5002
 trbcmd w 0x5003 0xc802 0x0000 # enable 0 channels in 0x5003