rework of control gui

diff --git a/control/gui/50_Reboot_TRB3 b/control/gui/50_Reboot_TRB3
deleted file mode 100644 (file)
index 47c1ce7..0000000
--- a/control/gui/50_Reboot_TRB3
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot the TRB3s in the system")
-if [ $myvar == "256" ]; then exit; fi
-
-notifyall.sh "DAQ" "<I> The TRB3 in the system 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
-  ~/trbsoft/hadesdaq/nettools/reboot_TRB3.pl
-  sleep 10
-  "
-'
-
-notifyall.sh "DAQ" "<I> The TRB3 in the system are going to be rebooted." "STARTUP" &
-

diff --git a/control/gui/Buttons2.pm b/control/gui/Buttons2.pm
index a5216ce722a012a7e7e479f1d866f949f1c9e17f..28cf75436def9108cdd24e9b3128ade40000c9a4 100644 (file)
--- a/control/gui/Buttons2.pm
+++ b/control/gui/Buttons2.pm
@@ -233,11 +233,12 @@ sub NEW {
     $dir = "reboot";
     make_buttons($self, $dir, \$cur_button_number, $groupBox_7, $vl_gb7);
 
-    $dir = "expert";
+    $dir = "power";
     make_buttons($self, $dir, \$cur_button_number, $groupBox_4, $vl_gb4);
 
-    $dir = "power";
+    $dir = "expert";
     make_buttons($self, $dir, \$cur_button_number, $groupBox_5, $vl_gb5);
+
     #print "cur_button: $cur_button_number\n";
 
     #$layoutWidget->updateGeometry();
@@ -259,11 +260,11 @@ sub NEW {
 sub retranslateUi {
     my ( $self, $mainWindow ) = @_;
     $mainWindow->setWindowTitle( Qt::Application::translate( 'MainWindow', "DAQ-Control", undef, Qt::Application::UnicodeUTF8() ) );
-    $self->{groupBox_1}->setTitle( Qt::Application::translate( 'MainWindow', "DAQ-Operator", undef, Qt::Application::UnicodeUTF8() ) );
-    $self->{groupBox_2}->setTitle( Qt::Application::translate( 'MainWindow', "Monitor", undef, Qt::Application::UnicodeUTF8() ) );
+    $self->{groupBox_1}->setTitle( Qt::Application::translate( 'MainWindow', "DAQ Operation", undef, Qt::Application::UnicodeUTF8() ) );
+    $self->{groupBox_2}->setTitle( Qt::Application::translate( 'MainWindow', "Monitoring", undef, Qt::Application::UnicodeUTF8() ) );
     $self->{groupBox_3}->setTitle( Qt::Application::translate( 'MainWindow', "Eventbuilder", undef, Qt::Application::UnicodeUTF8() ) );
-    $self->{groupBox_4}->setTitle( Qt::Application::translate( 'MainWindow', "Expert", undef, Qt::Application::UnicodeUTF8() ) );
-    $self->{groupBox_5}->setTitle( Qt::Application::translate( 'MainWindow', "Power", undef, Qt::Application::UnicodeUTF8() ) );
+    $self->{groupBox_4}->setTitle( Qt::Application::translate( 'MainWindow', "Power", undef, Qt::Application::UnicodeUTF8() ) );
+    $self->{groupBox_5}->setTitle( Qt::Application::translate( 'MainWindow', "Expert", undef, Qt::Application::UnicodeUTF8() ) );
     $self->{groupBox_6}->setTitle( Qt::Application::translate( 'MainWindow', "Settings", undef, Qt::Application::UnicodeUTF8() ) );
     $self->{groupBox_7}->setTitle( Qt::Application::translate( 'MainWindow', "Reboot", undef, Qt::Application::UnicodeUTF8() ) );
 #    $self->{pushButton}->setText( Qt::Application::translate( 'MainWindow', "Quit DAQ-Control", undef, Qt::Application::UnicodeUTF8() ) );

diff --git a/control/gui/daq/20_Reprogram_FPGA.png b/control/gui/daq/20_Reprogram_FPGA.png
deleted file mode 100644 (file)
index 043814c..0000000
Binary files a/control/gui/daq/20_Reprogram_FPGA.png and /dev/null differ

diff --git a/control/gui/daq/41_Resync_DiRich b/control/gui/daq/20_Resync_DiRich
similarity index 100%
rename from control/gui/daq/41_Resync_DiRich
rename to control/gui/daq/20_Resync_DiRich

diff --git a/control/gui/eb/29_BEAM_Files b/control/gui/daq/29_BEAM_Files
similarity index 100%
rename from control/gui/eb/29_BEAM_Files
rename to control/gui/daq/29_BEAM_Files

diff --git a/control/gui/eb/29_BEAM_Files.png b/control/gui/daq/29_BEAM_Files.png
similarity index 100%
rename from control/gui/eb/29_BEAM_Files.png
rename to control/gui/daq/29_BEAM_Files.png

diff --git a/control/gui/eb/55_NO_FILE b/control/gui/daq/30_NO_Files
similarity index 100%
rename from control/gui/eb/55_NO_FILE
rename to control/gui/daq/30_NO_Files

diff --git a/control/gui/eb/55_NO_FILE.png b/control/gui/daq/30_NO_Files.png
similarity index 100%
rename from control/gui/eb/55_NO_FILE.png
rename to control/gui/daq/30_NO_Files.png

diff --git a/control/gui/eb/50_COSMICS_Files b/control/gui/daq/50_COSMICS_Files
similarity index 100%
rename from control/gui/eb/50_COSMICS_Files
rename to control/gui/daq/50_COSMICS_Files

diff --git a/control/gui/eb/52_TEST_File b/control/gui/daq/52_TEST_File
similarity index 100%
rename from control/gui/eb/52_TEST_File
rename to control/gui/daq/52_TEST_File

diff --git a/control/gui/eb/77_Set_10_EB b/control/gui/eb/old/77_Set_10_EB
similarity index 100%
rename from control/gui/eb/77_Set_10_EB
rename to control/gui/eb/old/77_Set_10_EB

diff --git a/control/gui/expert/Start_Speech_Output b/control/gui/expert/old/Start_Speech_Output
similarity index 100%
rename from control/gui/expert/Start_Speech_Output
rename to control/gui/expert/old/Start_Speech_Output

diff --git a/control/gui/monitor/80_Daq_VNC b/control/gui/monitor/80_Daq_VNC
index dcd1d3d3654fa14553169783b260e521da1f58c8..71e831204eeab5c9e283c97569d81d7b3ece777e 100755 (executable)
--- a/control/gui/monitor/80_Daq_VNC
+++ b/control/gui/monitor/80_Daq_VNC
@@ -1,3 +1,3 @@
 #!/bin/bash
-vncviewer --shared -passwd ~/.vnc/passwd hades30:1 &
+vncviewer --shared -passwd ~/.vnc/passwd hades70:1 &
 

diff --git a/control/gui/reboot/30_Ecal b/control/gui/reboot/30_Ecal
new file mode 100755 (executable)
index 0000000..348d63f
--- /dev/null
+++ b/control/gui/reboot/30_Ecal
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot the ECal boards in the system")
+if [ $myvar == "256" ]; then exit; fi
+
+notifyall.sh "DAQ" "<I> The ECal boards 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
+#  trbcmd reload 0xfe71
+  trbcmd reload 0x120
+
+cd ~/trbsoft/trbnettools/binlocal
+TRB3_SERVER=trb3sc134 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc009 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc130 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc128 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc131 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc129 ./trbcmd reload 0xffff
+
+    echo Done
+
+  sleep 10
+  "
+'
+
+

diff --git a/control/gui/reboot/50_Reboot_Ecal b/control/gui/reboot/30_Extra_Boards
similarity index 51%
rename from control/gui/reboot/50_Reboot_Ecal
rename to control/gui/reboot/30_Extra_Boards
index c00be30287911bdfb0fdd5b292fb1c7952b251e9..adfa6d542a86fb690d0ca23035b8a30e842f5f84 100755 (executable)
--- a/control/gui/reboot/50_Reboot_Ecal
+++ b/control/gui/reboot/30_Extra_Boards
@@ -1,16 +1,21 @@
 #!/bin/bash
 
-export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot the ECal TDCs in the system")
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot auxiliary boards in the system")
 if [ $myvar == "256" ]; then exit; fi
 
-notifyall.sh "DAQ" "<I> The ECal TDCs in the system are going to be rebooted." "STARTUP" &
+notifyall.sh "DAQ" "<I> Auxiliary boards 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
-  trbcmd reload 0xfe71
-  trbcmd reload 0x120
+
+#  trbcmd reload 0x8d00
+  trbcmd reload 0x0010
+  trbcmd reload 0x0100
+  trbcmd reload 0x0110
+  trbcmd reload 0x0120
+  trbcmd reload 0x0130
     echo Done
 
   sleep 10

diff --git a/control/gui/reboot/30_Hubs b/control/gui/reboot/30_Hubs
new file mode 100755 (executable)
index 0000000..847180b
--- /dev/null
+++ b/control/gui/reboot/30_Hubs
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot central HUBs in the system")
+if [ $myvar == "256" ]; then exit; fi
+
+notifyall.sh "DAQ" "<I> The central Hubs 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
+#  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 0x8800
+trbcmd reload 0x8810
+
+trbcmd reload 0x8000
+    echo Done
+
+  sleep 10
+  "
+'
+
+

diff --git a/control/gui/reboot/50_Reboot_MDC_Hub b/control/gui/reboot/30_MDC_Hub
similarity index 100%
rename from control/gui/reboot/50_Reboot_MDC_Hub
rename to control/gui/reboot/30_MDC_Hub

diff --git a/control/gui/daq/30_Reboot_OEP b/control/gui/reboot/30_MDC_OEP
similarity index 100%
rename from control/gui/daq/30_Reboot_OEP
rename to control/gui/reboot/30_MDC_OEP

diff --git a/control/gui/reboot/30_RICH b/control/gui/reboot/30_RICH
new file mode 100755 (executable)
index 0000000..8cc37b5
--- /dev/null
+++ b/control/gui/reboot/30_RICH
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot all RICH boards in the system")
+if [ $myvar == "256" ]; then exit; fi
+
+notifyall.sh "DAQ" "<I> The RICH boards 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
+cd ~/trbsoft/trbnettools/binlocal
+
+TRB3_SERVER=trb3sc136 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc158 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc144 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc139 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc163 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc153 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc164 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc166 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc137 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc138 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc162 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc141 ./trbcmd reload 0xffff
+
+  echo "Done   - Do a DAQ restart!"
+  sleep 10
+  "
+'
+
+

diff --git a/control/gui/reboot/30_RPC b/control/gui/reboot/30_RPC
new file mode 100755 (executable)
index 0000000..53588f0
--- /dev/null
+++ b/control/gui/reboot/30_RPC
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot RPC boards in the system")
+if [ $myvar == "256" ]; then exit; fi
+
+notifyall.sh "DAQ" "<I> The RPC boards 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
+
+
+cd ~/trbsoft/trbnettools/binlocal
+TRB3_SERVER=trb3sc317 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc319 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc320 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc315 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc318 ./trbcmd reload 0xffff
+TRB3_SERVER=trb3sc316 ./trbcmd reload 0xffff
+
+
+
+    echo Done
+
+  sleep 10
+  "
+'
+
+

diff --git a/control/gui/reboot/50_Reboot_Start b/control/gui/reboot/30_Start
similarity index 90%
rename from control/gui/reboot/50_Reboot_Start
rename to control/gui/reboot/30_Start
index 03b4418ac63c7f4ec5f60f3576f2a339ea383bec..3aa131cfb6bb052c2bd9af0a8e52704038e0f94c 100755 (executable)
--- a/control/gui/reboot/50_Reboot_Start
+++ b/control/gui/reboot/30_Start
@@ -10,9 +10,9 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   ssh hadaq@lxhadesdaqp "
   source /home/hadaq/.bash_profile
   trbcmd reload 0xfe74
-  trbcmd reload 0xfe76
+#  trbcmd reload 0xfe76
   trbcmd reload 0x8880
-  trbcmd reload 0x8d00
+#  trbcmd reload 0x8d00
     echo Done
 
   sleep 10

diff --git a/control/gui/reboot/30_TOF_FW b/control/gui/reboot/30_TOF_FW
new file mode 100755 (executable)
index 0000000..06bfc7b
--- /dev/null
+++ b/control/gui/reboot/30_TOF_FW
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot TOF and FW ")
+if [ $myvar == "256" ]; then exit; fi
+
+notifyall.sh "DAQ" "<I> The boards of TOF and FW 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
+#  trbcmd reload 0xfe47
+#  trbcmd reload 0x86c0
+#  trbcmd reload 0x86c1
+#  trbcmd reload 0x86c2
+#  trbcmd reload 0x86c3
+#  trbcmd reload 0x86c4
+#  trbcmd reload 0x86c5
+#  trbcmd reload 0x8c00
+#  trbcmd reload 0x8c10
+#  trbcmd reload 0x8c20
+cd ~/trbsoft/trbnettools/binlocal
+
+TRB3_SERVER=trbp088 ./trbcmd reload 0xffff
+TRB3_SERVER=trbp263 ./trbcmd reload 0xffff
+TRB3_SERVER=trbp006 ./trbcmd reload 0xffff
+TRB3_SERVER=trbp262 ./trbcmd reload 0xffff
+TRB3_SERVER=trbp265 ./trbcmd reload 0xffff
+TRB3_SERVER=trbp242 ./trbcmd reload 0xffff
+TRB3_SERVER=trbp074 ./trbcmd reload 0xffff
+TRB3_SERVER=trbp267 ./trbcmd reload 0xffff
+TRB3_SERVER=trbp266 ./trbcmd reload 0xffff
+
+  echo "Done   - Do a DAQ restart!"
+  sleep 10
+  "
+'
+
+

diff --git a/control/gui/reboot/50_Reboot_Hubs b/control/gui/reboot/50_Reboot_Hubs
deleted file mode 100755 (executable)
index c652349..0000000
--- a/control/gui/reboot/50_Reboot_Hubs
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot all HUBs in the system")
-if [ $myvar == "256" ]; then exit; fi
-
-notifyall.sh "DAQ" "<I> The Hubs 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
-  trbcmd reload 0xfffe
-    echo Done
-
-  sleep 10
-  "
-'
-
-

diff --git a/control/gui/reboot/50_Reboot_RPC b/control/gui/reboot/50_Reboot_RPC
deleted file mode 100755 (executable)
index 33a1c63..0000000
--- a/control/gui/reboot/50_Reboot_RPC
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot TDCs of RPC in the system")
-if [ $myvar == "256" ]; then exit; fi
-
-notifyall.sh "DAQ" "<I> The TDCs of RPC 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
-  trbcmd reload 0xfe73
-  trbcmd reload 0x84c0
-  trbcmd reload 0x84c1
-  trbcmd reload 0x84c2
-  trbcmd reload 0x84c3
-  trbcmd reload 0x84c4
-  trbcmd reload 0x84c5
-    echo Done
-
-  sleep 10
-  "
-'
-
-

diff --git a/control/gui/reboot/50_Reboot_TOF_FW b/control/gui/reboot/50_Reboot_TOF_FW
deleted file mode 100755 (executable)
index 32dec95..0000000
--- a/control/gui/reboot/50_Reboot_TOF_FW
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-export myvar=$(/home/hadaq/trbsoft/hadesdaq/utils/doyoureallywant.pl "reboot TDCs of TOF fRPC FW in the system")
-if [ $myvar == "256" ]; then exit; fi
-
-notifyall.sh "DAQ" "<I> The TDCs of TOF fRPC FW 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
-  trbcmd reload 0xfe47
-  trbcmd reload 0x86c0
-  trbcmd reload 0x86c1
-  trbcmd reload 0x86c2
-  trbcmd reload 0x86c3
-  trbcmd reload 0x86c4
-  trbcmd reload 0x86c5
-#  trbcmd reload 0x8c00
-#  trbcmd reload 0x8c10
-  echo Done
-  sleep 10
-  "
-'
-
-

diff --git a/control/gui/daq/20_Reprogram_FPGA b/control/gui/reboot/90_Reprogram_CTS
similarity index 100%
rename from control/gui/daq/20_Reprogram_FPGA
rename to control/gui/reboot/90_Reprogram_CTS

diff --git a/control/gui/reboot/50_Reboot_Dirich b/control/gui/reboot/old/50_Reboot_Dirich
similarity index 100%
rename from control/gui/reboot/50_Reboot_Dirich
rename to control/gui/reboot/old/50_Reboot_Dirich

diff --git a/control/gui/reboot/50_Reboot_RICH_Hubs b/control/gui/reboot/old/50_Reboot_RICH_Hubs
similarity index 100%
rename from control/gui/reboot/50_Reboot_RICH_Hubs
rename to control/gui/reboot/old/50_Reboot_RICH_Hubs

diff --git a/control/gui/reboot/50_Reboot_Ri_RPC_EC_Hubs b/control/gui/reboot/old/50_Reboot_Ri_RPC_EC_Hubs
similarity index 100%
rename from control/gui/reboot/50_Reboot_Ri_RPC_EC_Hubs
rename to control/gui/reboot/old/50_Reboot_Ri_RPC_EC_Hubs

diff --git a/control/gui/reboot/50_Reboot_Rich_Combiner b/control/gui/reboot/old/50_Reboot_Rich_Combiner
similarity index 100%
rename from control/gui/reboot/50_Reboot_Rich_Combiner
rename to control/gui/reboot/old/50_Reboot_Rich_Combiner

diff --git a/control/gui/reboot/50_Reboot_TOF_FW_Hubs b/control/gui/reboot/old/50_Reboot_TOF_FW_Hubs
similarity index 100%
rename from control/gui/reboot/50_Reboot_TOF_FW_Hubs
rename to control/gui/reboot/old/50_Reboot_TOF_FW_Hubs