gsi_dirc changes

diff --git a/users/gsi_dirc/EventBuilderNew.xml b/users/gsi_dirc/EventBuilderNew.xml
index 9e777f16a336125fca9e311ebc1dd63b85f6fce2..ff512e4799caad694d28af6e225125dd8a205b48 100644 (file)
--- a/users/gsi_dirc/EventBuilderNew.xml
+++ b/users/gsi_dirc/EventBuilderNew.xml
@@ -64,7 +64,7 @@ When starting analysis from the go4 gui, one should specify stream server with p
 
     <Module name="Combiner" class="hadaq::CombinerModule">    
         <!-- these parameters will force to create inputs/oputputs of module -->
-       <NumInputs value="2"/>
+       <NumInputs value="3"/>
        <NumOutputs value="2"/>
 
        <InputPort name="Input0"  url="hadaq://host:49999" thread="UdpThread1"/>

diff --git a/users/gsi_dirc/addresses_trb3.db b/users/gsi_dirc/addresses_trb3.db
index c3bc8eb46f382ad9d4a10b28f715c4fbcf5a202f..21cd2211b44dfd763a102d9a775e292347d80e71 100644 (file)
--- a/users/gsi_dirc/addresses_trb3.db
+++ b/users/gsi_dirc/addresses_trb3.db
@@ -33,11 +33,11 @@
 #0x8002     72            5
 
 # TRB 03 2018
-#0x200c           104     0
-#0x200d           104     1
-#0x200e           104     2
-#0x200f           104     3
-#0x8003     104           5
+0x200c            104     0
+0x200d            104     1
+0x200e            104     2
+0x200f            104     3
+0x8003     104            5
 
 # AUX/GPIO 2018
 0x2010    57      0

