changes to the command buttons, warnings, toggle of beam abort

diff --git a/.gitignore b/.gitignore
index c4aa9c49f2f52460b8059b32fdcfda2a223d50e7..1658b877b2d7bf82bc23984d5d25bfe867d2d670 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,5 @@ bit
 oldlogs
 oldscripts
 *.sav*
+threshold
+thr_trb3

diff --git a/control/gui/power/Ecal_Padiwa b/control/gui/power/Ecal_Padiwa
index 24cb76677963873d49dae97cbb44026f249d2f88..f5a136317677c3aa6c6c37ab884bca9781996d9a 100755 (executable)
--- a/control/gui/power/Ecal_Padiwa
+++ b/control/gui/power/Ecal_Padiwa
@@ -7,7 +7,9 @@ if [ $myvar == "256" ]; then exit; fi
 
 xterm  -e bash --login -c  '
   ssh hadaq@lxhadesdaqp "
-  source /home/hadaq/.bash_profile        
+  source /home/hadaq/.bash_profile       
+  echo Switch off trigger
+  timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400  
   echo \"Starting a ECal Padiwa Power-Cycle...\"
   cd /home/hadaq/hadesdaq/utils;
   PERLLIB=/home/hadaq/EPICS/EPICS-3.15.6/base/lib/perl ./ECAL_LV5_Powercycle.sh;

diff --git a/control/gui/power/Ecal_RPC b/control/gui/power/Ecal_RPC
index bfcbaee4d13c1a3a24f71a23a8e11aea951d3113..efa3dce738641ff824f5a6ea7c56e7290689602e 100755 (executable)
--- a/control/gui/power/Ecal_RPC
+++ b/control/gui/power/Ecal_RPC
@@ -1,14 +1,16 @@
 #!/bin/bash
 
-export myvar=$(doyoureallywant.pl "to powercycle the RPC/ECAL LV?")
+export myvar=$(doyoureallywant.pl "to powercycle the RPC/ECAL LV" "WARNING: Turn off the beam request in the back of the counting house before!")
 if [ $myvar == "256" ]; then exit; fi
 
 xterm  -e bash --login -c  '
   ssh hadaq@lxhadesdaqp "
-  source /home/hadaq/.bash_profile 
+  source /home/hadaq/.bash_profile
   echo Switch off beam abort
   ssh hadeswrp01 \"echo \"W3000000010\" >/dev/ttyUSB0\"
-  sleep .1       
+  sleep .1
+  echo Switch off trigger
+  timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
   echo \"Starting a RPC/ECAL power cycle...\"
   cd /home/hadaq/hadesdaq/utils;
   PERLLIB=/home/hadaq/EPICS/EPICS-3.15.6/base/lib/perl ./ECAL_Powercycle.pl;

diff --git a/control/gui/power/Hubs b/control/gui/power/Hubs
index 2c2c088358e9c4022d37379d21a9f6ce2e295d09..ed793254936646bed564d6752b412affea3271de 100755 (executable)
--- a/control/gui/power/Hubs
+++ b/control/gui/power/Hubs
@@ -5,7 +5,9 @@ if [ $myvar == "256" ]; then exit; fi
 
 xterm  -e bash --login -c  '
   ssh hadaq@lxhadesdaqp "
-  source /home/hadaq/.bash_profile        
+  source /home/hadaq/.bash_profile       
+  echo Switch off trigger
+  timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400  
   echo \"Starting a HUB-Power-Cycle...\"
   cd /home/hadaq/hadesdaq/utils;
   PERLLIB=/home/hadaq/EPICS/EPICS-3.15.6/base/lib/perl ./HUB_Powercycle.pl;

diff --git a/control/gui/power/MDC_LV b/control/gui/power/MDC_LV
index e2cb10173e2297d76b69716e0f0f6a8f188b6c13..e083853668ff4347aa38185e5f1fcad70260ac6d 100755 (executable)
--- a/control/gui/power/MDC_LV
+++ b/control/gui/power/MDC_LV
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 export myvar=$(doyoureallywant.pl "to make a MDC powercycle? There will be no further warnings!")
+# export myvar=$(doyoureallywant.pl "to make a MDC powercycle? There will be no further warnings!" "WARNING: Stop Trigger before doing power cyclces!")
 if [ $myvar == "256" ]; then exit; fi
 
 

