Changed BNET setup with new servers lxhadeb14/15/16 and master on lxhadeb12.

Added nearline analysis after TDC calib procedure stop.

diff --git a/.gitignore b/.gitignore
index c150289743e1ae1616afc2d2524a24e6678b3cad..2b2d0ae3250c31c842bb6bdd8255b454a17019b5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+hmon/calibration
 hmon/qa
 hmon/logs
 hmon/vertex

diff --git a/control/gui/eb/29_BEAM_Files b/control/gui/eb/29_BEAM_Files
index 05183e64da87d51f302cc4e0d5982ec9c102b4c4..cf2f0ca8ac6138cd52f0244f59b4204578197794 100755 (executable)
--- a/control/gui/eb/29_BEAM_Files
+++ b/control/gui/eb/29_BEAM_Files
@@ -23,7 +23,7 @@ $HOME/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> EBs are going to be changed
 xterm -geometry 80x24 -bg orange -fg black -e bash -c '
   ssh -X hadaq@lxhadesdaqp "
   echo "Setting file prefix be"
-  /usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=be&oninit=10\"
+  /usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb12:8099/Master/BNET/StartRun/execute?prefix=be&oninit=10\"
   echo set prefix te on BNET master controller
   sleep 2 
   "

diff --git a/control/gui/eb/50_COSMICS_Files b/control/gui/eb/50_COSMICS_Files
index 1e2a6b3d9339245993adbce040719471a3dfa6da..c402517b9e5c6c76e6255fccd6f0aa6c5ae5891e 100755 (executable)
--- a/control/gui/eb/50_COSMICS_Files
+++ b/control/gui/eb/50_COSMICS_Files
@@ -23,7 +23,7 @@ $HOME/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> EBs are going to be changed
 xterm -geometry 80x24 -bg orange -fg black -e bash -c '
    ssh -X hadaq@lxhadesdaqp "
    echo "Setting file prefix co"
-   /usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=co&oninit=10\"
+   /usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb12:8099/Master/BNET/StartRun/execute?prefix=co&oninit=10\"
    echo set prefix te on BNET master controller
    sleep 2 
   "

diff --git a/control/gui/eb/52_TEST_File b/control/gui/eb/52_TEST_File
index 5f1dd292a5bf320e0289e6d7b37aec6c5c4eba8e..697972be34a3db5de19053d18ee445ddf1a2fb5a 100755 (executable)
--- a/control/gui/eb/52_TEST_File
+++ b/control/gui/eb/52_TEST_File
@@ -23,7 +23,7 @@ $HOME/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> EBs are going to be changed
 xterm -geometry 80x24 -bg orange -fg black -e bash -c '
   ssh -X hadaq@lxhadesdaqp "
   echo "Setting file prefix te"
-  /usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=te&oninit=10\"
+  /usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb12:8099/Master/BNET/StartRun/execute?prefix=te&oninit=10\"
   echo set prefix te on BNET master controller
   sleep 2 
   "

diff --git a/control/gui/eb/55_NO_FILE b/control/gui/eb/55_NO_FILE
index 76ac5215e4857a1b1d2cda50f0a58c5577930cb1..ed6cdb2a998d89d81619bc9cd009d83e8eb0214a 100755 (executable)
--- a/control/gui/eb/55_NO_FILE
+++ b/control/gui/eb/55_NO_FILE
@@ -20,7 +20,7 @@ $HOME/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> EBs are going to be changed
 
 ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c '
    echo "Setting file prefix --n NO FILES"
-   /usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix='--'&oninit=10\"
+   /usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb12:8099/Master/BNET/StartRun/execute?prefix='--'&oninit=10\"
    echo set prefix -- on BNET master controller
    sleep 2 
  '

diff --git a/control/gui/expert/Restart_BNET_Control b/control/gui/expert/Restart_BNET_Control
index a19d7ff6205a49245beee32f7cdaed79ef0d16ce..cc6fe07cfc7d03cbed6bc14de9b3b9714cb520ea 100755 (executable)
--- a/control/gui/expert/Restart_BNET_Control
+++ b/control/gui/expert/Restart_BNET_Control
@@ -6,7 +6,7 @@
 
 
 xterm -geometry 80x24 -bg orange -fg black -e bash -c ' 
-      ssh hadaq@lxhadeb07p "
+      ssh hadaq@lxhadeb12p "
       /home/hadaq/bin/restart_bnetmaster.sh
       echo closing window in 5 secs...
       sleep 5

diff --git a/evtbuild/start_eb_gbe_2021-test.pl b/evtbuild/start_eb_gbe_2021-test.pl
index a9040a317ad171afa294059659fc60ca8fb014a7..39d0fa0c82b3ea7b68d618a222504750d5c3f4c0 100755 (executable)
--- a/evtbuild/start_eb_gbe_2021-test.pl
+++ b/evtbuild/start_eb_gbe_2021-test.pl
@@ -57,7 +57,7 @@ read_config $opt_ebconf => %$temp_args_href;
 #print Dumper $temp_args_href;
 #exit;
 
-my @bnetservers = ("192.168.100.8","192.168.100.9","192.168.105.14", "192.168.105.15", "192.168.105.16", "192.168.100.10", "192.168.105.11");
+my @bnetservers = ("192.168.100.8","192.168.100.9","192.168.105.114", "192.168.105.115", "192.168.105.116", "192.168.100.10", "192.168.105.11");
 
 
 
@@ -68,9 +68,9 @@ my %IP_GSI_lookup = (
                      '192.168.105.11'   => 'lxhadeb11',
                      '192.168.105.12'   => 'lxhadeb12',
                      '192.168.105.13'   => 'lxhadeb13',
-                     '192.168.105.14'   => 'lxhadeb14',
-                     '192.168.105.15'   => 'lxhadeb15',
-                     '192.168.105.16'   => 'lxhadeb16'
+                     '192.168.105.114'   => 'lxhadeb14',
+                     '192.168.105.115'   => 'lxhadeb15',
+                     '192.168.105.116'   => 'lxhadeb16'
                     );
 
 
