Changed paths to match new sctrl server

diff --git a/control/gui/call_programs_local.sh b/control/gui/call_programs_local.sh
index 0eeacd29c82bcf57b31036488561822cbbabf977..45cfbe1d46b71103622f0decbaa79728dfffaea9 100755 (executable)
--- a/control/gui/call_programs_local.sh
+++ b/control/gui/call_programs_local.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-cd /home/hadaq/trbsoft/hadesdaq/control/gui/
-/home/hadaq/trbsoft/hadesdaq/control/gui/call_programs2.pl -geometry -0-0 &
+#cd /home/hadaq/trbsoft/hadesdaq/control/gui/
+/home/hadaq/trbsoft/hadesdaq/control/gui/call_programs_wrapper.sh -geometry -0-0 &
 
 #cd /home/hadaq/trbsoft/daq/control/gui/
 #/home/hadaq/trbsoft/daq/control/gui/call_programs.pl -geometry -0-0

diff --git a/control/gui/call_programs_wrapper.sh b/control/gui/call_programs_wrapper.sh
index 6e10c775e56737d32d87a1cbc2e402323ad6d4c5..7b2025265c5ac99999b456b1cb3fa249b618f4c8 100755 (executable)
--- a/control/gui/call_programs_wrapper.sh
+++ b/control/gui/call_programs_wrapper.sh
@@ -1,5 +1,4 @@
-ssh -X hadesdaq02 "cd /home/hadaq/trbsoft/hadesdaq/control/gui/
-/home/hadaq/trbsoft/hadesdaq/control/gui/call_programs2.pl -geometry -0-0" &
+ssh -X lxhadeb06 "cd /home/hadaq/trbsoft/hadesdaq/control/gui/;/home/hadaq/trbsoft/hadesdaq/control/gui/call_programs2.pl -geometry -0-0" 
 
 #cd /home/hadaq/trbsoft/daq/control/gui/
 #/home/hadaq/trbsoft/daq/control/gui/call_programs.pl -geometry -0-0

diff --git a/control/gui/daq/10_Start_DAQ b/control/gui/daq/10_Start_DAQ
index 4d716acf33683d5731d0deebec37938ea1da1b43..363c6117db60b068a40a5bf0116aede3405b70c4 100755 (executable)
--- a/control/gui/daq/10_Start_DAQ
+++ b/control/gui/daq/10_Start_DAQ
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export myvar=$(doyoureallywant.pl "to restart the DAQ")
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "restart the DAQ")
 if [ $myvar == "256" ]; then exit; fi
 
 #notifyall.sh "DAQ" "<I> DAQ is going to be restarted." "STARTUP" &

diff --git a/control/gui/daq/20_Reprogram_FPGA b/control/gui/daq/20_Reprogram_FPGA
index dd2cc1d6043f7510db84c371b8a145a9c418caaa..151cc72c1041943eb08cb0e84c7c4734451faa5a 100755 (executable)
--- a/control/gui/daq/20_Reprogram_FPGA
+++ b/control/gui/daq/20_Reprogram_FPGA
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export myvar=$(doyoureallywant.pl "to reprogramm the FPGAs")
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl " reprogramm the FPGAs")
 
 if [ $myvar == "256" ]; then exit; fi
 

diff --git a/control/gui/daq/30_Reboot_OEP b/control/gui/daq/30_Reboot_OEP
index 7b47d1d169432ba7e5afce0ffe7b75ed9360f609..ce73397195c75e9200d763ce01909045e93516b6 100755 (executable)
--- a/control/gui/daq/30_Reboot_OEP
+++ b/control/gui/daq/30_Reboot_OEP
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export myvar=$(doyoureallywant.pl "to reboot the MDC-OEPs")
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl " reboot the MDC-OEPs")
 if [ $myvar == "256" ]; then exit; fi
 
 

diff --git a/control/gui/daq/35_Reboot_MDCHub b/control/gui/daq/35_Reboot_MDCHub
index 48824cd7576db32d16f5cee7828579316637dde9..a0d709c4a08fd97069921438215c6838ed566f6e 100755 (executable)
--- a/control/gui/daq/35_Reboot_MDCHub
+++ b/control/gui/daq/35_Reboot_MDCHub
@@ -4,7 +4,7 @@
 #  echo ping
 #  /home/hadaq/bin/command_client.pl -e etraxp023 -c '
 
-export myvar=$(doyoureallywant.pl "to reboot the MDC-Hubs")
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl " reboot the MDC-Hubs")
 if [ $myvar == "256" ]; then exit; fi
 
 trbcmd reset