diff --git a/control/gui/power/RICH b/control/gui/power/RICH
index 96820b3c7a4d3fcd58455823db9792eab0e44592..5618876a9f368a8025b0f069356ca9c35331ce4c 100755 (executable)
--- a/control/gui/power/RICH
+++ b/control/gui/power/RICH
@@ -6,6 +6,8 @@ if [ $myvar == "256" ]; then exit; fi
 xterm  -e bash --login -c  '
   ssh hadaq@lxhadesdaqp "
   source /home/hadaq/.bash_profile        
+  echo Switch off trigger
+  timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
   echo \"Starting a RICH power cycle...\"
   cd /home/hadaq/trbsoft/hadesdaq/utils;
   PERLLIB=/home/hadaq/EPICS/EPICS-3.15.6/base/lib/perl ./RICH_Powercycle.pl;

diff --git a/control/gui/power/Start b/control/gui/power/Start
index c08c6e543533dac2c5c138a319e1adc03aa620ca..06678af90516d6c4ebbe8ffb726371446ac6e90f 100755 (executable)
--- a/control/gui/power/Start
+++ b/control/gui/power/Start
@@ -7,6 +7,8 @@ if [ $myvar == "256" ]; then exit; fi
 xterm  -e bash --login -c  '
   ssh hadaq@lxhadesdaqp "
   source /home/hadaq/.bash_profile        
+  echo Switch off trigger
+  timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
   echo \"Starting a Start power cycle...\"
   cd /home/hadaq/hadesdaq/utils;
   bash Powercycle_Start.sh;

diff --git a/control/gui/power/TOF_MdcHub b/control/gui/power/TOF_MdcHub
index 544ef6ae8d0f1e5257f0572520acc0481a86b7c2..5d99a190c9d16c08a70a832c171727cf6396d443 100755 (executable)
--- a/control/gui/power/TOF_MdcHub
+++ b/control/gui/power/TOF_MdcHub
@@ -1,14 +1,16 @@
 #!/bin/bash
 
-export myvar=$(doyoureallywant.pl "to powercycle the MDC/TOF/Central LV?")
+export myvar=$(doyoureallywant.pl "to powercycle the MDC/TOF/Central LV" "WARNING: Turn off the beam request in the back of the counting house before!")
 if [ $myvar == "256" ]; then exit; fi
 
 xterm  -e bash --login -c  '
   ssh hadaq@lxhadesdaqp "
-  source /home/hadaq/.bash_profile        
+  source /home/hadaq/.bash_profile
   echo Switch off beam abort
   ssh hadeswrp01 \"echo \"W3000000010\" >/dev/ttyUSB0\"
-  sleep .1       
+  sleep .1
+  echo Switch off trigger
+  timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
   echo \"Starting a MDC/TOF/Central power cycle...\"
   cd /home/hadaq/hadesdaq/utils;
   PERLLIB=/home/hadaq/EPICS/EPICS-3.15.6/base/lib/perl ./MdcTofCentral_Powercycle.pl;

diff --git a/control/gui/power/Triggerbox_Beam b/control/gui/power/Triggerbox_Beam
index bf9779f671347dd1f4fe1418600f6b16f6664801..c9d1507451cf9eb5c1d0fcd9077c45467e11ab33 100755 (executable)
--- a/control/gui/power/Triggerbox_Beam
+++ b/control/gui/power/Triggerbox_Beam
@@ -1,14 +1,20 @@
 #!/bin/bash
 
-export myvar=$(doyoureallywant.pl "to powercycle the Triggerbox and Beam Monitoring?")
+export myvar=$(doyoureallywant.pl "to powercycle the Triggerbox and Beam Monitoring" "WARNING: Turn off the beam request in the back of the counting house before!")
 if [ $myvar == "256" ]; then exit; fi
 
