cleaned a bit, mt

diff --git a/thresholds/thresholds_compare.pl b/thresholds/thresholds_compare.pl
index 1c6f1bb9fff68ec4f986929a2fbef0ae79e4df67..5e0e132bfa5c9caae6bc64847ba83625a08e6442 100755 (executable)
--- a/thresholds/thresholds_compare.pl
+++ b/thresholds/thresholds_compare.pl
@@ -1,5 +1,7 @@
 #!/usr/bin/perl -w
 
+use lib "../perllibs/";
+
 use warnings;
 use strict;
 use POSIX qw(strftime);

diff --git a/users/gsi_dirc/addresses_trb3.db b/users/gsi_dirc/addresses_trb3.db
index b7655677834cdaef9b295b20dab35ee5ff2ef52f..ee9456a982784768428c708b429644b37df7b980 100644 (file)
--- a/users/gsi_dirc/addresses_trb3.db
+++ b/users/gsi_dirc/addresses_trb3.db
@@ -23,11 +23,11 @@
 0x2007      99    3
 0x8001      99    5
 
-0x2008            101     0
-0x2009            101     1
-0x200a            101     2
-0x200b            101     3
-0x8002     101            5
+0x2008             78     0
+0x2009             78     1
+0x200a             78     2
+0x200b             78     3
+0x8002      78            5
 
 0x200c             74     0
 0x200d             74     1
@@ -67,21 +67,21 @@
 0x2021    111     1
 0x2022    111     2
 0x2023    111     3
-0x8007    111     5
+0x8008    111     5
 
 
-# DIRC-DIRC
+# DISC-DIRC
 
-0x2024    119     0
-0x2025    119     1
-0x2026    119     2
-0x2027    119     3
-0x8008    119     5
+0x2024    13      0
+0x2025    13      1
+0x2026    13      2
+0x2027    13      3
+0x8009    13      5
 
 
-0x2028    118     0
-0x2029    118     1
-0x203a    118     2
-0x203b    118     3
-0x8009    118     5
+0x2028    77      0
+0x2029    77      1
+0x202a    77      2
+0x202b    77      3
+0x800a    77      5
 

diff --git a/users/gsi_dirc/register_configgbe.db b/users/gsi_dirc/register_configgbe.db
index ef16b5aa35e692d705e4cc2b405533e6e4423ad7..d111505acdb33e8933f3f7193c153e9428f54747 100755 (executable)
--- a/users/gsi_dirc/register_configgbe.db
+++ b/users/gsi_dirc/register_configgbe.db
@@ -17,10 +17,10 @@
  0x8002     0     0x8002    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
  0x8003     0     0x8003    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
  0x8004     0     0x8004    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
-# 0x8005     0     0x8005    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
-# 0x8006     0     0x8006    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
-# 0x8007     0     0x8007    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
-# 0x8008     0     0x8008    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
+ 0x8005     0     0x8005    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
+ 0x8006     0     0x8006    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
+ 0x8007     0     0x8007    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
+ 0x8008     0     0x8008    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
 # 0x8009     0     0x8009    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
 # 0x8010     0     0x8010    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
 # 0x8011     0     0x8011    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 

diff --git a/users/gsi_dirc/register_configgbe_ip.db b/users/gsi_dirc/register_configgbe_ip.db
index dd3c8aceea09f4930bc50eea51b49fcbc3482f0b..96037fbcf3405a1ef429111949fadbfbfe182668 100755 (executable)
--- a/users/gsi_dirc/register_configgbe_ip.db
+++ b/users/gsi_dirc/register_configgbe_ip.db
@@ -28,17 +28,17 @@
 # Hub    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4     #     C5     #     C6     #     C7     #     C8     #
 ########################################################################################################################################
 
