local gsi_ee_trb84 status, mt

diff --git a/base/serials_dirich.db b/base/serials_dirich.db
index 8170d5a83c2739511b872c757317f0da090cc555..bf2cc5c7921d140464a9ca8a17ea8dcf9a40a0b6 100644 (file)
--- a/base/serials_dirich.db
+++ b/base/serials_dirich.db
@@ -1388,3 +1388,4 @@
 #99911   0x9e00000bb6d01428 # currently without serial number, just for test
 #99921   0xb400000bb6cf6c28 # currently without serial number, just for test
 #99931   0xb800000bb6d00828 # currently without serial number, just for test
+

diff --git a/base/serials_dirich5s.db b/base/serials_dirich5s.db
index a126682d8c0056869d9a62d6205ecc025db59749..ca56ffe00b718331464f6d8de85fee6d6ef6bf09 100644 (file)
--- a/base/serials_dirich5s.db
+++ b/base/serials_dirich5s.db
@@ -4,6 +4,9 @@
 ########################################
 
 0011   0x9900000bb732ff28
+0031    0xcc00000bb7da6f28
+0041    0x0f00000bb6c9f528
+0051    0x0b00000bb71a1328
 0091    0x7600000bb71a1f28
 
 0071    0x4900000bb7044528 #
@@ -17,4 +20,4 @@
 0151    0xea00000bb7045e28
 
 0251    0x5600000bb6c9f628   
-0051    0x0b00000bb71a1328
+

diff --git a/base/serials_dirich_concentrator.db b/base/serials_dirich_concentrator.db
index 622dc5f3f3363f747021235d635b52b30efe1080..87b453af678663ccd5ce28b4242089b0f4ee0cf6 100644 (file)
--- a/base/serials_dirich_concentrator.db
+++ b/base/serials_dirich_concentrator.db
@@ -112,5 +112,6 @@
    1150      0xfb00000348102128
    1160      0x66000003481d4728
    1170      0x68000003481d3e28
+   1180      0x0500000348175028
 
    8000      0x5d00000a525b0e28

diff --git a/base/serials_trb5sc.db b/base/serials_trb5sc.db
index c9155e0baaa483b689a64ccd629fa15e413f0d4d..75c979fa1063e6e5ee07844a5a5ba301c1e73613 100644 (file)
--- a/base/serials_trb5sc.db
+++ b/base/serials_trb5sc.db
@@ -12,3 +12,5 @@
     0081   0x00004aa700202941
     0091   0x0000df2a001f2941
     0101   0x0000e6be001f2941
+
+

diff --git a/tools/determine_noiseband_dirich.pl b/tools/determine_noiseband_dirich.pl
index 642e41218c857118802cc4df1a9f161f42eaa4d3..dafc81973e968dd850dfb78e02519a150b273dd9 100755 (executable)
--- a/tools/determine_noiseband_dirich.pl
+++ b/tools/determine_noiseband_dirich.pl
@@ -13,7 +13,7 @@ my $dirich = 0x1234;
 $dirich = $ARGV[0];
 
 unless ($ARGV[0]) {
-  print "usage: $0 <DiRICH--TrbNet-Address>\n";
+  print "usage: $0 <DiRICH--TrbNet-Address> [<first channel>] [<last channel>]\n";
   exit;
 }
 
@@ -23,8 +23,24 @@ my $throffset = 0xa000;
 #my $monitor = 0xdfc0;
 my $monitor = 0xc001;
 
-my $first_channel = 8;
-my $last_channel = 11;
+my $first_channel = 0;
+if (defined $ARGV[1]) {
+  if ($ARGV[1] > 31 || $ARGV[1] < 0) {
+    print "Valid channels between 0 and 31\n";
+    exit;
+  }
+  $first_channel = $ARGV[1];
+}
+
+my $last_channel = 31;
+if (defined $ARGV[2]) {
+  if ($ARGV[2] > 31 || $ARGV[2] < 0) {
+    print "Valid channels between 0 and 31\n";
+    exit;
+  }
+  $last_channel = $ARGV[2];
+}
+
 
 my $default_threshold = 0x6000;
 

diff --git a/users/gsi_ee_trb84/TdcEventBuilder.xml b/users/gsi_ee_trb84/TdcEventBuilder.xml
index 9c8a88ab2f8e859cf6f1f6289589f6a9ddf6683f..391ffde2c88a12d2edeb7273a7eb10d1669d764f 100644 (file)
--- a/users/gsi_ee_trb84/TdcEventBuilder.xml
+++ b/users/gsi_ee_trb84/TdcEventBuilder.xml
@@ -95,7 +95,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/outputs of module -->
-       <NumInputs value="3"/>
+       <NumInputs value="2"/>
        <NumOutputs value="2"/>
 
        <InputPort name="Input0" url="hadaq://host:50084" urlopt1="" thread="inp0thrd"/>

diff --git a/users/gsi_ee_trb84/db/addresses_dirich.db b/users/gsi_ee_trb84/db/addresses_dirich.db
index d81799510c3a57d2c1f51f6cbbae14a2ff728041..b3028874dcb0588426fd64e3b88022ae08eb14d6 100644 (file)
--- a/users/gsi_ee_trb84/db/addresses_dirich.db
+++ b/users/gsi_ee_trb84/db/addresses_dirich.db
@@ -1313,7 +1313,14 @@
 0x171c      1307     1
 0x171d      1308     1
 0x171e      1309     1