+# export myvar=$(zenity --warning --title=\"Beam Control\" --text=\"Switch off beam first!\" --height=10 --width=100)
+# if [ $myvar == "256" ]; then exit; fi
+
+
 xterm  -e bash --login -c  '
   ssh hadaq@lxhadesdaqp "
-  source /home/hadaq/.bash_profile  
+  source /home/hadaq/.bash_profile
   echo Switch off beam abort
   ssh hadeswrp01 \"echo \"W3000000010\" >/dev/ttyUSB0\"
-  sleep .1      
+  sleep .1
+  echo Switch off trigger
+  timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
   echo \"Starting a power cycle of Triggerbox and Beam Monitoring...\"
   cd /home/hadaq/hadesdaq/utils;
   bash Powercycle_Trigger.sh;

diff --git a/control/gui/power/Wall b/control/gui/power/Wall
index a5256a97c4db91df9c3cda1570a8aa54104ff455..93312c4ff0b9335ae098bbb55ab7ac95b0922021 100755 (executable)
--- a/control/gui/power/Wall
+++ b/control/gui/power/Wall
@@ -7,6 +7,8 @@ if [ $myvar == "256" ]; then exit; fi
 xterm  -e bash --login -c  '
   ssh hadaq@lxhadesdaqp "
   source /home/hadaq/.bash_profile        
+  echo Switch off trigger
+  timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
   echo \"Starting a Wall power cycle...\"
   cd /home/hadaq/hadesdaq/utils;
   PERLLIB=$EPICS_BASE/lib/perl ./Wall_Powercycle.pl;

diff --git a/control/gui/reboot/10_Quite-A-Lot b/control/gui/reboot/10_Quite-A-Lot
index 45ee7e7c4dda7246344e4f054c80eb774b0fbbe2..27849c88c878815e0c7251b4fd8ec1db25955a4a 100755 (executable)
--- a/control/gui/reboot/10_Quite-A-Lot
+++ b/control/gui/reboot/10_Quite-A-Lot
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot TOF, FW, RICH, RPC, ECAL and Start boards ")
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot TOF, FW, RICH, RPC, ECAL and Start boards") #"WARNING: Turn off the beam request in the back of the counting house before!")
 if [ $myvar == "256" ]; then exit; fi
 
 notifyall.sh "DAQ" "<I> The boards of TOF, FW, RICH, RPC, ECAL and Start are going to be rebooted." "STARTUP" &
@@ -10,13 +10,18 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   source /home/hadaq/.bash_profile
   echo Switch off trigger
   timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
+  echo Mute DAQi
+  ssh hadaq@hadesp33 \"killall -USR1 speakdaemon.pl\"
+#  echo Switch off beam abort
+#  ssh hadeswrp01 \"echo \"W3000000010\" >/dev/ttyUSB0\"
+#  sleep .1
 
   cd ~/trbsoft/trbnettools/binlocal
 
   echo \"This does not include MDC, Extra Boards, Hubs, CTS!\"
 
-  
-  
+
+
 echo TOF FW
 for TRB3_SERVER in  trbp088 trbp263 trbp006 trbp262 trbp265 trbp242 trbp074 trbp267 trbp266;
   do
@@ -24,29 +29,26 @@ for TRB3_SERVER in  trbp088 trbp263 trbp006 trbp262 trbp265 trbp242 trbp074 trbp
     TRB3_SERVER=\$TRB3_SERVER ./trbcmd reload 0xffff
   done
 
-echo RICH  
+echo RICH
 for TRB3_SERVER in  trb3sc136 trb3sc158 trb3sc144 trb3sc139 trb3sc163 trb3sc153 trb3sc164 trb3sc166 trb3sc137 trb3sc138 trb3sc162 trb3sc141;
   do
     ping \$TRB3_SERVER -c 1 -w 1  >/dev/null 2>&1 || echo \"ERROR contacting \$TRB3_SERVER\"
-    TRB3_SERVER=\$TRB3_SERVER ./trbcmd reload 0xfe51  #to prevent a race condition between reset issued by combiner and Dirich not rebooting afterwards
-    TRB3_SERVER=\$TRB3_SERVER ./trbcmd reload 0xffff
+    TRB3_SERVER=\$TRB3_SERVER timeout 1s ./trbcmd reload 0xfe51  #to prevent a race condition between reset issued by combiner and Dirich not rebooting afterwards
+    TRB3_SERVER=\$TRB3_SERVER timeout 1s ./trbcmd reload 0xffff
     sleep .3
   done
 