diff --git a/users/gsi_dirc/check_ping.pl b/users/gsi_dirc/check_ping.pl
index c6a4aa9d3f4d5066909edf0b1641e66e0e407dee..8209a2598338a6defee558d8fa7a75ec2e73c6d1 100755 (executable)
--- a/users/gsi_dirc/check_ping.pl
+++ b/users/gsi_dirc/check_ping.pl
@@ -25,8 +25,8 @@ my $map = {
 #         1  =>  { trb =>  99, sys => "MCP 00" },
 #         1  =>  { trb =>  73, sys => "MCP 01" },
 #         1  =>  { trb =>  72, sys => "MCP 02" },
-#         0  =>  { trb =>  104, sys => "MCP 03" },
-          0  =>  { trb =>  57, sys => "AUX"    },
+          3  =>  { trb =>  104, sys => "MCP 03" },
+          4  =>  { trb =>  57, sys => "AUX"    },
 #         5  =>  { trb =>  xx, sys => "" },
 #         6  =>  { trb =>  59, sys => "TOF 2" },
 #         7  =>  { trb =>  83, sys => "HODO" },

diff --git a/users/gsi_dirc/readme2022.txt b/users/gsi_dirc/readme2022.txt
index 7906d325c34b4a1eea4d3e61513021bdb5346c15..bcdff6af149ee56cb234a26d58f83cd5ee296a66 100644 (file)
--- a/users/gsi_dirc/readme2022.txt
+++ b/users/gsi_dirc/readme2022.txt
@@ -123,17 +123,24 @@ searching old routine. Works only for channel 0-15
 system name:   dircdaq003
 
 on dircdaq003
-vncserver :1 -geometry 1440x960
-or
-x0vncserver -display :0 -Geometry 1440x960
+no vncserver :1 -geometry 1440x960
+no or
+no x0vncserver -display :0 -Geometry 1440x960
+
+no x0vncserver -PasswordFile /home/hadaq/.vnc/passwd  -geometry 1440x960
+
+there is already a vncserver running on :0 (found in the menu
+system->x11vnc server)
+
+then eg. on dircdaq002
+vinagre dircdaq003:0
+
+password same as hadaq account password
 
-on dircdaq003 ** remember the "-Shared" - otherwise you kill every other viewer! **
-vncviewer-tigervnc -Shared :1
 
 on other machines in the local network
 vncviewer -Shared dircdaq003:1
 
-password same as hadaq account password
 
 # the main tools are represented by icons on the desktop
 

diff --git a/users/gsi_dirc/register_config_tdc.db b/users/gsi_dirc/register_config_tdc.db
index 36b635956e4da277600a2be31d413797659e7eaa..70c054e379db1e595f16424764a1aa8bba33ffb7 100644 (file)
--- a/users/gsi_dirc/register_config_tdc.db
+++ b/users/gsi_dirc/register_config_tdc.db
@@ -49,10 +49,10 @@
 #  0x2009   0         0x00000000           0x00000000
 #  0x200a   0         0x00000000           0x00000000
 #  0x200b   0         0x00000000           0x00000000
-#  0x200c   0         0x00000000           0x00000000
-#  0x200d   0         0x00000000           0x00000000
-#  0x200e   0         0x00000000           0x00000000
-#  0x200f   0         0x00000000           0x00000000
+  0x200c   0         0x00000000           0x00000000
+  0x200d   0         0x00000000           0x00000000
+  0x200e   0         0x00000000           0x00000000
+  0x200f   0         0x00000000           0x00000000
 
   0x2010   0         0x0000ffff           0x00000000
 

diff --git a/users/gsi_dirc/register_configgbe.db b/users/gsi_dirc/register_configgbe.db
index c4a80d261c3af3b90ae038499ddac265ddfd7e9b..063932079a178d77bd01255cb2d9401e1a2e0e71 100755 (executable)
--- a/users/gsi_dirc/register_configgbe.db
+++ b/users/gsi_dirc/register_configgbe.db
@@ -15,7 +15,7 @@
 # 0x8000     0     0x8000    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
 # 0x8001     0     0x8001    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
 # 0x8002     0     0x8002    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
-# 0x8003     0     0x8003    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
+ 0x8003     0     0x8003    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
  0x8004     0     0x8004    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
 # 0x8005     0     0x8005    0x00020001   0x00030064     0x1DE8       0x578         0          1           1            1                0x0 
 # 0x8006     0     0x8006    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 

diff --git a/users/gsi_dirc/register_configgbe_ip.db b/users/gsi_dirc/register_configgbe_ip.db
index 3cd4074d071756e4bebf3726c4b30be6ad103f15..e1f3e023a1892ff8544c94012f899abc027c5af8 100755 (executable)
--- a/users/gsi_dirc/register_configgbe_ip.db
+++ b/users/gsi_dirc/register_configgbe_ip.db
@@ -34,7 +34,7 @@
 # 0x8000        0   0x1e04f334    0x000e      0xc0a80003      0xc350     0xdead8000     0x001b   0xc0a80001      0xc351     0x0578
 # 0x8001        0   0x1e04f334    0x000e      0xc0a80003      0xc351     0xdead8001     0x001b   0xc0a80002      0xc352     0x0578
 # 0x8002        0   0x1e04f334    0x000e      0xc0a80003      0xc352     0xdead8002     0x001b   0xc0a80003      0xc353     0x0578
-# 0x8003        0   0x1e04f334    0x000e      0xc0a80003      0xc353     0xdead8003     0x001b   0xc0a80004      0xc354     0x0578
+ 0x8003        0   0x1e04f334    0x000e      0xc0a80003      0xc353     0xdead8003     0x001b   0xc0a80004      0xc354     0x0578
  0x8004        0   0x1e04f334    0x000e      0xc0a80003      0xc354     0xdead8004     0x001b   0xc0a80005      0xc355     0x0578
 # 0x8005        0   0x1e04f334    0x000e      0xc0a80003      0xc355     0xdead8005     0x001b   0xc0a80006      0xc356     0x0578
 # 0x8006        0   0x1e04f330    0x000e      0xc0a80003      0xc356     0xdead8006     0x001b   0xc0a80007      0xc357     0x0578

diff --git a/users/gsi_dirc/trbreset_loop.pl b/users/gsi_dirc/trbreset_loop.pl
index 51bbfe9b07cfab84b8cbf5bc21d37f283c4f66d1..ede14b5b81f9fa64d8063944227cd068df6c1339 100755 (executable)
--- a/users/gsi_dirc/trbreset_loop.pl
+++ b/users/gsi_dirc/trbreset_loop.pl
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 ### Change THIS!
-my $required_endpoints = 15;
+my $required_endpoints = 20;
 # barrel my $required_endpoints = 25;