- 0x7999        0   0x1e04f330    0x000e      0xc0a80003      0xc350     0xdead8000     0x001b   0xc0a80000      0xc350     0x0578
- 0x8000        0   0x1e04f330    0x000e      0xc0a80003      0xc351     0xdead8001     0x001b   0xc0a80001      0xc351     0x0578
- 0x8001        0   0x1e04f330    0x000e      0xc0a80003      0xc352     0xdead8002     0x001b   0xc0a80002      0xc352     0x0578
- 0x8002        0   0x1e04f330    0x000e      0xc0a80003      0xc353     0xdead8003     0x001b   0xc0a80003      0xc353     0x0578
- 0x8003        0   0x1e04f330    0x000e      0xc0a80003      0xc354     0xdead8004     0x001b   0xc0a80004      0xc354     0x0578
- 0x8004        0   0x1e04f330    0x000e      0xc0a80003      0xc355     0xdead8005     0x001b   0xc0a80005      0xc355     0x0578
-# 0x8005        0   0x7a0b83ca    0x0cc4      0xc0a80002      0xc356     0xdead8006     0x001b   0xc0a80006      0xc356     0x0578
-# 0x8006        0   0x7a0b83ca    0x0cc4      0xc0a80002      0xc357     0xdead8007     0x001b   0xc0a80007      0xc357     0x0578
-# 0x8007        0   0x7a0b83ca    0x0cc4      0xc0a80002      0xc358     0xdead8008     0x001b   0xc0a80008      0xc358     0x0578
-# 0x8008        0   0x7a0b83ca    0x0cc4      0xc0a80002      0xc359     0xdead8009     0x001b   0xc0a80009      0xc359     0x0578
-# 0x8009        0   0x7a0b83ca    0x0cc4      0xc0a80002      0xc35a     0xdead8010     0x001b   0xc0a80010      0xc35a     0x0578
+ 0x7999        0   0x1e04f330    0x000e      0xc0a80003      0xc34f     0xdead8000     0x001b   0xc0a80000      0xc350     0x0578
+ 0x8000        0   0x1e04f330    0x000e      0xc0a80003      0xc350     0xdead8001     0x001b   0xc0a80001      0xc351     0x0578
+ 0x8001        0   0x1e04f330    0x000e      0xc0a80003      0xc351     0xdead8002     0x001b   0xc0a80002      0xc352     0x0578
+ 0x8002        0   0x1e04f330    0x000e      0xc0a80003      0xc352     0xdead8003     0x001b   0xc0a80003      0xc353     0x0578
+ 0x8003        0   0x1e04f330    0x000e      0xc0a80003      0xc353     0xdead8004     0x001b   0xc0a80004      0xc354     0x0578
+ 0x8004        0   0x1e04f330    0x000e      0xc0a80003      0xc354     0xdead8005     0x001b   0xc0a80005      0xc355     0x0578
+ 0x8005        0   0x1e04f330    0x000e      0xc0a80003      0xc355     0xdead8006     0x001b   0xc0a80006      0xc356     0x0578
+ 0x8006        0   0x1e04f330    0x000e      0xc0a80003      0xc356     0xdead8007     0x001b   0xc0a80007      0xc357     0x0578
+ 0x8007        0   0x1e04f330    0x000e      0xc0a80003      0xc357     0xdead8008     0x001b   0xc0a80008      0xc358     0x0578
+ 0x8008        0   0x1e04f330    0x000e      0xc0a80003      0xc358     0xdead8009     0x001b   0xc0a80009      0xc359     0x0578
+# 0x8009        0   0x1e04f330    0x000e      0xc0a80003      0xc359     0xdead8010     0x001b   0xc0a80010      0xc35a     0x0578
 # 0x8010        0   0x7a0b83ca    0x0cc4      0xc0a80002      0xc35b     0xdead8011     0x001b   0xc0a80011      0xc35b     0x0578
 # 0x8011        0   0x7a0b83ca    0x0cc4      0xc0a80002      0xc35c     0xdead8012     0x001b   0xc0a80012      0xc35c     0x0578
 # 0x8012        0   0x7a0b83ca    0x0cc4      0xc0a80002      0xc35d     0xdead8013     0x001b   0xc0a80013      0xc35d     0x0578

diff --git a/users/gsi_dirc/start_readout.pl b/users/gsi_dirc/start_readout.pl
index 46b5bc52114ea8d334c64db5e7efc94331884ef4..87fac053529456381964e33a32d08f38a6ab61ae 100755 (executable)
--- a/users/gsi_dirc/start_readout.pl
+++ b/users/gsi_dirc/start_readout.pl
@@ -4,7 +4,7 @@ use strict;
 use Getopt::Long;
 
 my $help = "";
-my $dataPath = "/d/";
+my $dataPath = "/d/may2015/";
 my $label = "test";
 my $time = -1;
 my $c;
@@ -32,14 +32,14 @@ $c=qq|pkill -f "daq_evtbuild -S $label"|; qx($c); # if any, kill existing daq_ev
 $c=qq|pkill -f "daq_netmem -S $label"|;   qx($c); # if any, kill existing daq_netmem
 
 
-$c=qq|xterm -geometry 122x14-0+0 -e bash -c 'daq_evtbuild -S $label -m 6 -x cc -d file -o $dataPath'|;
+$c=qq|xterm -geometry 122x15-0+0 -e bash -c 'daq_evtbuild -S $label -m 10 -x cc -d file -o $dataPath'|;
 #$c=qq|xterm -geometry 122x16-0+0 -e bash -c 'daq_evtbuild -S $label -m 23 -x cc -d file -o $dataPath'|;
 #print $c;
 
 system("$c &");
 
 sleep 1;
-$c=qq"xterm -geometry 82x17-0+210 -e bash -c 'daq_netmem -S $label -m 6 -i UDP:127.0.0.1:50000 -i UDP:127.0.0.1:50001 -i UDP:127.0.0.1:50002 -i UDP:127.0.0.1:50003 -i UDP:127.0.0.1:50004 -i UDP:127.0.0.1:50005 '";
+$c=qq"xterm -geometry 82x35-0+210 -e bash -c 'daq_netmem -S $label -m 10 -i UDP:127.0.0.1:49999 -i UDP:127.0.0.1:50000 -i UDP:127.0.0.1:50001 -i UDP:127.0.0.1:50002 -i UDP:127.0.0.1:50003 -i UDP:127.0.0.1:50004 -i UDP:127.0.0.1:50005 -i UDP:127.0.0.1:50006 -i UDP:127.0.0.1:50007 -i UDP:127.0.0.1:50008 '";