-  
+
 echo RPC
-  echo Switch off beam abort
-  ssh hadeswrp01 \"echo \"W3000000010\" >/dev/ttyUSB0\"
-  sleep .1       
 for TRB3_SERVER in  trb3sc317 trb3sc319 trb3sc320 trb3sc315 trb3sc318 trb3sc316;
   do
     ping \$TRB3_SERVER -c 1 -w 1  >/dev/null 2>&1 || echo \"ERROR contacting \$TRB3_SERVER\"
     TRB3_SERVER=\$TRB3_SERVER ./trbcmd reload 0xffff
     sleep .3
-  done  
-  
-sleep 2  
-  
+  done
+
+sleep 2
+
 echo ECal
 for TRB3_SERVER in  trb3sc134 trb3sc009 trb3sc130 trb3sc128 trb3sc131 trb3sc129 ;
   do
@@ -55,16 +57,16 @@ for TRB3_SERVER in  trb3sc134 trb3sc009 trb3sc130 trb3sc128 trb3sc131 trb3sc129
     sleep .3
   done
 
-  
-  
-echo Start  
+
+
+echo Start
 for TRB3_SERVER in  trb3sc438;
   do
     ping \$TRB3_SERVER -c 1 -w 1  >/dev/null 2>&1 || echo \"ERROR contacting \$TRB3_SERVER\"
     TRB3_SERVER=\$TRB3_SERVER ./trbcmd reload 0xffff
-  done  
-  
-  
+  done
+
+
   echo \"Done   - Check for Error messages above, then do a DAQ restart!\"
   sleep 10
   "

diff --git a/control/gui/reboot/30_Ecal b/control/gui/reboot/30_Ecal
index 2fb27fa879e93dc5a7471f9e1976082a54c5a52f..43373d31cb8346b335f1b1d90d6d0807359a0240 100755 (executable)
--- a/control/gui/reboot/30_Ecal
+++ b/control/gui/reboot/30_Ecal
@@ -13,14 +13,14 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   echo Switch off trigger
   timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
 #  trbcmd reload 0xfe71
-  trbcmd reload 0x120
+  timeout 1s trbcmd reload 0x120
 
 cd ~/trbsoft/trbnettools/binlocal
 
 for TRB3_SERVER in  trb3sc134 trb3sc009 trb3sc130 trb3sc128 trb3sc131 trb3sc129 ;
   do
     ping \$TRB3_SERVER -c 1 -w 1  >/dev/null 2>&1 || echo \"ERROR contacting \$TRB3_SERVER\"
-    TRB3_SERVER=\$TRB3_SERVER ./trbcmd reload 0xffff
+    TRB3_SERVER=\$TRB3_SERVER timeout 1s  ./trbcmd reload 0xffff
     sleep .6
   done
 

diff --git a/control/gui/reboot/30_Extra_Boards b/control/gui/reboot/30_Extra_Boards
index 901c0721db35098eb26083e259f26f7924e47fc1..a331d6bbb4f003d927980a19ae149a87b815e3eb 100755 (executable)
--- a/control/gui/reboot/30_Extra_Boards
+++ b/control/gui/reboot/30_Extra_Boards
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot auxiliary boards in the system")
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot auxiliary boards in the system" "WARNING: Turn off the beam request in the back of the counting house before!")
 if [ $myvar == "256" ]; then exit; fi
 
 notifyall.sh "DAQ" "<I> Auxiliary boards are going to be rebooted." "STARTUP" &
@@ -10,6 +10,9 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   source /home/hadaq/.bash_profile
   echo Switch off trigger
   timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
+  echo Switch off beam abort
+  ssh hadeswrp01 \"echo \"W3000000010\" >/dev/ttyUSB0\"
+  sleep .1
 
 #  trbcmd reload 0x8d00
   trbcmd reload 0x0010