diff --git a/control/gui/eb/10_Restart_EB b/control/gui/eb/10_Restart_EB
index 52a4358f0b2965b357b99c55f45fe85f24ed2b30..241b360fec798fbf75b8fc3625c175121edea1df 100755 (executable)
--- a/control/gui/eb/10_Restart_EB
+++ b/control/gui/eb/10_Restart_EB
@@ -1,5 +1,5 @@
 #!/bin/bash
-notifyall.sh "DAQ" "<I> Eventbuilders are being restarted." "EB" &
+#/home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders are being restarted." "EB" &
 
 ssh -X hadaq@lxhadesdaq "
  xterm -geometry 80x24 -bg orange -fg black -e bash -c '
@@ -10,5 +10,5 @@ ssh -X hadaq@lxhadesdaq "
   ./start_eb_gbe.sh
   '
  "
-notifyall.sh "DAQ" "<I> Eventbuilders have been restarted with last prefix" "EB" &
+/home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been restarted with last prefix" "EB" &
 

diff --git a/control/gui/eb/20_____Stop_EB b/control/gui/eb/20_____Stop_EB
index 274bf3a5120e5fbdc65bbf9172c03fefb76319c4..4846ee73f122278f277b89747a3d4523cc306f55 100755 (executable)
--- a/control/gui/eb/20_____Stop_EB
+++ b/control/gui/eb/20_____Stop_EB
@@ -9,4 +9,4 @@ ssh -X hadaq@lxhadesdaq "
   ./start_eb_gbe.pl -e stop -n 1-16
   '
  "
-notifyall.sh "DAQ" "<I> Eventbuilders have been stopped" "EB" &
+/home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been stopped" "EB" &

diff --git a/control/gui/eb/29_Prefix_Be b/control/gui/eb/29_Prefix_Be
index b3913159cf7122e365218a16c3b9ad20d0954b0e..82faba31708a6b7e9376d5f86bae505aab4b77ee 100755 (executable)
--- a/control/gui/eb/29_Prefix_Be
+++ b/control/gui/eb/29_Prefix_Be
@@ -10,6 +10,6 @@ ssh -X hadaq@lxhadesdaq "
   ./start_eb_gbe.pl -e restart -n 1-16 -d on -p be
   '
  "
-notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing beam files." "EB" &
+/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 a5e423d7245612edbb06844bce7dc8f4ab5f1967..c4843c670c2c3e09165f2c34657c7ae59ad246c7 100755 (executable)
--- a/control/gui/eb/30_Prefix_NoFile
+++ b/control/gui/eb/30_Prefix_NoFile
@@ -9,5 +9,5 @@ ssh -X hadaq@lxhadesdaq "
   ./start_eb_gbe.pl -e restart -n 1-16 -d off -p '--'
  '
 "
-notifyall.sh "DAQ" "<I> Eventbuilders have been started. NO FILES are being written" "EB" &
+/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 3be97c70e7d15900533a357fe46a1dc8803e52e6..eb2d9e4b6ce692b5bbfceac2f78645b58ee42759 100755 (executable)
--- a/control/gui/eb/40_Prefix_Te
+++ b/control/gui/eb/40_Prefix_Te
@@ -9,5 +9,5 @@ ssh -X hadaq@lxhadesdaq "
   ./start_eb_gbe.pl -e restart -n 1-16 -d on -p te
   '
  "
-notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing test files" "EB" &
+/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 cd227afb04c3cd8c15f7670b5bde4892c31961ec..c5c52cda018717ec4719810c05e83d66dfe5fea2 100755 (executable)
--- a/control/gui/eb/50_Prefix_Co
+++ b/control/gui/eb/50_Prefix_Co
@@ -9,5 +9,5 @@ ssh -X hadaq@lxhadesdaq "
   ./start_eb_gbe.pl -e restart -n 1-16 -d on -p co
   '
  "
-notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing Cosmics Files" "EB" &
+/home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing Cosmics Files" "EB" &
 

diff --git a/control/gui/eb/70_Prefix_Ri b/control/gui/eb/70_Prefix_Ri
index 0c887231741bae8f53eac903e594389392cb9e1c..6dca37a1cbb8c6fac31ac6fad7cb1c7000b8aff3 100755 (executable)
--- a/control/gui/eb/70_Prefix_Ri
+++ b/control/gui/eb/70_Prefix_Ri
@@ -9,5 +9,5 @@ ssh -X hadaq@lxhadesdaq "
   ./start_eb_gbe.pl -e restart -n 1-16 -d on -p ri
   '
  "
-notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing RICH Files" "EB" &
+/home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing RICH Files" "EB" &
 

diff --git a/control/gui/eb/80_Prefix_St b/control/gui/eb/80_Prefix_St
index 0415e6ffc2b3a3b01327aef23c61c90576c605a1..10630ddb69da474f52a954dae26526f30757e4e7 100755 (executable)
--- a/control/gui/eb/80_Prefix_St
+++ b/control/gui/eb/80_Prefix_St
@@ -7,5 +7,5 @@ ssh -X hadaq@lxhadesdaq "
   ./start_eb_gbe.pl -e restart -n 1-16 -d on -p st
   '
  "
-notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing START Files" "EB"&
+/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 2b2b4ab7d24bff7ee4e6e89566ea57962ca48a9e..8b2e3a51fc9f4e9fe3c053e05eebd0191310d675 100755 (executable)
--- a/control/gui/eb/90_Prefix_Md
+++ b/control/gui/eb/90_Prefix_Md
@@ -7,5 +7,5 @@ ssh -X hadaq@lxhadesdaq "
   ./start_eb_gbe.pl -e restart -n 1-16 -d on -p md
   '
  "
-notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing MDC Files" "EB"&
+/home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing MDC Files" "EB"&
 

diff --git a/control/gui/eb/99_Prefix_Pt b/control/gui/eb/99_Prefix_Pt
index adf6813f738ef7c0faac76b6fa207fb1cce18381..9a793519b488caa4cf6dddc4bc66dd36b10e5295 100755 (executable)
--- a/control/gui/eb/99_Prefix_Pt
+++ b/control/gui/eb/99_Prefix_Pt
@@ -9,5 +9,5 @@ ssh -X hadaq@lxhadesdaq "
   ./start_eb_gbe.pl -e restart -n 1-16 -d on -p pt
   '
  "
-notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing test files" "EB" &
+/home/hadaq/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" "<I> Eventbuilders have been started. Writing PionTracker pt files" "EB" &
 

diff --git a/control/gui/monitor/10_CTS_Mon b/control/gui/monitor/10_CTS_Mon
index 48275332c1a403f8ba27b0fd4feedf880cc05946..0bd28a602418002b05bcb1714725776ba29935a6 100755 (executable)
--- a/control/gui/monitor/10_CTS_Mon
+++ b/control/gui/monitor/10_CTS_Mon
@@ -5,7 +5,7 @@
 #notifyall.sh "DAQ" "<I> DAQ is going to be restarted." "STARTUP" &
 
 #xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
-#   ssh -X hadaq@hadesdaq02 "
+#   ssh -X hadaq@lxhadeb06 "
   source /home/hadaq/.bashrc
   export DAQOPSERVER=hadesp31
   cd /home/hadaq/trbsoft/hadesdaq/control/ctsmon

diff --git a/control/gui/monitor/28_Epics b/control/gui/monitor/28_Epics
index 688b615c59a943fd62ed379309095d5694801436..b5dbd9349b4d26e8e3ec54fb569384df37267d4d 100755 (executable)
--- a/control/gui/monitor/28_Epics
+++ b/control/gui/monitor/28_Epics
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-ssh -X -l scs hadesdaq02 '. /home/scs/.profile; medm -x hades.adl' 
+#ssh -X -l scs lxhadeb06 '. /home/scs/.profile; medm -x hades.adl' 
+export EPICS_CA_ADDR_LIST="192.168.103.255 hadsc1 e7had2"; export EPICS_CA_AUTO_ADDR_LIST=NO; /home/epics/EPICS/EPICS-3.14.12.4/extensions/bin/linux-x86_64/medm -x /home/scs/operator/hades.adl &

diff --git a/control/gui/monitor/30_Epics_EB b/control/gui/monitor/30_Epics_EB
index 5a0bd8d6462c65dc15255d7d98204f2e5b13a36b..ed9b9b7c500ebb3bcccf09f58f390555972b2041 100755 (executable)
--- a/control/gui/monitor/30_Epics_EB
+++ b/control/gui/monitor/30_Epics_EB
@@ -1,2 +1,3 @@
 #!/bin/bash
