From: Hadaq Hades <hadaq@lxhadesdaq>
Date: Fri, 18 May 2018 14:56:15 +0000 (+0200)
Subject: JAM: added some scripts to start bnet monitor tools
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=44f0dc0dc6dcb02811d5a6a340e0e4fe758b17e3;p=hadesdaq.git

JAM: added some scripts to start bnet monitor tools
adjust eb configuration for bnet. under test.
---

diff --git a/control/gui/eb/29_Prefix_Be b/control/gui/eb/29_Prefix_Be
index 82faba3..95d0e05 100755
--- a/control/gui/eb/29_Prefix_Be
+++ b/control/gui/eb/29_Prefix_Be
@@ -5,9 +5,9 @@
 
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash -c '
-  echo "Starting Eventbuilder 1 - 16 with file prefix be"
+  echo "Starting Eventbuilders with file prefix be"
   cd ~/trbsoft/hadesdaq/evtbuild/
-  ./start_eb_gbe.pl -e restart -n 1-16 -d on -p be
+  ./start_eb_gbe.pl -e restart -n 1-16  -d on -p be
   '
  "
 /home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing beam files." "EB" &
diff --git a/control/gui/eb/30_Prefix_NoFile b/control/gui/eb/30_Prefix_NoFile
index c4843c6..1abb6e3 100755
--- a/control/gui/eb/30_Prefix_NoFile
+++ b/control/gui/eb/30_Prefix_NoFile
@@ -4,9 +4,9 @@
 
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash -c '
-  echo "Starting Eventbuilder 1 - 16, writing NO FILES"
+  echo "Starting Eventbuilder , writing NO FILES"
   cd ~/trbsoft/hadesdaq/evtbuild/
-  ./start_eb_gbe.pl -e restart -n 1-16 -d off -p '--'
+  ./start_eb_gbe.pl -e restart  -n 1-16 -d off -p '--'
  '
 "
 /home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. NO FILES are being written" "EB" &
diff --git a/control/gui/eb/40_Prefix_Te b/control/gui/eb/40_Prefix_Te
index d52c290..a966b8b 100755
--- a/control/gui/eb/40_Prefix_Te
+++ b/control/gui/eb/40_Prefix_Te
@@ -4,9 +4,9 @@
 
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash -c '
-  echo "Starting Eventbuilder 1 - 16 with prefix te"
+  echo "Starting Eventbuilders  with prefix te"
   cd ~/trbsoft/hadesdaq/evtbuild/
-  ./start_eb_gbe.pl -e restart -n 1-16 -d on -p te
+  ./start_eb_gbe.pl -e restart -n 1-16  -d on -p te
  '
  "
 /home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing test files" "EB" &
diff --git a/control/gui/eb/50_Prefix_Co b/control/gui/eb/50_Prefix_Co
index c5c52cd..ee70e70 100755
--- a/control/gui/eb/50_Prefix_Co
+++ b/control/gui/eb/50_Prefix_Co
@@ -4,9 +4,9 @@
 
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash -c '
-  echo "Starting Eventbuilder 1 - 16 with prefix co"
+  echo "Starting Eventbuilders  with prefix co"
   cd ~/trbsoft/hadesdaq/evtbuild/
-  ./start_eb_gbe.pl -e restart -n 1-16 -d on -p co
+  ./start_eb_gbe.pl -e restart -n 1-16  -d on -p co
   '
  "
 /home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing Cosmics Files" "EB" &
diff --git a/control/gui/eb/60_Prefix_TC b/control/gui/eb/60_Prefix_TC
index fa0a161..4d471d5 100755
--- a/control/gui/eb/60_Prefix_TC
+++ b/control/gui/eb/60_Prefix_TC
@@ -4,9 +4,9 @@
 
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash -c '
-  echo "Starting Eventbuilder 1 - 16 with prefix tc"
+  echo "Starting Eventbuilders with prefix tc"
   cd ~/trbsoft/hadesdaq/evtbuild/
-  ./start_eb_gbe.pl -e restart -n 1-16 -d on -p tc
+  ./start_eb_gbe.pl -e restart  -n 1-16 -d on -p tc
   '
  "
 /home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing TDC-Calibration Files" "EB" &
diff --git a/control/gui/eb/70_Prefix_Ri b/control/gui/eb/70_Prefix_Ri
index 6dca37a..3e3da20 100755
--- a/control/gui/eb/70_Prefix_Ri
+++ b/control/gui/eb/70_Prefix_Ri
@@ -4,9 +4,9 @@
 
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash -c '
-  echo "Starting Eventbuilder 1 - 16 with prefix ri"
+  echo "Starting Eventbuilders with prefix ri"
   cd ~/trbsoft/hadesdaq/evtbuild/
-  ./start_eb_gbe.pl -e restart -n 1-16 -d on -p ri
+  ./start_eb_gbe.pl -e restart -n 1-16  -d on -p ri
   '
  "
 /home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing RICH Files" "EB" &