diff --git a/control/gui/reboot/30_Hubs b/control/gui/reboot/30_Hubs
index 002274af8f7bc56212da48e41688ea0e8b12d56e..e26f37fc16bec389deca61009b848bc9332dd03b 100755 (executable)
--- a/control/gui/reboot/30_Hubs
+++ b/control/gui/reboot/30_Hubs
@@ -11,18 +11,19 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   echo Switch off trigger
   timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
 #  trbcmd reload 0xfffe
-
-trbcmd reload 0x8011
-trbcmd reload 0x8013
-trbcmd reload 0x8014
-trbcmd reload 0x8015
-trbcmd reload 0x8016
-trbcmd reload 0x8017
-trbcmd reload 0x8018
+# trbcmd reload 0x8011
+# trbcmd reload 0x8013
+# trbcmd reload 0x8014
+# trbcmd reload 0x8015
+# trbcmd reload 0x8016
+# trbcmd reload 0x8017
+# trbcmd reload 0x8018
 
 trbcmd reload 0x8800
 trbcmd reload 0x8810
 
+trbcmd reload 0xfe65
+
 trbcmd reload 0x8000
     echo Done
 

diff --git a/control/gui/reboot/30_MDC_OEP b/control/gui/reboot/30_MDC_OEP
index 4cc9d6c2cca42c680cc53ce75300e21d59f39025..d418dbf7c86ab4895e6e40f76021c521c4662820 100755 (executable)
--- a/control/gui/reboot/30_MDC_OEP
+++ b/control/gui/reboot/30_MDC_OEP
@@ -6,9 +6,12 @@ if [ $myvar == "256" ]; then exit; fi
 notifyall.sh "DAQ" "<I> OEPs are going to be rebooted." "STARTUP" &
 
 xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
+  ssh hadaq@lxhadesdaqp "
+  source /home/hadaq/.bash_profile
   echo Switch off trigger
   timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
   ~/bin/rebootoep_x11.sh
+  "
   sleep 2
 '
 

diff --git a/control/gui/reboot/30_RICH b/control/gui/reboot/30_RICH
index aee7be010ae3b4e6b3f6505b1a502f993211cd31..389038eb10fcd233f46b1d9ad2331ea00367027b 100755 (executable)
--- a/control/gui/reboot/30_RICH
+++ b/control/gui/reboot/30_RICH
@@ -18,8 +18,8 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
 for TRB3_SERVER in  trb3sc136 trb3sc158 trb3sc144 trb3sc139 trb3sc163 trb3sc153 trb3sc164 trb3sc166 trb3sc137 trb3sc138 trb3sc162 trb3sc141;
   do
     ping \$TRB3_SERVER -c 1 -w 1  >/dev/null 2>&1 || echo \"ERROR contacting \$TRB3_SERVER\"
-    TRB3_SERVER=\$TRB3_SERVER ./trbcmd reload 0xfe51  #to prevent a race condition between reset issued by combiner and Dirich not rebooting afterwards
-    TRB3_SERVER=\$TRB3_SERVER ./trbcmd reload 0xffff
+    TRB3_SERVER=\$TRB3_SERVER timeout 1s  ./trbcmd reload 0xfe51  #to prevent a race condition between reset issued by combiner and Dirich not rebooting afterwards
+    TRB3_SERVER=\$TRB3_SERVER timeout 1s  ./trbcmd reload 0xffff
     sleep .6
   done
 

diff --git a/control/gui/reboot/30_RPC b/control/gui/reboot/30_RPC
index d6480cacada57a323cbba6f61f06d6ce6ef1db54..2184560c779c63250579c63cf9335b2930d009e1 100755 (executable)
--- a/control/gui/reboot/30_RPC
+++ b/control/gui/reboot/30_RPC
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot RPC boards in the system")
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot RPC boards in the system") #"WARNING: Turn off the beam request in the back of the counting house before!")
 if [ $myvar == "256" ]; then exit; fi
 
 notifyall.sh "DAQ" "<I> The RPC boards are going to be rebooted." "STARTUP" &
@@ -9,19 +9,19 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   ssh hadaq@lxhadesdaqp "
   source /home/hadaq/.bash_profile
   echo Switch off trigger