-0x171f      1310     1 
+0x171f      1310     1
+
+0x1720      1311     1
+0x1721      1313     1
+0x1722      1314     1
+0x1723      1317     1
+0x1724      1324     1
+0x1725      1325     1
 
 
 

diff --git a/users/gsi_ee_trb84/db/addresses_dirich5s.db b/users/gsi_ee_trb84/db/addresses_dirich5s.db
index 4fea8acf15682763a86f917d30e47c34f3e91248..3060a0e111ff685cf4b572042728afbdcbd524e4 100644 (file)
--- a/users/gsi_ee_trb84/db/addresses_dirich5s.db
+++ b/users/gsi_ee_trb84/db/addresses_dirich5s.db
@@ -1,6 +1,10 @@
+
 # addresses_dirich5s.db 
 # maps trbnet-addresses to serial number + FPGA number
 
 # Address #  S/N  #  FPGA
 
 0x1401             001     1
+0x1402             025     1
+0x1403             004     1
+0x1404             003     1

diff --git a/users/gsi_ee_trb84/db/addresses_dirich_concentrator.db b/users/gsi_ee_trb84/db/addresses_dirich_concentrator.db
index 5c46cabe84de660245e809f8c2d5e7e32bdca89a..90bdf9ec609afb0a34335029357648fe793844fe 100644 (file)
--- a/users/gsi_ee_trb84/db/addresses_dirich_concentrator.db
+++ b/users/gsi_ee_trb84/db/addresses_dirich_concentrator.db
@@ -8,6 +8,7 @@
 0x8301    025   0
 0x8302     033   0
 0x8303     800   0
+0x8304     118   0
 
 #0x8302           002   0
 #0x8401           101   0

diff --git a/users/gsi_ee_trb84/db/register_configgbe.db b/users/gsi_ee_trb84/db/register_configgbe.db
index 9e1dc694e255c2976134cf645da19aba7f6cbc16..4af226bbfc63a2331be5efb0bd61f10e65de1cc2 100644 (file)
--- a/users/gsi_ee_trb84/db/register_configgbe.db
+++ b/users/gsi_ee_trb84/db/register_configgbe.db
@@ -14,6 +14,8 @@
    0xc001      0       0xc001          1            0        0xffffff         1       
    0x8610      0       0x8000          1            0        0xffffff         1
    0x1692      0       0x8002          1            0        0xffffff         1      
+   0x1504      0       0x8006          1            0        0xffffff         1      
+   0x16ce      0       0x8007          1            0        0xffffff         1      
 #  0x8113      0       0x8001          1            0        0xffffff         1      
 #  0x8158      0       0x8002          1            0        0xffffff         1      
 #  0xa002      0       0x8003          0            0        0xffffff         1       0x2000

diff --git a/users/gsi_ee_trb84/db/register_configgbe_ip.db b/users/gsi_ee_trb84/db/register_configgbe_ip.db
index 7e3d8cdf1a98da3aeaeeb72f1740b7a7949553ef..db434df23cd504bd5d8417950776025393298fe8 100644 (file)
--- a/users/gsi_ee_trb84/db/register_configgbe_ip.db
+++ b/users/gsi_ee_trb84/db/register_configgbe_ip.db
@@ -33,5 +33,7 @@
  0xc001    0    0xcb9e97c5    0x6045    0xc0a80009    50084    0xc350
  0x8610    0    0xcb9e97c5    0x6045    0xc0a80009    50061     0xc350
  0x1692    0    0xcb9e97c5    0x6045    0xc0a80009    50092     0xc350
+ 0x1504    0    0xcb9e97c5    0x6045    0xc0a80009    50093     0xc350
+ 0x16ce    0    0xcb9e97c5    0x6045    0xc0a80009    50094     0xc350
 # 0x8113          0    0xcb9e97c5    0x6045    0xc0a80009    50113     0xc350
 # 0x8158          0    0xcb9e97c5    0x6045    0xc0a80009    50158     0xc350

diff --git a/users/gsi_ee_trb84/db/register_configtdc.db b/users/gsi_ee_trb84/db/register_configtdc.db
index 0758050eb1a8c73f309363dc61abae9fd84b30e1..e57d34908729b3d15ed60c0dc53ba20f0ac4aa14 100644 (file)
--- a/users/gsi_ee_trb84/db/register_configtdc.db
+++ b/users/gsi_ee_trb84/db/register_configtdc.db
@@ -18,7 +18,7 @@
 #0xfe62                0   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000 # trb3sc
 0xfe71         0   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000 # trb3sc padiwa 4Conn backplane
 #0xfe51                0   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000 # dirich
-#0xfe57                0   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000 # dirich5s
+0xfe57         0   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000 # dirich5s
 
 
 
@@ -30,7 +30,7 @@
 #0xfe62                0   0x50003000   0x80640064   0x00000000   0x00000000   0x00000078   0x00000000 # trb3sc
 0xfe71         0   0x50003000   0x80640064   0x00000000   0x00000000   0x00000078   0x00000000 # trb3sc padiwa 4Conn backplane
 #0xfe51                0   0x50003000   0x00640064   0x00000000   0x00000000   0x00000078   0x00000000 # dirich
-#0xfe57                0   0x50003000   0x00640064   0x00000000   0x00000000   0x00000078   0x00000000 # dirich5s
+0xfe57         0   0x50003000   0x00640064   0x00000000   0x00000000   0x00000078   0x00000000 # dirich5s