From 0a7ca648ae3b02376eae4bea6764d97e14c20fcd Mon Sep 17 00:00:00 2001 From: Hades DAQ Date: Mon, 1 Oct 2018 13:37:28 +0200 Subject: [PATCH] moved EB controls to lxhadeb07 --- control/gui/eb/29_Prefix_Be | 2 +- control/gui/eb/30_Prefix_NoFile | 2 +- control/gui/eb/40_Prefix_Te | 2 +- control/gui/eb/50_Prefix_Co | 2 +- control/gui/eb/60_Prefix_TC | 2 +- control/gui/eb/70_Prefix_Ri | 2 +- control/gui/eb/75_Prefix_Ec | 2 +- control/gui/eb/80_Prefix_St | 2 +- control/gui/eb/90_Prefix_Md | 2 +- control/gui/eb/98_Prefix_Sh | 2 +- control/gui/eb/99_Prefix_Pt | 2 +- control/gui/expert/Restart_BNET_Control | 7 +++++-- rich/register_tdc_rich.db | 14 ++++++++++++++ 13 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 rich/register_tdc_rich.db diff --git a/control/gui/eb/29_Prefix_Be b/control/gui/eb/29_Prefix_Be index df426e0..a8c9dae 100755 --- a/control/gui/eb/29_Prefix_Be +++ b/control/gui/eb/29_Prefix_Be @@ -17,7 +17,7 @@ ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c ' echo "Setting file prefix be" - /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix=be&oninit=10\" + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=be&oninit=10\" echo set prefix te on BNET master controller sleep 2 ' diff --git a/control/gui/eb/30_Prefix_NoFile b/control/gui/eb/30_Prefix_NoFile index 917cfdf..d72d2a5 100755 --- a/control/gui/eb/30_Prefix_NoFile +++ b/control/gui/eb/30_Prefix_NoFile @@ -16,7 +16,7 @@ ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c ' echo "Setting file prefix be" - /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix='--'&oninit=10\" + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix='--'&oninit=10\" echo set prefix -- on BNET master controller sleep 2 ' diff --git a/control/gui/eb/40_Prefix_Te b/control/gui/eb/40_Prefix_Te index f74d999..914b3f6 100755 --- a/control/gui/eb/40_Prefix_Te +++ b/control/gui/eb/40_Prefix_Te @@ -18,7 +18,7 @@ ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c ' echo "Setting file prefix be" - /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix=te&oninit=10\" + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=te&oninit=10\" echo set prefix te on BNET master controller sleep 2 ' diff --git a/control/gui/eb/50_Prefix_Co b/control/gui/eb/50_Prefix_Co index 28e1a2d..84fb1a8 100755 --- a/control/gui/eb/50_Prefix_Co +++ b/control/gui/eb/50_Prefix_Co @@ -18,7 +18,7 @@ ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c ' echo "Setting file prefix co" - /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix=co&oninit=10\" + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=co&oninit=10\" echo set prefix te on BNET master controller sleep 2 ' diff --git a/control/gui/eb/60_Prefix_TC b/control/gui/eb/60_Prefix_TC index 62d28fc..fad39e1 100755 --- a/control/gui/eb/60_Prefix_TC +++ b/control/gui/eb/60_Prefix_TC @@ -17,7 +17,7 @@ ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c ' echo Setting file prefix tc - /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix=tc&oninit=10\" + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=tc&oninit=10\" echo set prefix tc on BNET master controller sleep 2 ' diff --git a/control/gui/eb/70_Prefix_Ri b/control/gui/eb/70_Prefix_Ri index 4dc465c..1afc78e 100755 --- a/control/gui/eb/70_Prefix_Ri +++ b/control/gui/eb/70_Prefix_Ri @@ -17,7 +17,7 @@ ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c ' echo "Setting file prefix ri" - /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix=te&oninit=10\" + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=te&oninit=10\" echo set prefix ri on BNET master controller sleep 2 ' diff --git a/control/gui/eb/75_Prefix_Ec b/control/gui/eb/75_Prefix_Ec index 668acc5..b313f07 100755 --- a/control/gui/eb/75_Prefix_Ec +++ b/control/gui/eb/75_Prefix_Ec @@ -18,7 +18,7 @@ ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c ' echo "Setting file prefix ec" - /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix=ec&oninit=10\" + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=ec&oninit=10\" echo set prefix ec on BNET master controller sleep 2 ' diff --git a/control/gui/eb/80_Prefix_St b/control/gui/eb/80_Prefix_St index aa13ab5..f0e8255 100755 --- a/control/gui/eb/80_Prefix_St +++ b/control/gui/eb/80_Prefix_St @@ -16,7 +16,7 @@ ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c ' echo "Setting file prefix st" - /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix=st&oninit=10\" + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=st&oninit=10\" echo set prefix st on BNET master controller sleep 2 ' diff --git a/control/gui/eb/90_Prefix_Md b/control/gui/eb/90_Prefix_Md index 1d7281a..5b18dc9 100755 --- a/control/gui/eb/90_Prefix_Md +++ b/control/gui/eb/90_Prefix_Md @@ -15,7 +15,7 @@ ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c ' echo "Setting file prefix md" - /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix=md&oninit=10\" + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=md&oninit=10\" echo set prefix te on BNET master controller sleep 2 ' diff --git a/control/gui/eb/98_Prefix_Sh b/control/gui/eb/98_Prefix_Sh index 1e1b314..7d5457a 100755 --- a/control/gui/eb/98_Prefix_Sh +++ b/control/gui/eb/98_Prefix_Sh @@ -17,7 +17,7 @@ ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c ' echo "Setting file prefix sh" - /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix=sh&oninit=10\" + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=sh&oninit=10\" echo set prefix sh on BNET master controller sleep 2 ' diff --git a/control/gui/eb/99_Prefix_Pt b/control/gui/eb/99_Prefix_Pt index 8250123..055fb36 100755 --- a/control/gui/eb/99_Prefix_Pt +++ b/control/gui/eb/99_Prefix_Pt @@ -18,7 +18,7 @@ ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c ' echo "Setting file prefix pt" - /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix=pt&oninit=10\" + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb07:8099/Master/BNET/StartRun/execute?prefix=pt&oninit=10\" echo set prefix pt on BNET master controller sleep 2 ' diff --git a/control/gui/expert/Restart_BNET_Control b/control/gui/expert/Restart_BNET_Control index 24de34d..282f5a3 100755 --- a/control/gui/expert/Restart_BNET_Control +++ b/control/gui/expert/Restart_BNET_Control @@ -1,6 +1,9 @@ #!/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" ' +#lxhadeb03 140.181.91.154 +#lxhadeb07 140.181.80.125 +# lxhadeb 08 (140.181.80.62 +#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" ' +xterm -geometry 80x24 -bg orange -fg black -e bash -c ' ssh hadaq@140.181.80.125 "/home/hadaq/bin/restart_bnetmaster.sh ; echo closing window in 5 secs...; sleep 5" ' diff --git a/rich/register_tdc_rich.db b/rich/register_tdc_rich.db new file mode 100644 index 0000000..dd82104 --- /dev/null +++ b/rich/register_tdc_rich.db @@ -0,0 +1,14 @@ +# TDC config registers + +!Register table +# Type # C0 # C1 # C2 # C3 # C4 # C5 # +################################################################ + 0 0xc800 0xc801 0xc802 0xc803 0xc804 0xc805 + +!Value table +# Gnl Conf Trg Window Ch En 1-32 Ch En 33-64 RingBufSize Invert +# TDC # Type # C0 # C1 # C2 # C3 # C4 # C5 # +################################################################################################# +#0xfe51 0 0x50003000 0x802800c8 0xFFFFFFFF 0x00000000 0x00000010 0x00000000 # dirich TDC + 0xfe51 0 0x50003000 0x802800c8 0xFFFFFFFF 0x00000000 0x0000000a 0x00000000 # dirich TDC + -- 2.43.0