-  timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
-  echo Switch off beam abort
-  ssh hadeswrp01 \"echo \"W3000000010\" >/dev/ttyUSB0\"
-  sleep .1       
+  timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400
+#  echo Switch off beam abort
+#  ssh hadeswrp01 \"echo \"W3000000010\" >/dev/ttyUSB0\"
+#  sleep .1
   cd ~/trbsoft/trbnettools/binlocal
-  
+
 for TRB3_SERVER in  trb3sc317 trb3sc319 trb3sc320 trb3sc315 trb3sc318 trb3sc316;
   do
     ping \$TRB3_SERVER -c 1 -w 1  >/dev/null 2>&1 || echo \"ERROR contacting \$TRB3_SERVER\"
-    TRB3_SERVER=\$TRB3_SERVER ./trbcmd reload 0xffff
+    TRB3_SERVER=\$TRB3_SERVER timeout 1s ./trbcmd reload 0xffff
     sleep .6
-  done  
-  
+  done
+
 # TRB3_SERVER=trb3sc317 ./trbcmd reload 0xffff
 # TRB3_SERVER=trb3sc319 ./trbcmd reload 0xffff
 # TRB3_SERVER=trb3sc320 ./trbcmd reload 0xffff

diff --git a/control/gui/reboot/30_Start b/control/gui/reboot/30_Start
index 59cbacc4d36cbe1b9640938cabbdfe7246318644..ed10108b4ca70e97f795c755834fccfcc5b74857 100755 (executable)
--- a/control/gui/reboot/30_Start
+++ b/control/gui/reboot/30_Start
@@ -15,7 +15,7 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
 for TRB3_SERVER in  trb3sc438;
   do
     ping \$TRB3_SERVER -c 1 -w 1  >/dev/null 2>&1 || echo \"ERROR contacting \$TRB3_SERVER\"
-    TRB3_SERVER=\$TRB3_SERVER ./trbcmd reload 0xffff
+    TRB3_SERVER=\$TRB3_SERVER timeout 1s ./trbcmd reload 0xffff
   done  
   
   echo \"Done   - Check for Error messages above, then do a DAQ restart!\"

diff --git a/control/gui/reboot/30_TOF_Wall b/control/gui/reboot/30_TOF_Wall
index 94045701bcaa4613242d8a9616d4e97928d56c14..16b225455121324cc82ce0f982fae2c4f1f48f84 100755 (executable)
--- a/control/gui/reboot/30_TOF_Wall
+++ b/control/gui/reboot/30_TOF_Wall
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot TOF and FW ")
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot TOF and FW") #"WARNING: Turn off the beam request in the back of the counting house before!")
 if [ $myvar == "256" ]; then exit; fi
 
 notifyall.sh "DAQ" "<I> The boards of TOF and FW are going to be rebooted." "STARTUP" &
@@ -11,18 +11,22 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   echo Switch off trigger
   timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
   cd ~/trbsoft/trbnettools/binlocal
+#  echo Switch off beam abort
+#  ssh hadeswrp01 \"echo \"W3000000010\" >/dev/ttyUSB0\"
+#  sleep .1
 
-
-
+#   echo \"Trying reload via TrbNet\"
+#   timeout .2s trbcmd reload 0xfe47
+#   timeout .2s trbcmd reload 0xfe40
 
 for TRB3_SERVER in  trbp088 trbp263 trbp006 trbp262 trbp265 trbp242 trbp074 trbp267 trbp266;
   do
     ping \$TRB3_SERVER -c 1 -w 1  >/dev/null 2>&1 || echo \"ERROR contacting \$TRB3_SERVER\"
-    TRB3_SERVER=\$TRB3_SERVER ./trbcmd reload 0xffff
+    TRB3_SERVER=\$TRB3_SERVER timeout 1s ./trbcmd reload 0xffff
     sleep .3
   done
 
-
+  
 
   echo \"Done   - Check for Error messages above, then do a DAQ restart!\"
   sleep 10

