From fefc84b0e65a150d8aa8e904771435018beacdcd Mon Sep 17 00:00:00 2001 From: Maps Date: Thu, 12 Dec 2024 11:38:09 +0100 Subject: [PATCH] added standalone to trbnet startup --- trbnet/addresses.sh | 2 ++ trbnet/register_configgbe.db | 6 +++++- trbnet/register_configgbe_ip.db | 4 ++++ trbnet/start.sh | 11 +++++++---- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/trbnet/addresses.sh b/trbnet/addresses.sh index 581e567..c379d8b 100755 --- a/trbnet/addresses.sh +++ b/trbnet/addresses.sh @@ -9,6 +9,8 @@ trbcmd s 0x4f0000094093c328 0x01 0xc000 trbcmd s 0x0000719900202941 0x01 0xa000 trbcmd s 0x00000c8300202941 0x01 0xa001 +#elif [[ "$DAQOPSERVER" == "jspc29:7" ]]; then + trbcmd s 0x0000e34f001f2941 0x01 0xc200 #elif [[ "$DAQOPSERVER" == "jspc29:31" ]]; then #Probestation setup trbcmd s 0x6c00000a62958028 0x01 0xc100 diff --git a/trbnet/register_configgbe.db b/trbnet/register_configgbe.db index 86f6184..9ed4f72 100644 --- a/trbnet/register_configgbe.db +++ b/trbnet/register_configgbe.db @@ -17,10 +17,12 @@ 0xa000 0 0xa000 1 0 0xffffff 1 0xa001 0 0xa001 1 0 0xffffff 1 0xa100 0 0xa100 1 0 0xffffff 1 + 0xf575 0 0xa100 1 0 0xffffff 1 + 0xc200 0 0xc200 1 0 0xffffff 1 -#These values to not need to be written - for completeness only +#Set bits for standalone GbE # SubEvtDec QueDec FrameSize RX enable SubEvtSize Evt/Queue QueueClose MaxQueueSize # Hub # Type # C0 # C1 # C2 # C3 # C4 # C5 # C6 # C7 # ########################################################################################################################## @@ -28,4 +30,6 @@ 0xa000 1 0x00020009 0x00030062 0x578 1 59800 200 32000 60000 0xa001 1 0x00020009 0x00030062 0x578 1 59800 200 32000 60000 0xa100 1 0x00020009 0x00030062 0x578 1 59800 200 32000 60000 + 0xf575 1 0x00020009 0x00030062 0x578 1 59800 200 32000 60000 +# 0xc200 1 0x00020009 0x00030062 0x578 1 59800 200 32000 60000 diff --git a/trbnet/register_configgbe_ip.db b/trbnet/register_configgbe_ip.db index eab83ca..91ae9ba 100644 --- a/trbnet/register_configgbe_ip.db +++ b/trbnet/register_configgbe_ip.db @@ -28,6 +28,7 @@ # Hub # Type # C0 # C1 # C2 # C3 # C4 # #################################################################################### + 0xc000 0 0xbacdb959 0x90e2 0xc0a80025 50301 0xc350 0xa000 0 0xbacdb959 0x90e2 0xc0a80025 50302 0xc350 0xa001 0 0xbacdb959 0x90e2 0xc0a80025 50303 0xc350 @@ -35,5 +36,8 @@ 0xc100 0 0xbacdb959 0x90e2 0xc0a80025 50310 0xc350 0xa100 0 0xbacdb959 0x90e2 0xc0a80025 50311 0xc350 + 0xf575 0 0xbacdb959 0x90e2 0xc0a80025 50312 0xc350 + + 0xc200 0 0xbacdb959 0x90e2 0xc0a80025 50320 0xc350 diff --git a/trbnet/start.sh b/trbnet/start.sh index efad7cd..c453763 100755 --- a/trbnet/start.sh +++ b/trbnet/start.sh @@ -6,19 +6,22 @@ trbcmd reset ./addresses.sh trbcmd w 0xfe82 0xc309 0 + /d/jspc37/trbsoft/daqtools/tools/loadregisterdb.pl register_configgbe.db /d/jspc37/trbsoft/daqtools/tools/loadregisterdb.pl register_configgbe_ip.db #sleep 1 #./conf_cts.sh ### here you could call a cts settings dump ... #./conf_tdcs.sh -trbcmd w 0xc000 0xa146 0x000186a0 #1 kHz pulser -trbcmd w 0xc000 0xa14f 0x80 #use trigger type 8 -trbcmd clearbit 0xfe82 0x22 0x80000000 #no ref time -trbcmd w 0xfe82 0x7111 0x2ee0 # max 12000 words +# trbcmd w 0xc000 0xa146 0x000186a0 #1 kHz pulser +# trbcmd w 0xc000 0xa14f 0x80 #use trigger type 8 +# trbcmd clearbit 0xfe82 0x22 0x80000000 #no ref time +# trbcmd w 0xfe82 0x7111 0x2ee0 # max 12000 words #../scripts/basicsettings.sh +trbcmd w 0xfe82 0xa009 0x000 #disable input cnt +trbcmd w 0xfe82 0xa100 0x000 #enable word alignment trbcmd w 0xfe82 0xa100 0x000 #enable word alignment sleep .2 trbcmd setbit 0xfe82 0xa100 0x100 #Word alignment off -- 2.43.0