diff --git a/control/gui/eb/75_Prefix_Ec b/control/gui/eb/75_Prefix_Ec
index 3838fa2..b8a8aec 100755
--- a/control/gui/eb/75_Prefix_Ec
+++ b/control/gui/eb/75_Prefix_Ec
@@ -4,9 +4,9 @@
 
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash -c '
-  echo "Starting Eventbuilder 1 - 16 with prefix ec"
+  echo "Starting Eventbuilders with prefix ec"
   cd ~/trbsoft/hadesdaq/evtbuild/
-  ./start_eb_gbe.pl -e restart -n 1-16 -d on -p ec
+  ./start_eb_gbe.pl -e restart  -n 1-16 -d on -p ec
   '
  "
 /home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing ECAL Files" "EB" &
diff --git a/control/gui/eb/80_Prefix_St b/control/gui/eb/80_Prefix_St
index 10630dd..23ebcfc 100755
--- a/control/gui/eb/80_Prefix_St
+++ b/control/gui/eb/80_Prefix_St
@@ -2,9 +2,9 @@
 
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash -c '
-  echo "Starting Eventbuilder 1 - 16 with prefix st"
+  echo "Starting Eventbuilders  with prefix st"
   cd ~/trbsoft/hadesdaq/evtbuild/
-  ./start_eb_gbe.pl -e restart -n 1-16 -d on -p st
+  ./start_eb_gbe.pl -e restart  -n 1-16 -d on -p st
   '
  "
 /home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing START Files" "EB"&
diff --git a/control/gui/eb/90_Prefix_Md b/control/gui/eb/90_Prefix_Md
index 8b2e3a5..e68c98c 100755
--- a/control/gui/eb/90_Prefix_Md
+++ b/control/gui/eb/90_Prefix_Md
@@ -2,7 +2,7 @@
 
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash -c '
-  echo "Starting Eventbuilder 1 - 16 with prefix md"
+  echo "Starting Eventbuilders with prefix md"
   cd ~/trbsoft/hadesdaq/evtbuild/
   ./start_eb_gbe.pl -e restart -n 1-16 -d on -p md
   '
diff --git a/control/gui/eb/98_Prefix_Sh b/control/gui/eb/98_Prefix_Sh
index 07c3ddf..6ab4cd2 100755
--- a/control/gui/eb/98_Prefix_Sh
+++ b/control/gui/eb/98_Prefix_Sh
@@ -4,9 +4,9 @@
 
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash -c '
-  echo "Starting Eventbuilder 1 - 16 with prefix sh"
+  echo "Starting Eventbuilders with prefix sh"
   cd ~/trbsoft/hadesdaq/evtbuild/
-  ./start_eb_gbe.pl -e restart -n 1-16 -d on -p sh
+  ./start_eb_gbe.pl -e restart  -n 1-16 -d on -p sh
   '
  "
 /home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing Shower sh files" "EB" &
diff --git a/control/gui/eb/99_Prefix_Pt b/control/gui/eb/99_Prefix_Pt
index 9a79351..c0a4da9 100755
--- a/control/gui/eb/99_Prefix_Pt
+++ b/control/gui/eb/99_Prefix_Pt
@@ -4,7 +4,7 @@
 
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash -c '
-  echo "Starting Eventbuilder 1 - 16 with prefix pt"
+  echo "Starting Eventbuilders with prefix pt"
   cd ~/trbsoft/hadesdaq/evtbuild/
   ./start_eb_gbe.pl -e restart -n 1-16 -d on -p pt
   '
diff --git a/control/gui/expert/Restart_BNET_Control b/control/gui/expert/Restart_BNET_Control
new file mode 100755
index 0000000..24de34d
--- /dev/null
+++ b/control/gui/expert/Restart_BNET_Control
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+xterm -geometry 80x24 -bg orange -fg black -e bash -c ' ssh hadaq@140.181.91.154 "/home/hadaq/bin/restart_bnetmaster.sh ; echo closing window in 5 secs...; sleep 5" '
+
+
+
diff --git a/control/gui/monitor/40_BNET b/control/gui/monitor/40_BNET
new file mode 100755
index 0000000..579fc2b
--- /dev/null
+++ b/control/gui/monitor/40_BNET
@@ -0,0 +1,3 @@
+#!/bin/bash
+MOZ_NO_REMOTE=1 firefox -P Eventbuilding  http://lxhadeb03:8090
+
diff --git a/control/gui/monitor/40_BNET.png b/control/gui/monitor/40_BNET.png
new file mode 100644
index 0000000..9e78c79
Binary files /dev/null and b/control/gui/monitor/40_BNET.png differ
diff --git a/ecal/startup.script b/ecal/startup.script
index 05bb522..3bceab4 100644
--- a/ecal/startup.script
+++ b/ecal/startup.script
@@ -12,7 +12,7 @@
 #Load TDC settings
   load_register  register_tdc_ecal.db
 