@@ -151,13 +151,13 @@ sub init_CPU_status()   {
   $EB_CPU_status_href->{'192.168.105.12'}->{'build'} = "26-31";
 
   # JAM 7-2021: new servers have 64 cores, reserve lower 32 cpus for network interrupts - TODO with new set_eth_affinity.pl
-  $EB_CPU_status_href->{'192.168.105.14'}->{'input'} = "32-47";
-  $EB_CPU_status_href->{'192.168.105.14'}->{'build'} = "48-63";
-  $EB_CPU_status_href->{'192.168.105.15'}->{'input'} = "32-47";
+  $EB_CPU_status_href->{'192.168.105.114'}->{'input'} = "32-47";
+  $EB_CPU_status_href->{'192.168.105.114'}->{'build'} = "48-63";
+  $EB_CPU_status_href->{'192.168.105.115'}->{'input'} = "32-47";
   
-  $EB_CPU_status_href->{'192.168.105.15'}->{'build'} = "48-63";
-  $EB_CPU_status_href->{'192.168.105.16'}->{'input'} = "32-47";
-  $EB_CPU_status_href->{'192.168.105.16'}->{'build'} = "48-63";
+  $EB_CPU_status_href->{'192.168.105.115'}->{'build'} = "48-63";
+  $EB_CPU_status_href->{'192.168.105.116'}->{'input'} = "32-47";
+  $EB_CPU_status_href->{'192.168.105.116'}->{'build'} = "48-63";
   
   # MT, separate scheme, doesn't do so well
   #$EB_CPU_status_href->{'192.168.105.12'}->{'input'} = "16-23";
@@ -343,7 +343,8 @@ sub startBnet()   {
 
 
   # variable master node now:
-  my $bnetmaster = "lxhadeb07";
+  my $bnetmaster = "lxhadeb12";
+  # "lxhadeb07";
   #lxhadeb12";
 
   # before we start inidividual bnet processes, need to evaluate list of ports and nodes:
@@ -484,7 +485,10 @@ sub startBnet()   {
       #
       #my $core_nr = &getCoreNr($cpu) . "," . &getCoreNr($cpu);
       my $core_nr = &getCoreNr($cpu, 'input'); 
-        my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports taskset -c $core_nr  $cmd_dabc $conf_bnet_inp 1</dev/null & (sleep 2; ~/bin/optimize_taskset.sh) &\"";
+      # my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports taskset -c $core_nr  $cmd_dabc $conf_bnet_inp 1</dev/null & (sleep 2; ~/bin/optimize_taskset.sh) &\"";
+      # JAM21 - try without optimize taskset
+         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 taskset -c $core_nr  $cmd_dabc $conf_bnet_inp >senderlog_$cpu.log 2>&1   & (sleep 2; ~/bin/optimize_taskset.sh) &\"";
       #    my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports   $cmd_dabc $conf_bnet_inp >senderlog_$cpu.log 2>&1  &\"";
 
@@ -561,7 +565,11 @@ sub startBnet()   {
 
 
       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 & (sleep 4; ~/bin/optimize_taskset.sh) &\"";
+      #y $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports taskset -c $core_nr  $cmd_dabc $conf_bnet_bld 1</dev/null & (sleep 4; ~/bin/optimize_taskset.sh) &\"";
+      
+      #JAM21 - disable further taskset optimization for the moment.
+      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  &\"";
 
 

diff --git a/evtbuild/tdc_calib_start.sh b/evtbuild/tdc_calib_start.sh
index 0b869f59a7c2e4b66c167921a749640be14828cb..e66649340114f5f260ae931604f8b57883e99d75 100755 (executable)
--- a/evtbuild/tdc_calib_start.sh
+++ b/evtbuild/tdc_calib_start.sh
@@ -11,7 +11,7 @@ export DAQOPSERVER=hadesp31;
    trbcmd w 0x003 0xa0e3  0x61A80;
 
 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";
+   /usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt "http://lxhadeb12:8099/Master/BNET/StartRun/execute?prefix=tc&oninit=10";
    echo set prefix tc on BNET master controller;
    
   

diff --git a/evtbuild/tdc_calib_stop.sh b/evtbuild/tdc_calib_stop.sh
index 759b1a0b0347b40611b72358eafb141010c1c4f8..34f59815a4595330d3337ae1241e2dc64356e6e1 100755 (executable)
--- a/evtbuild/tdc_calib_stop.sh
+++ b/evtbuild/tdc_calib_stop.sh
@@ -1,7 +1,11 @@
 #!/bin/bash 
- 
+ echo stop TDC calibration
+ /usr/bin/wget  -a /tmp/EB_runid.log -O /tmp/last_calib_runid.txt "http://lxhadeb12:8099/Master/BNET/RunIdStr/value/get.json"
+ runid="$(/bin/cat /tmp/last_calib_runid.txt)"
+ echo "  Last calibration run id is $runid";
+
  echo Setting file prefix no file
-  /usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt "http://lxhadeb07:8099/Master/BNET/StopRun/execute?tmout=10"
+  /usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt "http://lxhadeb12:8099/Master/BNET/StopRun/execute?tmout=10"
  echo set prefix nofile on BNET master controller
  sleep 2 
    echo setting CTS back to regular mode
@@ -12,3 +16,6 @@
    trbcmd w 0x003 0xa0c7 $enab
    trbcmd clearbit 0x003 0xa0c0 0x10
    trbcmd w 0x003 0xa0e3  0x0
+# JAM 24-08-21 - now start tdc monitor
+ssh hadesp63 "/home/hadaq/local/bin/startTDCcalibmon.sh $runid &"</dev/null &>/dev/null &
+echo "started tdc calibmonitor on http://hades63:8092"

diff --git a/hmon/QA.pm b/hmon/QA.pm
index 789cff9696dc826e2905f9c13db98d9e7cb04117..df3c88de00bb4be40bfd910638319e0899c0e440 100644 (file)
--- a/hmon/QA.pm
+++ b/hmon/QA.pm
@@ -123,17 +123,17 @@ use constant {CTSAddress => 0x0003};
 ###############################################################################
 #  Switched off systems
 ###############################################################################
-our $MdcHvOff = 0;
+our $MdcHvOff = 1;
 our $RichHvOff = 1;
-our $TofHvOff = 0;
-our $RpcHvOff = 0;
+our $TofHvOff = 1;
+our $RpcHvOff = 1;
 our $FwHvOff = 1;
 our $MagnetOff = 1;
-our $StsHvOff = 0;
-our $StartHvOff = 0;
-our $ItofHvOff = 0;
-our $FrpcHvOff = 0;
-
+our $StsHvOff = 1;
+our $StartHvOff = 1;
+our $ItofHvOff = 1;
+our $FrpcHvOff = 1;
+our $EcalHvOff = 1;
 
 ###############################################################################
 #  Missing Boards
@@ -143,8 +143,8 @@ our @mdc_boards_removed =(); #(0x2257, 0x2029); # 2233 added 2014-08-28 , 2203 a
 our @mdc_chambers_removed =();
 our @rich_boards_removed =();
 our @tof_boards_removed =();
-our @rpc_boards_removed =(0x6010, 0x6011, 0x6012, 0x6030, 0x6031, 0x6032, 0x6033, 0x6034, 0x6035, 0x6036, 0x6051, 0x6052, 0x6053, 0x6054, 0x6055, 0x6056, 0x8a00, 0x8a05);
-our @other_boards_removed =();
+our @rpc_boards_removed =(); #(0x6010, 0x6011, 0x6012, 0x6030, 0x6031, 0x6032, 0x6033, 0x6034, 0x6035, 0x6036, 0x6051, 0x6052, 0x6053, 0x6054, 0x6055, 0x6056, 0x8a00, 0x8a05);
+our @other_boards_removed =(0x5002);
 
 
 ###############################################################################

diff --git a/hmon/getebjson.pm b/hmon/getebjson.pm
index 3e71cc17eaf5f229946593b2dba239c2a8d2dfd2..3917e805bbb70dc4fb1f8151a202db2c0a06db5f 100644 (file)
--- a/hmon/getebjson.pm
+++ b/hmon/getebjson.pm
@@ -38,7 +38,7 @@ sub getjsonhash {
   my $baseurl;
   if($src eq 'rawmon') {$baseurl = 'http://lxhadeb12:8090/';}
   if($src eq 'ebmon')  {$baseurl = 'http://lxhadeb12:8090/';}
-  if($src eq 'eb')     {$baseurl = 'http://lxhadeb07:8099/';}
+  if($src eq 'eb')     {$baseurl = 'http://lxhadeb12:8099/';}
 
   my $rawdata = get ($baseurl.$name);
 

diff --git a/hmon/hmon_cosmic_alarms.pl b/hmon/hmon_cosmic_alarms.pl
index e7d50da123a9e62a83851d90d57273dfdd60e32e..22edf9825f0be068766f67626ec6260adb1b1132 100644 (file)
--- a/hmon/hmon_cosmic_alarms.pl
+++ b/hmon/hmon_cosmic_alarms.pl
@@ -82,7 +82,7 @@ while (1) {
         my $c = q|echo "<div style='position:absolute;top:5px;left:15px;color:red;font-weight:bold;z-index:100'>Doing an automatic TrbNet reset</div>" > ~/trbsoft/hadesdaq/hmon/files/note.htt; ssh lxhadesdaqp 'cd ~/trbsoft/daq/main; ./startup_briccolage.sh dont_restart_monitoring'; rm ~/trbsoft/hadesdaq/hmon/files/note.htt|;
         #print STDERR localtime() . ": command: $c\n";
         qx($c);
-        $c=q|ssh lxhadesdaqp '/usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt "http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=co&oninit=10"'|;
+        $c=q|ssh lxhadesdaqp '/usr/bin/wget  -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt "http://lxhadeb12:8099/Master/BNET/StartRun/execute?prefix=co&oninit=10"'|;
         #print STDERR localtime() . ": command: $c\n";
         qx($c);
         $iterator = 0;

diff --git a/hmon/hmon_eb_rate.pl b/hmon/hmon_eb_rate.pl
index e9021059dbd7bd76839c24223f0954370d612a42..870322f5e5a92ef678f705c663d5fd26d596a14a 100755 (executable)
--- a/hmon/hmon_eb_rate.pl
+++ b/hmon/hmon_eb_rate.pl
@@ -29,7 +29,7 @@ trb_init_ports() or die trb_strerror();
 my $flog = QA::OpenQAFile();
 
 
-my $masterurl = 'http://lxhadeb07p:8099/';
+my $masterurl = 'http://lxhadeb12p:8099/';
 
 my $url_erate =     $masterurl . 'Master/BNET/EventsRate/get.json?field="value"';
 my $url_builders =  $masterurl . 'Master/BNET/Builders/get.json?field="value"';

diff --git a/hmon/hmon_hodo.pl b/hmon/hmon_hodo.pl
index 9083a2fe1c7f015e5b151db8c4a83c066e7ff59a..14f2119c2ce5c452bed461f7bda8a00388872870 100755 (executable)
--- a/hmon/hmon_hodo.pl
+++ b/hmon/hmon_hodo.pl
@@ -11,6 +11,7 @@ use HPlot;
 use Time::HiRes qw(usleep time);
 use List::Util qw[min max];
 
+no warnings 'uninitialized';
 
 my $plot2 = ();
 $plot2->{name}    = "HodoRate";

diff --git a/hmon/hmon_mdc_temp.pl b/hmon/hmon_mdc_temp.pl
index ea8814a6e2fe34ae123b899264a9ebb67c6a4d19..610d448fff7b69ef1b9a494477d1fd420ae72ebf 100755 (executable)
--- a/hmon/hmon_mdc_temp.pl
+++ b/hmon/hmon_mdc_temp.pl
@@ -82,7 +82,7 @@ while (1) {
   $store = {};
 
 
-  if($qastate >= QA::ERROR || ( $data->{'TempAlarmEPICS'}->{'val'} > 0 )  ) {
+  if($qastate >= QA::ERROR || ( $data->{'TempAlarmEPICS'}->{'val'}//0 > 0 )  ) {
     if($mailerrstatecnt++ >= 60) {
       Hmon::SendEmail('j.michel@gsi.de,c.wendisch@gsi.de',"Error: MDC Temperature too high","MDC temperatures are too high:  
 \n$str\n".$data->{'TempAlarmEPICS'}->{'val'});

diff --git a/hmon/hmon_rich_temp_backplane.pl b/hmon/hmon_rich_temp_backplane.pl
index 0efe56c8318d6851c48005ee2f288277d5e1863f..f40053533d37952db8db414dd4333b68aa21d389 100755 (executable)
--- a/hmon/hmon_rich_temp_backplane.pl
+++ b/hmon/hmon_rich_temp_backplane.pl
@@ -29,6 +29,7 @@ my $val;
 my $mailerrstatecnt = 0;
 my ($max,$min,$avg,$sum,$count);
 my $interlockTemperature = 36.0; #Interlock value !!!
+#my $interlockTemperature = 95.0; #Interlock value !!!
 
 
 trb_init_ports() or die trb_strerror();
@@ -86,10 +87,10 @@ while (1) {
 
 
   if ($max > $interlockTemperature ) {
-#    my $s = sprintf("HAD:RICH:PS:24:SETONOFF");
+    my $s = sprintf("HAD:RICH:PS:17:SETONOFF");
 #    Perl2Epics::Connect("PS_RICH_3_3V",$s);
 #    Perl2Epics::Put("PS_RICH_3_3V",1);
-#    $InterlockActive = "Shutting down RICH ...";
+    $InterlockActive = "Shutting down RICH ...";
   }
   
   #-------Software Interlock-------#

diff --git a/hmon/hmon_richthreshold.pl b/hmon/hmon_richthreshold.pl
index 2c2519ae91d3862677243cec801330f085fdac20..8b83c910a94dda8490602a00378f12abed8b742a 100755 (executable)
--- a/hmon/hmon_richthreshold.pl
+++ b/hmon/hmon_richthreshold.pl
@@ -106,7 +106,7 @@ my $qastate = QA::OK;
 my $str = sprintf("%i", $thr_cnt);
 my $longstr = sprintf("Thresholds are well loaded. (%i chnls missing)", $thr_cnt);
    $longstr = "load Thresholds to RICH" if ($thr_cnt > $missChn) ;
-QA::WriteQALog($fqa,"feeerr","richthr", 40, $qastate, "RICH Thresh", $str, $longstr);
+QA::WriteQALog($fqa,"rich","richthr", 40, $qastate, "RICH Thresh", $str, $longstr);
 
 $timecnt--;
   

diff --git a/hmon/hmon_spill.pl b/hmon/hmon_spill.pl
index 3535235dd56dd241b99ce53ee794dee225948a6a..52f37c0c4e42ff313805b748965bcfbdfbf1446c 100755 (executable)
--- a/hmon/hmon_spill.pl
+++ b/hmon/hmon_spill.pl
@@ -56,7 +56,7 @@ trb_init_ports() or die trb_strerror();
 
 #Perl2Epics::Connect("prefix", "HAD:eb01:prefix",'DBR_TIME_STRING');
 # JAM28-9-2018 replace epics by dabc url access
-my $masterurl = 'http://lxhadeb07:8099/';
+my $masterurl = 'http://lxhadeb12:8099/';
 my $url_prefix =    $masterurl . 'Master/BNET/RunPrefix/get.json?field="value"';
 
 #Perl2Epics::Connect("Rate", "HAD:DAQ:EventRate");

diff --git a/hmon/hmon_tdcchanerrors.pl b/hmon/hmon_tdcchanerrors.pl
index ec33882a5d27b49a20c08f94d05547ef3aaa4c06..c1cdd0c9c1c0e30ff7644cbb9524ad44b1a0b975 100755 (executable)
--- a/hmon/hmon_tdcchanerrors.pl
+++ b/hmon/hmon_tdcchanerrors.pl
@@ -33,8 +33,7 @@ trb_init_ports() or die trb_strerror();
     }
   chomp $labels;  
   my $numboards = $entry;
-  $labels .= ') rotate by 90 offset 0,-1.4;';
-  
+  $labels .= ') rotate by 90 offset 0,-1.4 font ",6";';
   my @names = qw(None Qrise StatRise FminRise FmaxRise Qfall StatFall FminFall FmaxFall StretchDelay StretchDeviation);
   
 for(my $i = 0; $i <11; $i++) {
@@ -56,7 +55,7 @@ for(my $i = 0; $i <11; $i++) {
     ymax    => 47.5,
     noinit  => 1,
 #        palette => 'rgb 7,5,15',
-    additional => $labels,
+    additional => $labels.($i==10?"set logscale cb;":""),
     showvalues => 0,  });
   }
 
@@ -64,7 +63,7 @@ for(my $i = 0; $i <11; $i++) {
 while(1) {{
 
 
-  my $cmd = "ls -1 /home/hadaq/oper/lxhadeb*/local*.cal.info";
+  my $cmd = "ls -1 /home/hadaq/trbsoft/daq/hmon/calibration/local*.cal.info";
   my @files = qx($cmd);
   foreach my $f (@files) {
     my ($addr) = $f =~ /local([0-9a-f]{4})\./;

diff --git a/hmon/permanent/hmon_archiver.pl b/hmon/permanent/hmon_archiver.pl
index 306ebf81fb6ae1a2eb6a4f5321764c3134010017..15b0e6adeab2fedeea976a4fdeef9107d89f3a37 100755 (executable)
--- a/hmon/permanent/hmon_archiver.pl
+++ b/hmon/permanent/hmon_archiver.pl
@@ -54,7 +54,7 @@ my $footer = "</div></body></html>";
 my $time;
 
 while(1) {
-  my $filetype = get("http://lxhadeb07:8099/Master/BNET/RunPrefix/get.json?field=%22value%22");
+  my $filetype = get("http://lxhadeb12:8099/Master/BNET/RunPrefix/get.json?field=%22value%22");
   if ($filetype =~ /be/ || $filetype =~ /co/ || ($ARGV[0] && $ARGV[0] eq 'once')) {
 
 

diff --git a/hmon/permanent/hmon_cpu.pl b/hmon/permanent/hmon_cpu.pl
index 82e24b65632fd9309373a7e9f83e440696a926df..f4847877d9e52afe58ccad31d3f89766bf281f24 100755 (executable)
--- a/hmon/permanent/hmon_cpu.pl
+++ b/hmon/permanent/hmon_cpu.pl
@@ -34,7 +34,7 @@ my $fqa = QA::OpenQAFile();
 # my @srv = qw( lxhadeb08 lxhadeb09 lxhadeb10 lxhadeb11 lxhadeb12 lxhadesdaq lxhadeb06 lxhadeb07 lxhadeb13 hadesdaq03 hadesdaq04 hades30 hadesp50 hadesp31 depcp418 hades33 lxhaddcs03 
 # lxhaddcs05 lxhaddcs06 lxhaddcs10 lxhaddcs11);
 # JAM 6.1.2020 - for the moment exlude hosts depcp418 and lxhaddcs03 not available
-my @srv = qw( lxhadeb08 lxhadeb09 lxhadeb10 lxhadeb11 lxhadeb12 lxhadesdaq lxhadeb06 lxhadeb07 lxhadeb13 hadesdaq03 hadesdaq04 hades30 hadesp50 hadesp31 hades33 hades63 lxhaddcs05 lxhaddcs06 lxhaddcs10 lxhaddcs11);
+my @srv = qw( lxhadeb08 lxhadeb09 lxhadeb10 lxhadeb11 lxhadeb12 lxhadeb14 lxhadeb15 lxhadeb16 lxhadesdaq  lxhadeb07 lxhadeb13 hadesdaq03 hadesdaq04 hades30 hadesp50 hadesp31 hades33 hades63 hades66 lxhaddcs05 lxhaddcs06 lxhaddcs10 lxhaddcs11);
 
 my $template .= "\n<table class=\"colorfields cpu\">\n<tr><th>";
 for(my $d=1;$d<=32;$d++) {

diff --git a/hmon/permanent/hmon_eb_run.pl b/hmon/permanent/hmon_eb_run.pl
index 419460976de2a09daf2fc1e3d7f5c2a3b6fe9834..158e6b22a4262da7f92218a315ed3ecda780079b 100755 (executable)
--- a/hmon/permanent/hmon_eb_run.pl
+++ b/hmon/permanent/hmon_eb_run.pl
@@ -51,7 +51,7 @@ my $cmdchecksources = "cat $notactivesourcefile 2>/dev/null;";
 
 
 # JAM 2018 here figure out corresponding json calles
-my $masterurl = 'http://lxhadeb07:8099/';
+my $masterurl = 'http://lxhadeb12:8099/';
 
 my $url_drate =     $masterurl . 'Master/BNET/DataRate/get.json?field="value"';
 my $url_erate =     $masterurl . 'Master/BNET/EventsRate/get.json?field="value"';

diff --git a/hmon/permanent/hmon_ebdiskfill.pl b/hmon/permanent/hmon_ebdiskfill.pl
index 24d980d571326705757252631043ae9ff33ec091..682a32d40a6b27de2c0a7975a6c702a78126c5c7 100755 (executable)
--- a/hmon/permanent/hmon_ebdiskfill.pl
+++ b/hmon/permanent/hmon_ebdiskfill.pl
@@ -27,12 +27,12 @@ $max = 0;
 my $str;
 while (1) {
   $maxqa = 0;
-  $str  = Hmon::MakeTitle(8,5,"Eventbuilder Disk Fill Level"); 
+  $str  = Hmon::MakeTitle(8,6,"Eventbuilder Disk Fill Level"); 
   $str .= "<table class=\"colorfields\">\n<tr><th>";
   for (my $d=1;$d<=15;$d++) {
     $str .= "<th>$d";
   }
-  for (my $n=6;$n<=12;$n++) {
+  for (my $n=8;$n<=16;$n++) {
     my $hostn=sprintf("lxhadeb%02d", $n); 
     my @out = Hmon::qxtimeout("ssh $hostn \"df -h \"",10);
     foreach my $a (@out) {

diff --git a/hmon/permanent/hmon_eberrbits.pl b/hmon/permanent/hmon_eberrbits.pl
index 92accad32b3c4cb4e13d329a60fadc679a4d91d9..5492990383e7904792d16f73316916b7959290cc 100644 (file)
--- a/hmon/permanent/hmon_eberrbits.pl
+++ b/hmon/permanent/hmon_eberrbits.pl
@@ -88,7 +88,7 @@ my @bits = qw(OK Collision WordMissing ChecksumMismatch DontUnderstand BufferMis
 
 
 # JAM 2018 here figure out corresponding json calles
-my $masterurl = 'http://lxhadeb07:8099/';
+my $masterurl = 'http://lxhadeb12:8099/';
 
 my $url_inputs =    $masterurl . 'Master/BNET/Inputs/get.json?field="value"';
 

diff --git a/hmon/permanent/hmon_open_ssh_master_channels.pl b/hmon/permanent/hmon_open_ssh_master_channels.pl
index 0c487bb0b298cacfb86b8b915bc8db14e797ad74..0f50e57af590815f77c74950d43c4db90d86c5bb 100755 (executable)
--- a/hmon/permanent/hmon_open_ssh_master_channels.pl
+++ b/hmon/permanent/hmon_open_ssh_master_channels.pl
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use v5.10.0;
 
-my @cpus = qw |lxhadeb05 lxhadeb06 lxhadeb07 lxhadeb08 lxhadeb09 lxhadeb10 lxhadeb11 lxhadeb12 lxhadeb13 lxhaddcs03 lxhaddcs04 lxhaddcs05 lxhaddcs06 lxhadesdaq hadesdaq01 hadesdaq02 hades30 hadesp31 hades33 lxhadeb05p lxhadeb06p lxhadeb07p lxhadeb08p lxhadeb09p lxhadeb10p lxhadeb11p lxhadeb12p lxhadeb13p lxhaddcs03p lxhaddcs04p lxhaddcs05p lxhaddcs06p lxhadesdaqp hadesdaqp01 hadesdaqp02 hadesp30 hadesp33 hadesp50 |;
+my @cpus = qw |lxhadeb07 lxhadeb08 lxhadeb09 lxhadeb10 lxhadeb11 lxhadeb12 lxhadeb13 lxhadeb14 lxhadeb15 lxhadeb16  lxhaddcs05 lxhaddcs06 lxhadesdaq hadesdaq01 hades30 hadesp31 hades33 lxhadeb07p lxhadeb08p lxhadeb09p lxhadeb10p lxhadeb11p lxhadeb12p lxhadeb13p lxhadeb14p lxhadeb15p lxhadeb16p lxhaddcs05p lxhaddcs06p lxhadesdaqp hadesdaqp01 hadesdaqp02 hadesp30 hadesp33 hadesp50 |;
 
 for my $cpu (@cpus) {
     my $c = "~/trbsoft/hadesdaq/hmon/hmon_ssh hadaq\@$cpu -N -f </dev/null >/dev/null&";

diff --git a/hmon/start.sh b/hmon/start.sh
index 28c0c352d8ddd1c185ba887d7317cebbb0393b19..394ab8b424f8e23198167422ffab182bffa8ae1f 100755 (executable)
--- a/hmon/start.sh
+++ b/hmon/start.sh
@@ -45,6 +45,9 @@ mkdir `pwd`/pion
 
 # sshfs -o allow_other hadaq@lxhadeb06p:/data01/tmp/ `pwd`/pion
 
+sshfs -o allow_other hadaq@hadesp63:~/local/tdcmon/dabc/cal `pwd`/calibration
+
+
 
 echo "  <Hmon>     Linking files to server..."
 ln -fs `pwd`/archive /srv/www/htdocs/mon/

diff --git a/hub/register_configgbe_ip_2021-test.db b/hub/register_configgbe_ip_2021-test.db
index 603e6773a084570463af07e12729c2090fc2c1b6..68c10efdd4c81f39149a07e2b432c7cf445c1c9e 100644 (file)
--- a/hub/register_configgbe_ip_2021-test.db
+++ b/hub/register_configgbe_ip_2021-test.db
@@ -132,18 +132,18 @@
 # 0xc0a8690b   lxhadeb11  mac ac:1f:6b:66:2a:29  192.168.105.11  
 ## 0xc0a8690c   lxhadeb12  mac ac:1f:6b:64:73:17  192.168.105.12  
 # note: lxhadeb12 will be only master node (and spare) JAM 26-07-2021
-# 0xc0a8690e   lxhadeb14  mac 40:a6:b7:3c:b2:0c  192.168.105.14
-# 0xc0a8690f   lxhadeb15  mac 40:a6:b7:3c:5e:0c  192.168.105.15
-# 0xc0a86910   lxhadeb16  mac 40:a6:b7:3c:6d:98  192.168.105.16
+# 0xc0a8690e   lxhadeb14  mac 40:a6:b7:3c:b2:0c  192.168.105.14 -  new  192.168.105.114
+# 0xc0a8690f   lxhadeb15  mac 40:a6:b7:3c:5e:0c  192.168.105.15 -  new  192.168.105.115
+# 0xc0a86910   lxhadeb16  mac 40:a6:b7:3c:6d:98  192.168.105.16 -  new  192.168.105.116
 
 
 # note that we also need to set same destination ips in the hub table at the end of this file!
 #
 #lxhadebXX, EB1 XX
 #  0x8000     0        0xc65B     0xdead8000   0xc0a86480     0xc65B     0xc0a86408 0  # OLD cts  -lxhadeb08
-  0x8700     0        0xc65A     0xdead8700   0xc0a8648C     0xc65A     0xc0a86910 1  #  fw new 1   lxhadeb16
-  0x8701     0        0xc65B     0xdead8701   0xc0a8648C     0xc65B     0xc0a86910 1  #  fw new 2   lxhadeb16
-  0x8702     0        0xc65C     0xdead8702   0xc0a8648C     0xc65C     0xc0a86910 1  #  fw new 3   lxhadeb16
+  0x8700     0        0xc65A     0xdead8700   0xc0a8648C     0xc65A     0xc0a86974 1  #  fw new 1   lxhadeb16
+  0x8701     0        0xc65B     0xdead8701   0xc0a8648C     0xc65B     0xc0a86974 1  #  fw new 2   lxhadeb16
+  0x8702     0        0xc65C     0xdead8702   0xc0a8648C     0xc65C     0xc0a86974 1  #  fw new 3   lxhadeb16
   0x8800     0        0xc650     0xdead8800   0xc0a8648B     0xc650     0xc0a8690b 0  # central-cts lxhadeb11  
   0x8880     0        0xc65D     0xdead8A00   0xc0a8648D     0xc65D     0xc0a86409 2  # start   - lxhadeb09
   0x8890     0        0xc65F     0xdead8890   0xc0a8648F     0xc65F     0xc0a86409 2  # veto      lxhadeb09
@@ -155,26 +155,26 @@
   0x1030     0        0xc663     0xdead1030   0xc0a86493     0xc663     0xc0a86408 0  # mdc - lxhadeb08 
   0x1040     0        0xc664     0xdead1040   0xc0a86494     0xc664     0xc0a86408 0  # mdc - lxhadeb08
   0x1050     0        0xc665     0xdead1050   0xc0a86495     0xc665     0xc0a86408 0  # mdc - lxhadeb08
-  0x1100     0        0xc666     0xdead1100   0xc0a86496     0xc666     0xc0a86910 0  # mdc - lxhadeb16 ->min for 16
-  0x1110     0        0xc667     0xdead1110   0xc0a86497     0xc667     0xc0a8690f 0  # mdc - lxhadeb15 ->min for 15
+  0x1100     0        0xc666     0xdead1100   0xc0a86496     0xc666     0xc0a86974 0  # mdc - lxhadeb16 ->min for 16
+  0x1110     0        0xc667     0xdead1110   0xc0a86497     0xc667     0xc0a86973 0  # mdc - lxhadeb15 ->min for 15
   0x1120     0        0xc668     0xdead1120   0xc0a86498     0xc668     0xc0a86409 0  # mdc - lxhadeb09 - min for 09
   0x1130     0        0xc669     0xdead1130   0xc0a86499     0xc669     0xc0a8640a 0  # mdc - lxhadeb10 - min for 10
   0x1140     0        0xc66A     0xdead1140   0xc0a8649A     0xc66A     0xc0a8690b 0  # mdc - lxhadeb11 - min for 11 
-  0x1150     0        0xc66B     0xdead1150   0xc0a8649B     0xc66B     0xc0a8690e 0  # mdc - lxhadeb14 - min for 14
+  0x1150     0        0xc66B     0xdead1150   0xc0a8649B     0xc66B     0xc0a86972 0  # mdc - lxhadeb14 - min for 14
   0x8a00     0        0xc676     0xdead8a00   0xc0a864A6     0xc676     0xc0a86409 1  # ecal- lxhadeb09
   0x8a01     0        0xc677     0xdead8a01   0xc0a864A7     0xc677     0xc0a86409 1  # ecal- lxhadeb09
   0x8a02     0        0xc678     0xdead8a02   0xc0a864A8     0xc678     0xc0a86409 1  # ecal- lxhadeb09
   0x8a03     0        0xc679     0xdead8a03   0xc0a864A9     0xc679     0xc0a86409 1  # ecal- lxhadeb09
-  0x8a04     0        0xc67a     0xdead8a04   0xc0a864AA     0xc67A     0xc0a8690e 1  # ecal- lxhadeb14
-  0x8a05     0        0xc67b     0xdead8a05   0xc0a864AB     0xc67B     0xc0a8690e 1  # ecal- lxhadeb14  
-  0x83c0     0        0xc67c     0xdead83c0   0xc0a864AC     0xc67C     0xc0a8690e 11  # rich lxhadeb14 
-  0x83c1     0        0xc67d     0xdead83c1   0xc0a864AD     0xc67D     0xc0a8690e 11  # rich lxhadeb14 
-  0x83c2     0        0xc67e     0xdead83c2   0xc0a864AE     0xc67E     0xc0a8690e 11  # rich lxhadeb14 
+  0x8a04     0        0xc67a     0xdead8a04   0xc0a864AA     0xc67A     0xc0a86972 1  # ecal- lxhadeb14
+  0x8a05     0        0xc67b     0xdead8a05   0xc0a864AB     0xc67B     0xc0a86972 1  # ecal- lxhadeb14  
+  0x83c0     0        0xc67c     0xdead83c0   0xc0a864AC     0xc67C     0xc0a86972 11  # rich lxhadeb14 
+  0x83c1     0        0xc67d     0xdead83c1   0xc0a864AD     0xc67D     0xc0a86972 11  # rich lxhadeb14 
+  0x83c2     0        0xc67e     0xdead83c2   0xc0a864AE     0xc67E     0xc0a86972 11  # rich lxhadeb14 
   0x83c3     0        0xc67f     0xdead83c3   0xc0a864AF     0xc67F     0xc0a8640a 11  # rich lxhadeb10
   0x83c4     0        0xc680     0xdead83c4   0xc0a864B0     0xc680     0xc0a8640a 11  # rich lxhadeb10
   0x83c5     0        0xc681     0xdead83c5   0xc0a864B1     0xc681     0xc0a8640a 11  # rich lxhadeb10 
-  0x83c6     0        0xc682     0xdead83c6   0xc0a864B2     0xc682     0xc0a8690e 11  # rich lxhadeb14 
-  0x83c7     0        0xc683     0xdead83c7   0xc0a864B3     0xc683     0xc0a8690e 11  # rich lxhadeb14 
+  0x83c6     0        0xc682     0xdead83c6   0xc0a864B2     0xc682     0xc0a86972 11  # rich lxhadeb14 
+  0x83c7     0        0xc683     0xdead83c7   0xc0a864B3     0xc683     0xc0a86972 11  # rich lxhadeb14 
   0x83c8     0        0xc684     0xdead83c8   0xc0a864B4     0xc684     0xc0a86408 11  # rich lxhadeb08 
   0x83c9     0        0xc685     0xdead83c9   0xc0a864B5     0xc685     0xc0a86408 11  # rich lxhadeb08
   0x83ca     0        0xc686     0xdead83ca   0xc0a864B6     0xc686     0xc0a8690b 11  # rich lxhadeb11 
@@ -193,18 +193,18 @@
   0x86c4     0        0xc694     0xdead86c4   0xc0a864C4     0xc694     0xc0a8690B 2  # tof hub 4 lxhadeb11
   0x86c5     0        0xc695     0xdead86c5   0xc0a864C5     0xc695     0xc0a8690E 2  # tof hub 5 lxhadeb14
   0x86c6     0        0xc696     0xdead86c6   0xc0a864C6     0xc696     0xc0a8690E 2  # tof hub 6 lxhadeb14
-  0x8b00     0        0xc6B0     0xdead8b00   0xc0a864D0     0xc6B0     0xc0a8690f 2  # STS1 0 lxhadeb15
-  0x8b01     0        0xc6B1     0xdead8b01   0xc0a864D1     0xc6B1     0xc0a8690f 2  # STS1 1 lxhadeb15 
-  0x8b02     0        0xc6B2     0xdead8b02   0xc0a864D2     0xc6B2     0xc0a8690f 2  # STS1 2 lxhadeb15
-  0x8b03     0        0xc6B3     0xdead8b03   0xc0a864D3     0xc6B3     0xc0a8690f 2  # STS1 3 lxhadeb15
-  0x8b10     0        0xc6B4     0xdead8b10   0xc0a864D9     0xc6B4     0xc0a86910 2  # STS2 0 lxhadeb16
-  0x8b11     0        0xc6B5     0xdead8b11   0xc0a864DA     0xc6B5     0xc0a86910 2  # STS2 1 lxhadeb16 
-  0x8b12     0        0xc6B6     0xdead8b12   0xc0a864DB     0xc6B6     0xc0a86910 2  # STS2 2 lxhadeb16 
-  0x8b13     0        0xc6B7     0xdead8b13   0xc0a864DC     0xc6B7     0xc0a86910 2  # STS2 3 lxhadeb16
-  0x8b14     0        0xc6B8     0xdead8b14   0xc0a864DD     0xc6B8     0xc0a86910 2  # STS2 4 lxhadeb16
-  0x8b15     0        0xc6B9     0xdead8b15   0xc0a864DE     0xc6B9     0xc0a86910 2  # STS2 5 lxhadeb16    
-  0x8c00     0        0xc6BA     0xdead8c00   0xc0a864C0     0xc6BA     0xc0a8690f 2  # fw-RPC 0 lxhadeb15
-  0x8c10     0        0xc6BB     0xdead8c01   0xc0a864C0     0xc6BB     0xc0a8690f 2  # fw-RPC 1 lxhadeb15
+  0x8b00     0        0xc6B0     0xdead8b00   0xc0a864D0     0xc6B0     0xc0a86973 2  # STS1 0 lxhadeb15
+  0x8b01     0        0xc6B1     0xdead8b01   0xc0a864D1     0xc6B1     0xc0a86973 2  # STS1 1 lxhadeb15 
+  0x8b02     0        0xc6B2     0xdead8b02   0xc0a864D2     0xc6B2     0xc0a86973 2  # STS1 2 lxhadeb15
+  0x8b03     0        0xc6B3     0xdead8b03   0xc0a864D3     0xc6B3     0xc0a86973 2  # STS1 3 lxhadeb15
+  0x8b10     0        0xc6B4     0xdead8b10   0xc0a864D9     0xc6B4     0xc0a86974 2  # STS2 0 lxhadeb16
+  0x8b11     0        0xc6B5     0xdead8b11   0xc0a864DA     0xc6B5     0xc0a86974 2  # STS2 1 lxhadeb16 
+  0x8b12     0        0xc6B6     0xdead8b12   0xc0a864DB     0xc6B6     0xc0a86974 2  # STS2 2 lxhadeb16 
+  0x8b13     0        0xc6B7     0xdead8b13   0xc0a864DC     0xc6B7     0xc0a86974 2  # STS2 3 lxhadeb16
+  0x8b14     0        0xc6B8     0xdead8b14   0xc0a864DD     0xc6B8     0xc0a86974 2  # STS2 4 lxhadeb16
+  0x8b15     0        0xc6B9     0xdead8b15   0xc0a864DE     0xc6B9     0xc0a86974 2  # STS2 5 lxhadeb16    
+  0x8c00     0        0xc6BA     0xdead8c00   0xc0a864C0     0xc6BA     0xc0a86973 2  # fw-RPC 0 lxhadeb15
+  0x8c10     0        0xc6BB     0xdead8c01   0xc0a864C0     0xc6BB     0xc0a86973 2  # fw-RPC 1 lxhadeb15
   0x8d00     0        0xc6BC     0xdead86c1   0xc0a864C1     0xc6BC     0xc0a86409 2  # inner-tof lxhadeb09
 
   #######################################################################################################################
@@ -227,8 +227,11 @@
 #  lxhadeb12  enp19s0f1         ac:1f:6b:8b:60:1f      192.168.105.12  0xc0a8690c
 
 # lxhadeb14  enp67s0f0  40:a6:b7:3c:b2:0c  192.168.105.14 0xc0a8690e
+#                                      new 192.168.105.114 0xc0a86972
 # lxhadeb15  enp67s0f0  40:a6:b7:3c:5e:0c  192.168.105.15 0xc0a8690f
+#                                      new 192.168.105.115 0xc0a86973
 # lxhadeb16  enp67s0f0  40:a6:b7:3c:6d:98  192.168.105.16 0xc0a86910
+#                                      new 192.168.105.116 0xc0a86974
 
 # EB 3:   lxhadeb05  eth4       192.168.100.15  0xc0a8640f 
    
@@ -241,9 +244,9 @@
 # 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
 #
-  0x8700     100    0xb73c6d98     0x40a6    0xc0a86910     0x0230        0x0578 #  fw new 1     lxhadeb16
-  0x8701     100    0xb73c6d98     0x40a6    0xc0a86910     0x0230        0x0578 #  fw new 2     lxhadeb16
-  0x8702     100    0xb73c6d98     0x40a6    0xc0a86910     0x0230        0x0578 #  fw new 3     lxhadeb16
+  0x8700     100    0xb73c6d98     0x40a6    0xc0a86974     0x0230        0x0578 #  fw new 1     lxhadeb16
+  0x8701     100    0xb73c6d98     0x40a6    0xc0a86974     0x0230        0x0578 #  fw new 2     lxhadeb16
+  0x8702     100    0xb73c6d98     0x40a6    0xc0a86974     0x0230        0x0578 #  fw new 3     lxhadeb16
   0x8800     100    0x6b8b62f1     0xac1f    0xc0a8690b     0x0230        0x0578 #  central-cts lxhadeb11 ######  
   0x8880     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  start   - lxhadeb09
   0x8890     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  veto      lxhadeb09
@@ -255,27 +258,27 @@
   0x1030     100    0xbaf79bb5     0x90e2    0xc0a86408     0x0230        0x0578 #  mdc - lxhadeb08 
   0x1040     100    0xbaf79bb5     0x90e2    0xc0a86408     0x0230        0x0578 #  mdc - lxhadeb08
   0x1050     100    0xbaf79bb5     0x90e2    0xc0a86408     0x0230        0x0578 #  mdc - lxhadeb08 
-  0x1100     100    0xb73c6d98     0x40a6    0xc0a86910     0x0230        0x0578 #  mdc - lxhadeb16 - min if others are off
-  0x1110     100    0xb73c5e0c     0x40a6    0xc0a8690f     0x0230        0x0578 #  mdc - lxhadeb15 - min if others are off
+  0x1100     100    0xb73c6d98     0x40a6    0xc0a86974     0x0230        0x0578 #  mdc - lxhadeb16 - min if others are off
+  0x1110     100    0xb73c5e0c     0x40a6    0xc0a86973     0x0230        0x0578 #  mdc - lxhadeb15 - min if others are off
   0x1120     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  mdc - lxhadeb09   - minimum if rich is off
   0x1130     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  mdc - lxhadeb10   - minimum if ecal is off
   0x1140     100    0x6b8b62f1     0xac1f    0xc0a8690b     0x0230        0x0578 #  mdc - lxhadeb11   - minimum subevent for 11 
-  0x1150     100    0xb73cb20c     0x40a6    0xc0a8690e     0x0230        0x0578 #  mdc - lxhadeb14   - minimum sub for 14
+  0x1150     100    0xb73cb20c     0x40a6    0xc0a86972     0x0230        0x0578 #  mdc - lxhadeb14   - minimum sub for 14
 #  0x1160     100    0x6b662a29     0xac1f    0xc0a8690b     0x0230        0x0578 #  mdc - OLD lxhadeb11 ##### old?
   0x8a00     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  ecal- lxhadeb09
   0x8a01     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  ecal- lxhadeb09
   0x8a02     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  ecal- lxhadeb09
   0x8a03     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  ecal- lxhadeb09
-  0x8a04     100    0xb73cb20c     0x40a6    0xc0a8690e     0x0230        0x0578 #  ecal- lxhadeb14
-  0x8a05     100    0xb73cb20c     0x40a6    0xc0a8690e     0x0230        0x0578 #  ecal- lxhadeb14
-  0x83c0     100    0xb73cb20c     0x40a6    0xc0a8690e     0x0230        0x0578 #  rich -lxhadeb14  
-  0x83c1     100    0xb73cb20c     0x40a6    0xc0a8690e     0x0230        0x0578 #  rich -lxhadeb14 
-  0x83c2     100    0xb73cb20c     0x40a6    0xc0a8690e     0x0230        0x0578 #  rich -lxhadeb14 
+  0x8a04     100    0xb73cb20c     0x40a6    0xc0a86972     0x0230        0x0578 #  ecal- lxhadeb14
+  0x8a05     100    0xb73cb20c     0x40a6    0xc0a86972     0x0230        0x0578 #  ecal- lxhadeb14
+  0x83c0     100    0xb73cb20c     0x40a6    0xc0a86972     0x0230        0x0578 #  rich -lxhadeb14  
+  0x83c1     100    0xb73cb20c     0x40a6    0xc0a86972     0x0230        0x0578 #  rich -lxhadeb14 
+  0x83c2     100    0xb73cb20c     0x40a6    0xc0a86972     0x0230        0x0578 #  rich -lxhadeb14 
   0x83c3     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - lxhadeb10
   0x83c4     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - lxhadeb10
   0x83c5     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - lxhadeb10
-  0x83c6     100    0xb73cb20c     0x40a6    0xc0a8690e     0x0230        0x0578 #  rich - lxhadeb14 
-  0x83c7     100    0xb73cb20c     0x40a6    0xc0a8690e     0x0230        0x0578 #  rich - lxhadeb14 
+  0x83c6     100    0xb73cb20c     0x40a6    0xc0a86972     0x0230        0x0578 #  rich - lxhadeb14 
+  0x83c7     100    0xb73cb20c     0x40a6    0xc0a86972     0x0230        0x0578 #  rich - lxhadeb14 
   0x83c8     100    0xbaf79bb5     0x90e2    0xc0a86408     0x0230        0x0578 #  rich - lxhadeb08
   0x83c9     100    0xbaf79bb5     0x90e2    0xc0a86408     0x0230        0x0578 #  rich - lxhadeb08                                                                                   
   0x83ca     100    0x6b8b62f1     0xac1f    0xc0a8690b     0x0230        0x0578 #  rich - lxhadeb11                                                               
@@ -292,21 +295,21 @@
   0x86c2     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  tof hub 2  lxhadeb10
   0x86c3     100    0x6b8b62f1     0xac1f    0xc0a8690b     0x0230        0x0578 #  tof hub 3 lxhadeb11
   0x86c4     100    0x6b8b62f1     0xac1f    0xc0a8690b     0x0230        0x0578 #  tof hub 4 lxhadeb11
-  0x86c5     100    0xb73cb20c     0x40a6    0xc0a8690e     0x0230        0x0578 #  tof hub 5 lxhadeb14 
-  0x86c6     100    0xb73cb20c     0x40a6    0xc0a8690e     0x0230        0x0578 #  tof hub 6 lxhadeb14
-  0x8b00     100    0xb73c5e0c     0x40a6    0xc0a8690f     0x0230        0x0578 #  STS1 0  lxhadeb15
-  0x8b01     100    0xb73c5e0c     0x40a6    0xc0a8690f     0x0230        0x0578 #  STS1 1  lxhadeb15
-  0x8b02     100    0xb73c5e0c     0x40a6    0xc0a8690f     0x0230        0x0578 #  STS1 2  lxhadeb15
-  0x8b03     100    0xb73c5e0c     0x40a6    0xc0a8690f     0x0230        0x0578 #  STS1 3  lxhadeb15 
-  0x8b10     100    0xb73c6d98     0x40a6    0xc0a86910     0x0230        0x0578  # STS2 0  lxhadeb16
-  0x8b11     100    0xb73c6d98     0x40a6    0xc0a86910     0x0230        0x0578  # STS2 1  lxhadeb16
-  0x8b12     100    0xb73c6d98     0x40a6    0xc0a86910     0x0230        0x0578  # STS2 2  lxhadeb16
-  0x8b13     100    0xb73c6d98     0x40a6    0xc0a86910     0x0230        0x0578  # STS2 3  lxhadeb16
-  0x8b14     100    0xb73c6d98     0x40a6    0xc0a86910     0x0230        0x0578  # STS2 4  lxhadeb16
-  0x8b15     100    0xb73c6d98     0x40a6    0xc0a86910     0x0230        0x0578  # STS2 5  lxhadeb16
+  0x86c5     100    0xb73cb20c     0x40a6    0xc0a86972     0x0230        0x0578 #  tof hub 5 lxhadeb14 
+  0x86c6     100    0xb73cb20c     0x40a6    0xc0a86972     0x0230        0x0578 #  tof hub 6 lxhadeb14
+  0x8b00     100    0xb73c5e0c     0x40a6    0xc0a86973     0x0230        0x0578 #  STS1 0  lxhadeb15
+  0x8b01     100    0xb73c5e0c     0x40a6    0xc0a86973     0x0230        0x0578 #  STS1 1  lxhadeb15
+  0x8b02     100    0xb73c5e0c     0x40a6    0xc0a86973     0x0230        0x0578 #  STS1 2  lxhadeb15
+  0x8b03     100    0xb73c5e0c     0x40a6    0xc0a86973     0x0230        0x0578 #  STS1 3  lxhadeb15 
+  0x8b10     100    0xb73c6d98     0x40a6    0xc0a86974     0x0230        0x0578  # STS2 0  lxhadeb16
+  0x8b11     100    0xb73c6d98     0x40a6    0xc0a86974     0x0230        0x0578  # STS2 1  lxhadeb16
+  0x8b12     100    0xb73c6d98     0x40a6    0xc0a86974     0x0230        0x0578  # STS2 2  lxhadeb16
+  0x8b13     100    0xb73c6d98     0x40a6    0xc0a86974     0x0230        0x0578  # STS2 3  lxhadeb16
+  0x8b14     100    0xb73c6d98     0x40a6    0xc0a86974     0x0230        0x0578  # STS2 4  lxhadeb16
+  0x8b15     100    0xb73c6d98     0x40a6    0xc0a86974     0x0230        0x0578  # STS2 5  lxhadeb16
   
-  0x8c00     100    0xb73c5e0c     0x40a6    0xc0a8690f    0x0230        0x0578 #  fwRPC-0 - lxhadeb15
-  0x8c10     100    0xb73c5e0c     0x40a6    0xc0a8690f    0x0230        0x0578 #  fwRPC-1 - lxhadeb15
+  0x8c00     100    0xb73c5e0c     0x40a6    0xc0a86973    0x0230        0x0578 #  fwRPC-0 - lxhadeb15
+  0x8c10     100    0xb73c5e0c     0x40a6    0xc0a86973    0x0230        0x0578 #  fwRPC-1 - lxhadeb15
   0x8d00     100    0xbaf7cfa1     0x90e2    0xc0a86409    0x0230        0x0578 #  inner-tof lxhadeb09
  
                                                             

diff --git a/main/data_sources.db b/main/data_sources.db
index 8c642980a2bf9e77222691abacd2737b6e683a59..a8c4a28a448fb4a269bc53b0ea85c70810193109 100644 (file)
--- a/main/data_sources.db
+++ b/main/data_sources.db
@@ -7,15 +7,15 @@
 0x8890      0         Veto             mid
 0x84c0      1         RPCnew1           mid
 0x84c1      1         RPCnew2           mid
-0x84c2      1         RPCnew3           mid
+0x84c2      0         RPCnew3           mid
 0x84c3      1         RPCnew4           mid
 0x84c4      1         RPCnew5           mid
 0x84c5      1         RPCnew6           mid
 0x86c0      1         TOFnew1           mid
 0x86c1      1         TOFnew2           mid
 0x86c2      1         TOFnew3           mid
-0x86c3      1         TOFnew4           mid
-0x86c4      1         TOFnew5           mid
+0x86c3      0         TOFnew4           mid
+0x86c4      0         TOFnew5           mid
 0x86c5      1         TOFnew6           mid
 0x1000      1         MDC12sec1         high
 0x1010      1         MDC12sec2         high
@@ -23,7 +23,7 @@
 0x1030      1         MDC12sec4         high
 0x1040      1         MDC12sec5         high
 0x1050      1         MDC12sec6         high
-0x1100      1         MDC34sec1         high
+0x1100      0         MDC34sec1         high
 0x1110      1         MDC34sec2         mid
 0x1120      1         MDC34sec3         high
 0x1130      1         MDC34sec4         mid
@@ -41,10 +41,10 @@
 0x83c1      1         RICH1             mid
 0x83c2      1         RICH2             mid
 0x83c3      1         RICH3             mid
-0x83c4      1         RICH4             mid
+0x83c4      0         RICH4             mid
 0x83c5      1         RICH5             mid
-0x83c6      1         RICH6             mid
-0x83c7      1         RICH7             mid
+0x83c6      0         RICH6             mid
+0x83c7      0         RICH7             mid
 0x83c8      1         RICH8             mid
 0x83c9      1         RICH9             mid
 0x83ca      1         RICHa             mid

diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh
index 7efdd00b00ae846ea1ffa63469c2abe5b3c629a8..ec0cd2f99bdbda5b7c5b33fb4abe2ca7239c34a2 100755 (executable)
--- a/main/startup_briccolage.sh
+++ b/main/startup_briccolage.sh
@@ -19,16 +19,16 @@ fi
 # 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" 
+/usr/bin/wget  -a /tmp/EB_restart.log -O /tmp/EB_prefix.txt "http://lxhadeb12: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" &
+/usr/bin/wget  -a /tmp/EB_restart.log -O /tmp/EB_fileres.txt "http://lxhadeb12: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"
+#/usr/bin/wget  -a /tmp/EB_restart.log -O /tmp/EB_fileres.txt "http://lxhadeb12:8099/Master/BNET/ResetDAQ/execute"
 
   
    
@@ -81,10 +81,10 @@ scp /home/hadaq/oper/daq2ora/daq2ora_current.txt hadesp33:/home/hadaq/trbsoft/ha
 
 # JAM 29-06-2018 instead restarting, just drop buffers and reopen the most recent file type:
 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://lxhadeb12:8099/Master/BNET/ResetDAQ/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"
+/usr/bin/wget  -a /tmp/EB_restart.log -O /tmp/EB_fileres.txt "http://lxhadeb12:8099/Master/BNET/StartRun/execute?prefix=$prefix"
 
 rm /tmp/EB_prefix.txt  
 

diff --git a/nettools/Perl2Epics.pm b/nettools/Perl2Epics.pm
index a7e5ac7a9b59be67a70bfb6e5bfb8996ec7916f4..0741f91b0feb1fa285e5080eed2cf433083526d1 100644 (file)
--- a/nettools/Perl2Epics.pm
+++ b/nettools/Perl2Epics.pm
@@ -8,6 +8,7 @@ use lib '/home/scs/EPICS/EPICS-3.14.12.4/base/' . '/lib/perl';
 use lib '/home/hadaq/EPICS/EPICS-3.15.6/base' . '/lib/perl';
 use lib '/home/hadaq/soft/EPICS/EPICS-3.16.1/base/' . '/lib/perl';
 use lib '/home/epics/EPICS/EPICS-3.16.1/base/' . '/lib/perl';
+use lib '/home/hadaq/soft/EPICS/EPICS-7.0.1.1/base/' . '/lib/perl';
 use CA;
 
 #JAM 2020: back to default after EBs are done with epics

diff --git a/rich/addresses_dirich.db b/rich/addresses_dirich.db
index 30505df86ecb0ccdb37110eff2ffb0c8133f3700..e8ad40dba24d6a2415b51c703e0625f673e699f7 120000 (symlink)
--- a/rich/addresses_dirich.db
+++ b/rich/addresses_dirich.db
@@ -1 +1 @@
-addresses_dirich.db_20200525
\ No newline at end of file
+addresses_dirich.db_20210817
\ No newline at end of file

diff --git a/rich/startup.script b/rich/startup.script
index 5d912fba815c397b2bfe62a6aaf5587177efbb3c..004fef590240b4e8d3d596759a98e96dfa050032 100644 (file)
--- a/rich/startup.script
+++ b/rich/startup.script
@@ -1,5 +1,5 @@
 
-exec_cmd{local} /home/hadaq/trbsoft/hadesdaq/rich/retransmission.sh
+#exec_cmd{local} /home/hadaq/trbsoft/hadesdaq/rich/retransmission.sh
 
 
 trbcmd loadbit 0xfe52 0xd580 0x6 0x2  #switch trigger input correctly
@@ -11,4 +11,4 @@ load_register register_tdc_rich.db
 
 trbcmd w 0x0110 0xe120 0x250 # set to 37°
 
-#trbcmd w 0x0110 0xe120 0x400
+#trbcmd w 0x0110 0xe120 0x600

diff --git a/rpc/addresses_rpc_trb3sc.db b/rpc/addresses_rpc_trb3sc.db
index 852712a98b40b87a2f943c5a660750e6546b7f00..1f04f0f3dd4010126ecb629fc6efcd82c4502ab0 100644 (file)
--- a/rpc/addresses_rpc_trb3sc.db
+++ b/rpc/addresses_rpc_trb3sc.db
@@ -57,7 +57,7 @@
 0x5852       246       1
 0x5853       218       1
 0x5854       209       1
-0x5855       225       1
+0x5855       215       1  #was 225 25.8.21
 0x5856       251       1
 0x5857       229       1
 0x5858       241       1