-ssh -X scs@hadesdaq02  'export EPICS_CA_ADDR_LIST=192.168.103.255; export EPICS_CA_AUTO_ADDR_LIST=NO; /home/scs/epics/extensions/bin/linux-x86/medm -x -macro "SUBSYSNUM=24" ~/operator/ebmainctrl.adl'
+#ssh -X scs@lxhadeb06  'export EPICS_CA_ADDR_LIST=192.168.103.255; export EPICS_CA_AUTO_ADDR_LIST=NO; /home/epics/EPICS/EPICS-3.14.12.4/extensions/bin/linux-x86_64/medm -x -macro "SUBSYSNUM=24" ~/operator/ebmainctrl.adl'
+export EPICS_CA_ADDR_LIST=192.168.103.255; export EPICS_CA_AUTO_ADDR_LIST=NO; /home/epics/EPICS/EPICS-3.14.12.4/extensions/bin/linux-x86_64/medm -x -macro "SUBSYSNUM=24" /home/scs/operator/ebmainctrl.adl &

diff --git a/utils/move_doublecpu_irq.sh b/utils/move_doublecpu_irq.sh
index 5e4aa12dc452d336f69091e086a781f2b14c3d15..71442b84cf6829fadcf83c7041cbfe56a81e7834 100755 (executable)
--- a/utils/move_doublecpu_irq.sh
+++ b/utils/move_doublecpu_irq.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 # JAM moved actual setting of interrupt affinities to scripts on target machines
-#ssh root@lxhadeb01 '/root/bin/set_eth_affinity.sh'
 ssh root@lxhadeb02 '/root/bin/set_eth_affinity.sh'
 ssh root@lxhadeb03 '/root/bin/set_eth_affinity.sh'
 ssh root@lxhadeb04 '/root/bin/set_eth_affinity.sh'
-ssh root@lxhadeb05 '/root/bin/set_eth_affinity_lxhadeb05.sh'
+ssh root@lxhadeb05 '/usr/bin/perl -w /root/bin/set_eth_affinity_lxhadeb05.pl'
+#ssh root@lxhadeb05 '/root/bin/set_eth_affinity_lxhadeb05.sh'
 

diff --git a/utils/move_doublecpu_irq_old.sh b/utils/move_doublecpu_irq_old.sh
new file mode 100755 (executable)
index 0000000..f2f06e8
--- /dev/null
+++ b/utils/move_doublecpu_irq_old.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#ssh root@lxhadeb01 'echo 000000 > /proc/irq/1272/smp_affinity'
+ssh root@lxhadeb02 'echo c > /proc/irq/1272/smp_affinity'
+ssh root@lxhadeb03 'echo c > /proc/irq/1272/smp_affinity'
+ssh root@lxhadeb04 'echo c > /proc/irq/1272/smp_affinity'
+#ssh root@lxhadeb05 'echo 0c > /proc/irq/31/smp_affinity;echo 03 > /proc/irq/32/smp_affinity;echo 03 > /proc/irq/33/smp_affinity;'
+ssh root@lxhadeb05 'echo 0c > /proc/irq/77/smp_affinity;echo 03 > /proc/irq/78/smp_affinity;echo 03 > /proc/irq/79/smp_affinity;'
+# todo- will go up to irq/100 JAM
+#ssh root@lxhadeb05 'echo 030 > /proc/irq/46/smp_affinity;echo 0c0 > /proc/irq/47/smp_affinity;echo 300 > /proc/irq/48/smp_affinity;echo c00 > /proc/irq/49/smp_affinity;'
+

diff --git a/utils/notifyall.sh b/utils/notifyall.sh
index fb2e017438712fb2376e05b18e3c06b94bc65924..5d47633cb90af76a0d7199ba3ab8fd8292700a35 100755 (executable)
--- a/utils/notifyall.sh
+++ b/utils/notifyall.sh
@@ -3,6 +3,7 @@ ssh -X hadaq@hadesdaq01  " kdialog -display :0 --title '$1' --passivepopup '$3:
 #ssh -X hadaq@hadesdaq01  " kdialog -display :50 --title '$1' --passivepopup '$3:    $2' 12 " &
 ssh -X hadaq@hadesdaq02  " kdialog -display :0 --title '$1' --passivepopup '$3:    $2' 12 "  2>/dev/null 1>/dev/null&
 ssh -X hadaq@hades30     " kdialog -display :0 --title '$1' --passivepopup '$3:    $2' 12 "  2>/dev/null 1>/dev/null&
+ssh -X hadaq@hades33     " kdialog -display :0 --title '$1' --passivepopup '$3:    $2' 12 "  2>/dev/null 1>/dev/null&
 ssh -X hadaq@lxhadesdaq  " kdialog -display :1 --title '$1' --passivepopup '$3:    $2' 12 "  2>/dev/null 1>/dev/null &
 #ssh -X hadaq@lxhadesdaq  " logger -p local1.info -t DAQ '$3       $2'" &
 logger -p local1.info -t DAQ "$3       $2"