-
+  load_register  register_monitoring_trigger.db
 #wait
 
 
diff --git a/evtbuild/eb_bnet_ltsm.conf b/evtbuild/eb_bnet_ltsm.conf
index daa2f93..0635d32 100644
--- a/evtbuild/eb_bnet_ltsm.conf
+++ b/evtbuild/eb_bnet_ltsm.conf
@@ -72,7 +72,7 @@ BNETINP:	0 0 0 0
 #BNETINP: 	2 2 2 2
 #BNETBLD:	2 2 2 2
 #BNETBLD:	3 3 3 3
-BNETBLD:	1 1 1 1
+BNETBLD:	1 1 1 0
 
 # EB Nr        0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
 #EB_LIST:       1  1  1  1  1  1  1  1  0  0  0  0  0  0  0  0
@@ -130,7 +130,7 @@ RFIO_iPathConvention: 0
 # LTSM switch (on=1/off=0) for 16 EB processes
 # note: for bnet mode, only flag of EB15 is used!
 # EB Nr        0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
-LTSM:          1  1  1  1  1  1  1  1  1  1  1  1  1  1  1  0
+LTSM:          1  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1
 #LTSM:          0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
 #LTSM:          0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
 
diff --git a/evtbuild/start_eb_gbe.pl b/evtbuild/start_eb_gbe.pl
index f204e60..ce56a68 100755
--- a/evtbuild/start_eb_gbe.pl
+++ b/evtbuild/start_eb_gbe.pl
@@ -711,10 +711,12 @@ for ( my $ebserver=0; $ebserver<4; $ebserver=$ebserver+1){
 	 for(my $sender=0; $sender<$bnet_numsenders; $sender=$sender+1)
 	 {
 	    
-	    my $sendnum= $sender + 1;	 
+	    #my $sendnum= $sender + 1;
+	    
 	    my $exports = " export MYHOST=" . $gsi_cpu . ";" .
-	        " export BNINPNUM=" . $sendnum . ";" .
-		" export BNINPID=" . $sendid . "; " .
+	        #" export BNINPNUM=" . $sendnum . ";" . # need to use different sender numbers on differentnodes
+	        " export BNINPNUM=" . $ebid . ";" . # todo: extend if more than one sender per node
+	        " export BNINPID=" . $sendid . "; " .
 		" export BNINPPORT=" . $bninpport . "; " .
 		" export BNETSENDERS=" . $bnetsenders . ";" .
 		" export BNETRECEIVERS=" . $bnetrcvs . ";" .
@@ -845,7 +847,6 @@ sub startEvtBuilders()
       return;
     }
     
-    
 #   print "DISABLING regular eventbuilder start for testing!\n";
 #    return;
 ########################################
@@ -858,7 +859,13 @@ sub startEvtBuilders()
         my $ebnum2print = $ebproc+1;
         print "EB process: $ebnum2print\n";
 
-
+if($ebproc==15)
+{
+  print "Ignore eventbuilder 16, setup is reserved for BNET. \n";
+  return;
+}
+        
+        
 # JAM first test if we should activate dabc eventbuilder or old one
 
  if( $EB_Args_href->{$ebproc}->{'DABC'} ){
diff --git a/hmon/permanent/hmon_ebdiskfill.pl b/hmon/permanent/hmon_ebdiskfill.pl
index 6ac3a3a..a0b8131 100755
--- a/hmon/permanent/hmon_ebdiskfill.pl
+++ b/hmon/permanent/hmon_ebdiskfill.pl
@@ -32,21 +32,22 @@ while (1) {
   for (my $d=1;$d<=22;$d++) {
     $str .= "<th>$d";
   }
-  for (my $n=2;$n<=7;$n++) {
-    my @out = Hmon::qxtimeout("ssh lxhadeb0$n \"df -h \"",10);
+  for (my $n=2;$n<=10;$n++) {
+    my $hostn=sprintf("lxhadeb%02d", $n); 
+    my @out = Hmon::qxtimeout("ssh $hostn \"df -h \"",10);
     foreach my $a (@out) {
       if ($a =~ /\d+,?.?\d+[TGM]?\s+(\d+,?.?\d+[TGM]?)\s+(\d+,?.?\d+[TGM]?)\s+(\d*)\%\s*\/data(\d\d)$/) {
 	$store->{$n}->{$4} = $3;
 	$store2->{$n}->{$4} = $2." / ".$1." = ".$3."%";
 	if ($3 > $max) {
-	  $max = $3; $maxb = "$3% on lxhadeb$n Disk $4";
+	  $max = $3; $maxb = "$3% on $hostn Disk $4";
 	}
 	if ($3 > $maxqa) {
 	  $maxqa = $3;
 	}
       }
     }
-    $str .= "\n<tr><th>lxhadeb$n";
+    $str .= "\n<tr><th> $hostn";
     for (my $d=1;$d<=22;$d++) {
       my $id = $d;
       $id = '0'.$d if $d<10;