From 4df8e033ba29d59ce85b20b65e5a836ac3f38b9b Mon Sep 17 00:00:00 2001 From: hadaq Date: Fri, 25 Aug 2023 15:18:57 +0200 Subject: [PATCH] further changed files --- .gitignore | 6 ++++++ control/gui/eb/59_RESET_EB | 18 ++++++++++++++++++ control/gui/eb/73_Set_4_EB | 20 ++++++++++++++++++++ control/gui/eb/76_Set_8_EB | 20 ++++++++++++++++++++ control/gui/eb/79_Set_16_EB | 20 ++++++++++++++++++++ nettools/Perl2Epics.pm | 11 ++++++----- trg/triggerbox.trbcmd | 2 +- 7 files changed, 91 insertions(+), 6 deletions(-) create mode 100755 control/gui/eb/59_RESET_EB create mode 100755 control/gui/eb/73_Set_4_EB create mode 100755 control/gui/eb/76_Set_8_EB create mode 100755 control/gui/eb/79_Set_16_EB diff --git a/.gitignore b/.gitignore index 9e7fab0..c4aa9c4 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,9 @@ oracle rich/trb_dirich_threshold_bck daq_readback rush_read +readback_logs +old_* +bit +oldlogs +oldscripts +*.sav* diff --git a/control/gui/eb/59_RESET_EB b/control/gui/eb/59_RESET_EB new file mode 100755 index 0000000..7bb3bf4 --- /dev/null +++ b/control/gui/eb/59_RESET_EB @@ -0,0 +1,18 @@ +#!/bin/bash + +export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "Reset the event builders (drop all buffers)") +if [ $myvar == "256" ]; then exit; fi + +#$HOME/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" " EBs are going to be changed to write no files." "EB" & + +xterm -geometry 80x24 -bg orange -fg black -e bash -c ' + ssh hadaq@lxhadesdaq " + echo "Resetting event builder buffers..." + /usr/bin/wget -a /tmp/EB_reset.log -O /tmp/EB_resetres.txt \"http://lxhadeb12:8099/Master/BNET/ResetDAQ/execute\" + echo "have dropped all buffers." + sleep 2 + " +' + +#$HOME/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" " Eventbuilders are writing NO FILES." "EB" & + diff --git a/control/gui/eb/73_Set_4_EB b/control/gui/eb/73_Set_4_EB new file mode 100755 index 0000000..f82a08f --- /dev/null +++ b/control/gui/eb/73_Set_4_EB @@ -0,0 +1,20 @@ +#!/bin/bash + +# notifyall.sh "DAQ" " Eventbuilders are being restarted." "EB" & + +export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "restart the EBs with 4 builder nodes") +if [ $myvar == "256" ]; then exit; fi + +$HOME/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" " Eventbuilders are being started with 4 builder nodes." "EB" & + +xterm -geometry 80x24 -bg orange -fg black -e bash -c ' + ssh hadaq@lxhadesdaqp " + echo "Starting Eventbuilders with 4 BNET builder nodes" + cd ~/trbsoft/hadesdaq/evtbuild/ + ./start_eb_gbe.pl -e restart -n 1-16 -d on -p te -b 4 + sleep 2 + " +' + +$HOME/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" " Eventbuilders have been restarted using 4 BNET builder nodes" "EB" & + diff --git a/control/gui/eb/76_Set_8_EB b/control/gui/eb/76_Set_8_EB new file mode 100755 index 0000000..3f74008 --- /dev/null +++ b/control/gui/eb/76_Set_8_EB @@ -0,0 +1,20 @@ +#!/bin/bash + +# notifyall.sh "DAQ" " Eventbuilders are being restarted." "EB" & + +export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "restart the EBs with 8 builder nodes") +if [ $myvar == "256" ]; then exit; fi + +$HOME/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" " Eventbuilders are being started with 8 builder nodes." "EB" & + +xterm -geometry 80x24 -bg orange -fg black -e bash -c ' + ssh hadaq@lxhadesdaqp " + echo "Starting Eventbuilders with 10 BNET builder nodes" + cd ~/trbsoft/hadesdaq/evtbuild/ + ./start_eb_gbe.pl -e restart -n 1-16 -d on -p te -b 8 + sleep 2 + " +' + +$HOME/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" " Eventbuilders have been restarted using 8 BNET builder nodes" "EB" & + diff --git a/control/gui/eb/79_Set_16_EB b/control/gui/eb/79_Set_16_EB new file mode 100755 index 0000000..b937e64 --- /dev/null +++ b/control/gui/eb/79_Set_16_EB @@ -0,0 +1,20 @@ +#!/bin/bash + +# notifyall.sh "DAQ" " Eventbuilders are being restarted." "EB" & + +export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "restart the EBs with 16 builder nodes") +if [ $myvar == "256" ]; then exit; fi + +$HOME/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" " Eventbuilders are being started with 16 builder nodes." "EB" & + +xterm -geometry 80x24 -bg orange -fg black -e bash -c ' + ssh hadaq@lxhadesdaqp " + echo "Starting Eventbuilders with 16 BNET builder nodes" + cd ~/trbsoft/hadesdaq/evtbuild/ + ./start_eb_gbe.pl -e restart -n 1-16 -d on -p te -b 16 + sleep 2 + " +' + +$HOME/trbsoft/hadesdaq/utils/notifyall.sh "DAQ" " Eventbuilders have been restarted using 16 BNET builder nodes" "EB" & + diff --git a/nettools/Perl2Epics.pm b/nettools/Perl2Epics.pm index 90ce2f2..9ecbfd4 100644 --- a/nettools/Perl2Epics.pm +++ b/nettools/Perl2Epics.pm @@ -4,11 +4,12 @@ use strict; use Data::Dumper; # use Hmon; -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 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 lib '/home/hadaq/soft/EPICS/EPICS-7.0.7/base/lib/perl/'; use CA; #JAM 2020: back to default after EBs are done with epics diff --git a/trg/triggerbox.trbcmd b/trg/triggerbox.trbcmd index 0bbdbd7..ecf2206 120000 --- a/trg/triggerbox.trbcmd +++ b/trg/triggerbox.trbcmd @@ -1 +1 @@ -20221201_wFW_as_PT3.trbcmd \ No newline at end of file +20230530_FW_analogsum_as_PT8.trbcmd \ No newline at end of file -- 2.43.0