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 82faba31708a6b7e9376d5f86bae505aab4b77ee..95d0e055903df169b4c317e7bf0c8103d256dbc8 100755 (executable)
--- 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 c4843c670c2c3e09165f2c34657c7ae59ad246c7..1abb6e30bfeb9f1aa14c8541befbdd35e6ec30d0 100755 (executable)
--- 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 d52c290a7569f0b87c7c2e984233302eb27e1f0e..a966b8bf411250c92ba54cea4960c767adfafbcc 100755 (executable)
--- 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 c5c52cda018717ec4719810c05e83d66dfe5fea2..ee70e7051d154d9cff028ff45c9a8f942ec2f487 100755 (executable)
--- 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 fa0a161682f02f771094c3ea4b0079a5e4337ed2..4d471d577a89ec6784fe4fedb7a23ac4ebae6f70 100755 (executable)
--- 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 6dca37a1cbb8c6fac31ac6fad7cb1c7000b8aff3..3e3da200c9e325665505fb790480fe14f9741f71 100755 (executable)
--- 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 3838fa2232d9fd3ed6ead68a1f5172b546a8f957..b8a8aec2a940f1f04ca4ff2520baa7d9bde39331 100755 (executable)
--- 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 10630ddb69da474f52a954dae26526f30757e4e7..23ebcfc45517fcb681c286eefb8bb3fed6ba25ce 100755 (executable)
--- 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 8b2e3a51fc9f4e9fe3c053e05eebd0191310d675..e68c98cabc51d6710cbd176ec56ba924fb8e722b 100755 (executable)
--- 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 07c3ddf740a5c15936e7a125be29911d1db504b9..6ab4cd26c9a41d32172734be79b1ca3d3bf512b5 100755 (executable)
--- 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 9a793519b488caa4cf6dddc4bc66dd36b10e5295..c0a4da93ec03d27f46692448926422eac6ff14a9 100755 (executable)
--- 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 (executable)
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 (executable)
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 (file)
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 05bb5221e80f524979ba9511a284f1a8b54dbfd8..3bceab42b265babe07bec664ee6d3cf635610caa 100644 (file)
--- 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 daa2f936d386badb5cb344a03ad7fa52e2f92ec8..0635d32ee534adbc1b7c3351a84e14fd9174f240 100644 (file)
--- 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 f204e605379501f0c9eb86ddd639d8b0b692fa6d..ce56a68d8ddfb3fde7bdfecd064f48b806da141e 100755 (executable)
--- 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 6ac3a3a77b5341238a57d52c2ad10e06c8d3b0f8..a0b8131e970fd745b862d209f56302cce8d7cca2 100755 (executable)
--- 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;