diff --git a/control/gui/reboot/90_Reprogram_CTS b/control/gui/reboot/90_Reprogram_CTS
index 7ade4bb2bea127f202800e2885a47cd4bcf88181..ce23408b977a80c64ec60d0b5d221f893e211c70 100755 (executable)
--- a/control/gui/reboot/90_Reprogram_CTS
+++ b/control/gui/reboot/90_Reprogram_CTS
@@ -8,8 +8,6 @@ killall logerrors.pl
 
 notifyall.sh "DAQ" "<I> FPGA are being reprogrammed." "STARTUP" &
 
-timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 # Switch off trigger
-
 xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   ssh -X hadaq@lxhadesdaqp "
   source /home/hadaq/.bash_profile
@@ -17,9 +15,10 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   timeout 1s trbcmd setbit 0x0003 0xa0c0 0x400 
   cd ~/trbsoft/hadesdaq/main/
   ./startup.pl -f main_hades.script -o file  -m TOF -m RPC -m WALL -m RICH -m STARTCTS -m MDC -m MDCDATASET --eb off
+  echo \"Done. Start DAQ!\"
   #echo \"First config run\"
   #bash startup_briccolage.sh
   "
 '
-notifyall.sh "DAQ" "<I> FPGA have been programmed and DAQ is started." "STARTUP" &
+notifyall.sh "DAQ" "<I> FPGA have been programmed." "STARTUP" &
 

diff --git a/control/gui/settings/RPC_Thrs b/control/gui/settings/RPC_Thrs
index 1a2aefbf8fc981a385f9d8db22daf78bada6c3e6..da85004a7fef4e98a638fe8fb79e07bb1562233c 100755 (executable)
--- a/control/gui/settings/RPC_Thrs
+++ b/control/gui/settings/RPC_Thrs
@@ -5,11 +5,11 @@ xterm -geometry 80x24 -bg orange -fg black -e bash -c '
   export DAQOPSERVER=hadesp31
   echo Reloading RPC thresholds
   cd /home/hadaq/trbsoft/hadesdaq/rpc/
-  /home/hadaq/trbsoft/daq/rpc/trb3sc/thresholds/resetThresholdAllJan.sh
+  /home/hadaq/trbsoft/daq/rpc/trb3sc/thresholds/setThresholdAllJan.sh
   /home/hadaq/trbsoft/daq/rpc/setAllMultBoard.sh
-  echo Reloading fRPC thresholds
-  cd /home/hadaq/trbsoft/hadesdaq/frpc/
-  /home/hadaq/trbsoft/daq/frpc/setThreshold.sh
+  #echo Reloading fRPC thresholds
+  #cd /home/hadaq/trbsoft/hadesdaq/frpc/
+  #/home/hadaq/trbsoft/daq/frpc/setThreshold.sh
   echo Done
   sleep 5
 '

diff --git a/hmon/daqi.png b/hmon/daqi.png
new file mode 100644 (file)
index 0000000..709a48b
Binary files /dev/null and b/hmon/daqi.png differ

diff --git a/hmon/doc/rate-veto.htt b/hmon/doc/rate-veto.htt
new file mode 100644 (file)
index 0000000..195ecb5
--- /dev/null
+++ b/hmon/doc/rate-veto.htt
@@ -0,0 +1,9 @@
+<h3>VETO hit rate</h3>
+<p>
+This button shows the rate of hits on VETO.
+</p>
+<h4>Error Handling </h4>
+
+<dl>
+This button should not become red - If it does: RUN!
+</dl>

diff --git a/utils/move_doublecpu_irq.sh b/utils/old/move_doublecpu_irq.sh
similarity index 100%
rename from utils/move_doublecpu_irq.sh
rename to utils/old/move_doublecpu_irq.sh

diff --git a/utils/move_doublecpu_irq_old.sh b/utils/old/move_doublecpu_irq_old.sh
similarity index 100%
rename from utils/move_doublecpu_irq_old.sh
rename to utils/old/move_doublecpu_irq_old.sh

diff --git a/utils/odroid_HMP_Powercycle.sh b/utils/old/odroid_HMP_Powercycle.sh
similarity index 100%
rename from utils/odroid_HMP_Powercycle.sh
rename to utils/old/odroid_HMP_Powercycle.sh