From: Michael Traxler Date: Wed, 13 Apr 2022 11:12:29 +0000 (+0200) Subject: added missing TRB3sc, mt X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=5f360d815438d9d85e486c3bfa6ea043ec19f7f1;p=daqtools.git added missing TRB3sc, mt --- diff --git a/base/serials_trb3sc.db b/base/serials_trb3sc.db index 5952f42..f6bef05 100644 --- a/base/serials_trb3sc.db +++ b/base/serials_trb3sc.db @@ -316,6 +316,90 @@ 4681 0xfc000003480ae228 + 5001 0x6b00000bb77f0828 # no RJ45 + 5011 0x6600000bb7dba428 # no RJ45 + 5021 0xe700000bb72e4028 # no RJ45 + 5031 0x3500000bb7ab6c28 # no RJ45 + 5041 0x8d00000bb7dba128 # no RJ45 + 5051 0xe100000bb719b828 # no RJ45 + 5061 0x5f00000bb6fa9628 # no RJ45 + 5071 0x7d00000bb6c2e628 # no RJ45 + 5081 0xeb00000bb6faa528 # no RJ45 + 5091 0xb700000bb7185e28 # no RJ45 + 5101 0x4200000bb760e628 # no RJ45 + 5111 0x2e00000bb7b27628 # no RJ45 + 5121 0x7b00000bb6fa9928 # no RJ45 + 5131 0xb200000bb7567528 # no RJ45 + 5141 0x7800000bb7233528 # no RJ45 + 5151 0xc300000bb72e4f28 # no RJ45 + 5161 0x3100000bb718cf28 # no RJ45 + 5171 0x1c00000bb7568128 # no RJ45 + 5181 0xdf00000bb7df1c28 # no RJ45 + 5191 0x2a00000bb7e0fd28 # no RJ45 + 5201 0xed00000bb6c2da28 # no RJ45 + 5211 0x5d00000bb7896228 # no RJ45 + 5221 0x4900000bb72d9f28 # no RJ45 + 5231 0x8000000bb6fa0428 # no RJ45 + 5241 0x4600000bb7198528 # no RJ45 + 5251 0xd700000bb7b91b28 # no RJ45 + 5261 0xb100000bb7a9dc28 # no RJ45 + 5271 0xa600000bb7601f28 # no RJ45 + 5281 0x0000000bb6d05128 # no RJ45 + 5291 0x6c00000bb6fab128 # no RJ45 + 5301 0x4f00000bb7185528 # no RJ45 + 5311 0x9f00000bb6c33328 # no RJ45 + 5321 0x2000000bb7896e28 # no RJ45 + 5331 0xcd00000bb6c2f328 # no RJ45 + 5341 0xff00000bb6c34828 # no RJ45 + 5351 0x9800000bb6c29a28 # no RJ45 + 5361 0xfa00000bb72e3728 # no RJ45 + 5371 0xc200000bb76ab828 # no RJ45 + 5381 0x4600000bb7892028 # no RJ45 + 5391 0xef00000bb719c128 # no RJ45 + 5401 0x9a00000bb72e4c28 # no RJ45 + 5411 0xf200000bb77ee428 # no RJ45 + 5421 0xab00000bb719b528 # no RJ45 + 5431 0xeb00000bb6c2ef28 # no RJ45 + 5441 0xa300000bb72e3428 # no RJ45 + 5451 0x1600000bb7a9e128 # no RJ45 + 5461 0xbe00000bb72e4328 # no RJ45 + 5471 0x7e00000bb7186128 # no RJ45 + 5481 0xd900000bb6fa0728 # no RJ45 + 5491 0x0e00000bb7e0f228 # no RJ45 + 5501 0x6400000bb77eed28 # no RJ45 + 5511 0x6100000bb7568d28 # no RJ45 + 5521 0x6e00000bb6faa228 # no RJ45 + 5531 0x8100000bb6fa8128 # no RJ45 + 5541 0x0f00000bb7180728 # no RJ45 + 5551 0x3c00000bb75f7928 # no RJ45 + 5561 0xd400000bb760ef28 # no RJ45 + 5571 0x6700000bb756b828 # no RJ45 + 5581 0x5e00000bb7601428 # no RJ45 + 5591 0x8a00000bb7568828 # no RJ45 + 5601 0x6a00000bb7896328 # no RJ45 + 5611 0xa600000bb77f1128 # no RJ45 + 5621 0x3700000bb7ab7f28 # no RJ45 + 5631 0x2400000bb7567c28 # no RJ45 + 5641 0x4000000bb7891528 # no RJ45 + 5651 0xee00000bb72da228 # no RJ45 + 5661 0x8c00000bb756bd28 # no RJ45 + 5671 0xe600000bb7df6428 # no RJ45, da:7a:0b:b7:df:64 + + + + + + + + + + + + + + + + diff --git a/users/gsi_ee_trb84/TdcEventBuilder.xml b/users/gsi_ee_trb84/TdcEventBuilder.xml index 3657d7b..9c8a88a 100644 --- a/users/gsi_ee_trb84/TdcEventBuilder.xml +++ b/users/gsi_ee_trb84/TdcEventBuilder.xml @@ -95,13 +95,13 @@ When starting analysis from the go4 gui, one should specify stream server with p - + - - - + + + diff --git a/users/gsi_ee_trb84/db/addresses_trb3sc.db b/users/gsi_ee_trb84/db/addresses_trb3sc.db index 895fd66..e023203 100644 --- a/users/gsi_ee_trb84/db/addresses_trb3sc.db +++ b/users/gsi_ee_trb84/db/addresses_trb3sc.db @@ -437,3 +437,106 @@ 0x1673 371 1 0x1674 372 1 0x1675 373 1 + + +0x2000 500 1 +0x2001 501 1 +0x2002 502 1 +0x2003 503 1 +0x2004 504 1 +0x2005 505 1 +0x2006 506 1 +0x2007 507 1 +0x2008 508 1 +0x2009 509 1 +0x2010 510 1 +0x2011 511 1 +0x2012 512 1 +0x2013 513 1 +0x2014 514 1 +0x2015 515 1 +0x2016 516 1 +0x2017 517 1 +0x2018 518 1 +0x2019 519 1 +0x2020 520 1 +0x2021 521 1 +0x2022 522 1 +0x2023 523 1 +0x2024 524 1 +0x2025 525 1 +0x2026 526 1 +0x2027 527 1 +0x2028 528 1 +0x2029 529 1 +0x2030 530 1 +0x2031 531 1 +0x2032 532 1 +0x2033 533 1 +0x2034 534 1 +0x2035 535 1 +0x2036 536 1 +0x2037 537 1 +0x2038 538 1 +0x2039 539 1 +0x2040 540 1 +0x2041 541 1 +0x2042 542 1 +0x2043 543 1 +0x2044 544 1 +0x2045 545 1 +0x2046 546 1 +0x2047 547 1 +0x2048 548 1 +0x2049 549 1 +0x2050 550 1 +0x2051 551 1 +0x2052 552 1 +0x2053 553 1 +0x2054 554 1 +0x2055 555 1 +0x2056 556 1 +0x2057 557 1 +0x2058 558 1 +0x2059 559 1 +0x2060 560 1 +0x2061 561 1 +0x2062 562 1 +0x2063 563 1 +0x2064 564 1 +0x2065 565 1 +0x2066 566 1 +0x2067 567 1 +0x2068 568 1 +0x2069 569 1 +0x2070 570 1 +0x2071 571 1 +0x2072 572 1 +0x2073 573 1 +0x2074 574 1 +0x2075 575 1 +0x2076 576 1 +0x2077 577 1 +0x2078 578 1 +0x2079 579 1 +0x2080 580 1 +0x2081 581 1 +0x2082 582 1 +0x2083 583 1 +0x2084 584 1 +0x2085 585 1 +0x2086 586 1 +0x2087 587 1 +0x2088 588 1 +0x2089 589 1 +0x2090 590 1 +0x2091 591 1 +0x2092 592 1 +0x2093 593 1 +0x2094 594 1 +0x2095 595 1 +0x2096 596 1 +0x2097 597 1 +0x2098 598 1 +0x2099 599 1 +0x2100 600 1 diff --git a/users/gsi_ee_trb84/db/register_configgbe.db b/users/gsi_ee_trb84/db/register_configgbe.db index c9bf3e6..9e1dc69 100644 --- a/users/gsi_ee_trb84/db/register_configgbe.db +++ b/users/gsi_ee_trb84/db/register_configgbe.db @@ -6,16 +6,17 @@ # 1 0x8301 0x8302 0x8304 0x8309 0x830c 0x830e 0x830f 0x8310 !Value table -# Enable -# SubEvtId UseGbE MultiQueue Trig. Num. InclTrgType SuEvSize -# Hub # Type # C0 # C1 # C2 # C3 # C4 C5 + +# SubEvtId UseGbE MultiQueue Trig. Num. InclTrgType SuEvSize +# Hub # Type # C0 # C1 # C2 # C3 # C4 C5 ####################################################################################################### # 0xc001 0 0xc001 1 0 0xffffff 1 0x2000 0xc001 0 0xc001 1 0 0xffffff 1 - 0x8610 0 0x8000 1 0 0xffffff 1 + 0x8610 0 0x8000 1 0 0xffffff 1 + 0x1692 0 0x8002 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 +# 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 048943b..be653a4 100644 --- a/users/gsi_ee_trb84/db/register_configgbe_ip.db +++ b/users/gsi_ee_trb84/db/register_configgbe_ip.db @@ -33,5 +33,6 @@ 0xc001 0 0xcb9e97c5 0x6045 0xc0a80009 50084 0xc350 0x8610 0 0xcb9e97c5 0x6045 0xc0a80009 50061 0xc350 + 0x1692 0 0xcb9e97c5 0x6045 0xc0a80009 50092 0xc350 # 0x8113 0 0xcb9e97c5 0x6045 0xc0a80009 50113 0xc350 # 0x8158 0 0xcb9e97c5 0x6045 0xc0a80009 50158 0xc350 diff --git a/users/gsi_ee_trb84/startup.sh b/users/gsi_ee_trb84/startup.sh index f47b6f9..6b7358c 100755 --- a/users/gsi_ee_trb84/startup.sh +++ b/users/gsi_ee_trb84/startup.sh @@ -176,5 +176,5 @@ trbcmd setbit 0xfe55 0xcd00 0x40000000 # enable Stretcher for Reference Cha ./tdcv4_enable_channels.sh 0xfe55 0xf 0xf #enable channel 5 and 0 echo "pulser enable" -#trbcmd setbit 0xc001 0xa101 0x1 +trbcmd setbit 0xc001 0xa101 0x1 # pulser enable