moved EB controls to lxhadeb07

diff --git a/control/gui/eb/29_Prefix_Be b/control/gui/eb/29_Prefix_Be
index df426e0ecd4df1923367e49baaa7ec2fa86b83b6..a8c9daed01436753be0cc015af27b4326f2a5922 100755 (executable)
--- 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 917cfdf5cebc0555de937d1642fc53466fa6f474..d72d2a5934c678f5b51b611679bd653193a74d87 100755 (executable)
--- 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 f74d99938d24ee8ceb50c01a01850260ff992ec9..914b3f68d8ce1b72fad84c12db4b8efba900dbc5 100755 (executable)
--- 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 28e1a2d2e4e9d2d49826da4877141755db11bfe4..84fb1a81f2871a057425ba5ced2cb7e84f24c2b4 100755 (executable)
--- 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 62d28fcabcdc705bc9f0ff12b365a589250017c7..fad39e1b46f12765a391b9cc3a6b6826387c9378 100755 (executable)
--- 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 4dc465c6e535c04fc062eae5e9bd2c0ec2b5d07e..1afc78e907ba8e06d978b4970fa8f295ff222b2e 100755 (executable)
--- 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 668acc5f7836b748337a367c244e7be3ed9f93c9..b313f07a8795877936191ad61f88a96bb72c2d06 100755 (executable)
--- 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 aa13ab5cb9cdd3e39afaa383fc872b591310adf8..f0e82559f0a406b19c3a514413669a0dfbc076c3 100755 (executable)
--- 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 1d7281ab99e5f725a1e73b00360d1c5e58fce457..5b18dc9474f2ee7a41f83b9f8d4e410aedac5cb8 100755 (executable)
--- 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 1e1b31462ecafad5f19f9e81070de2db2d503784..7d5457adf548cd6b6c8c30e1e4c97c7d4bf5ae9c 100755 (executable)
--- 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 82501237f9aea6abd52d0f4c5383b7de25d924d7..055fb365ee60fc5f74ef6f9b3f578dfb063284ad 100755 (executable)
--- 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 24de34d37d303a301195f419f0cd8e085af3e2b5..282f5a3d7916f5ff0ba5a91b1726515bb5b926dd 100755 (executable)
--- 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 (file)
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
+