From: Michael Traxler Date: Tue, 23 Aug 2022 13:09:12 +0000 (+0200) Subject: local gsi_ee_trb84 status, mt X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=be28366e4753ada66fad175ea2eea9b8bfd4e8d0;p=daqtools.git local gsi_ee_trb84 status, mt --- diff --git a/base/serials_dirich.db b/base/serials_dirich.db index 8170d5a..bf2cc5c 100644 --- 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 a126682..ca56ffe 100644 --- 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 622dc5f..87b453a 100644 --- 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 c9155e0..75c979f 100644 --- 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 642e412..dafc819 100755 --- 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 \n"; + print "usage: $0 [] []\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 9c8a88a..391ffde 100644 --- 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 - + diff --git a/users/gsi_ee_trb84/db/addresses_dirich.db b/users/gsi_ee_trb84/db/addresses_dirich.db index d817995..b302887 100644 --- 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 4fea8ac..3060a0e 100644 --- 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 5c46cab..90bdf9e 100644 --- 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 9e1dc69..4af226b 100644 --- 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 7e3d8cd..db434df 100644 --- 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 0758050..e57d349 100644 --- 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