From f3f29e61b2144f0e92acf3613b4a6fc9fb8d98c4 Mon Sep 17 00:00:00 2001 From: Hades DAQ Date: Tue, 11 Feb 2014 14:50:50 +0100 Subject: [PATCH] latest changes for new TRB3 --- evtbuild/start_eb_gbe.sh | 2 +- hmon/Hmon.pm | 2 +- hmon/hmon_endpoints.pl | 8 +- hmon/icingadaemon.sh | 2 +- hmon/permanent/hmon_hub.pl | 0 hmon/permanent/hmon_mdcpressure.pl | 2 - hub/addresses_hub.db | 18 +- hub/configure_ports.script | 299 +++++++++++++++-------------- hub/serials_hub.db | 9 + hub/startup.script | 13 ++ hub/trb.db | 1 - main/address_range.db | 1 + main/data_sources.db | 4 +- main/main_hades.script | 23 ++- main/startup.pl | 17 +- main/startup_briccolage.sh | 5 +- main/subevtids.db | 1 + nettools/nettracedb.pl | 2 +- rich/register_thresholds.db | 2 +- start/addresses_start.db | 7 +- start/serials_start.db | 4 + start/startup.script | 8 + 22 files changed, 254 insertions(+), 176 deletions(-) mode change 100755 => 100644 hmon/permanent/hmon_hub.pl diff --git a/evtbuild/start_eb_gbe.sh b/evtbuild/start_eb_gbe.sh index 625449c..aef0339 100755 --- a/evtbuild/start_eb_gbe.sh +++ b/evtbuild/start_eb_gbe.sh @@ -1 +1 @@ -./start_eb_gbe.pl -e restart -n 1-16 -d off -p -- +./start_eb_gbe.pl -e restart -n 1-16 -d on -p te diff --git a/hmon/Hmon.pm b/hmon/Hmon.pm index df0a305..b5e6936 100644 --- a/hmon/Hmon.pm +++ b/hmon/Hmon.pm @@ -76,7 +76,7 @@ sub WriteFile { # Nettrace DB ############################################ sub TraceDBLoad { - open FILE, "; close FILE; diff --git a/hmon/hmon_endpoints.pl b/hmon/hmon_endpoints.pl index dca2e69..f0236d8 100755 --- a/hmon/hmon_endpoints.pl +++ b/hmon/hmon_endpoints.pl @@ -96,7 +96,7 @@ while(1) { 0x3200,0x3201,0x3202,0x3210,0x3211,0x3212,0x3220,0x3221,0x3222,0x3230,0x3231,0x3232,0x3240,0x3241,0x3242, 0x3250,0x3251,0x3252, #shower-hub - 0x8500,0x8501, +# 0x8500,0x8501, #cts 0x0002,0x0003, #central hub @@ -108,7 +108,11 @@ while(1) { #fw 0x4400,0x4410,0x4420, #fw hub - 0x8700,0x8701 + 0x8700,0x8701, + #Pion + 0x8900,0x3800,0x3801, + #Start TRB3 + 0x8880,0x5000,0x5001,0x5002 ); ###strip the register value diff --git a/hmon/icingadaemon.sh b/hmon/icingadaemon.sh index 5671bc4..f3db48d 100755 --- a/hmon/icingadaemon.sh +++ b/hmon/icingadaemon.sh @@ -1,3 +1,3 @@ #!/bin/sh -while true; do /home/hadaq/trbsoft/daq/tools/hmon/icingadaemon.pl; sleep 10; done +while true; do /home/hadaq/trbsoft/hadesdaq/tools/hmon/icingadaemon.pl; sleep 10; done diff --git a/hmon/permanent/hmon_hub.pl b/hmon/permanent/hmon_hub.pl old mode 100755 new mode 100644 diff --git a/hmon/permanent/hmon_mdcpressure.pl b/hmon/permanent/hmon_mdcpressure.pl index 1aad807..b32281e 100755 --- a/hmon/permanent/hmon_mdcpressure.pl +++ b/hmon/permanent/hmon_mdcpressure.pl @@ -9,14 +9,12 @@ use POSIX qw/floor ceil/; use Hmon; use QA; use Perl2Epics; -use HADES::TrbNet; use HPlot; my @names = qw( reflowPressureAthm reflowPressureCompr reflowInO2 reflowRatioCO2 opensysFreshARGON opensysFreshCO2 reflowFreshArgon reflowFreshIsob pipePressureIsoB ); my @names2 = qw(waage_1_net waage_2_net); my @names3 = qw(targetVakPressure); -trb_init_ports() or die("could not connect to trbnetd"); my $plot = (); $plot->{name} = "AtmosPress"; diff --git a/hub/addresses_hub.db b/hub/addresses_hub.db index 4c79add..14d01a4 100644 --- a/hub/addresses_hub.db +++ b/hub/addresses_hub.db @@ -1,8 +1,8 @@ #Address # S/N # FPGA # Design # TRB # ################################################### #Central -0x8001 010 1 3 023 -0x8000 010 2 5 023 +#0x8001 010 1 3 023 +#0x8000 010 2 5 023 #MDC 0x8101 003 1 2 103 @@ -39,3 +39,17 @@ #Start/Veto/CTS 0x8801 015 1 3 107 0x8800 015 2 5 107 + +#Pion +0x8900 0755 5 0 075 +#0x8910 0755 5 0 075 + +#StartTRB3 +0x8880 0745 5 0 074 + + +0x8000 0805 5 0 080 +0x8001 0800 0 0 080 +0x8002 0801 1 0 080 +0x8003 0802 2 0 080 +0x8004 0803 3 0 080 diff --git a/hub/configure_ports.script b/hub/configure_ports.script index 6e0192e..eb33410 100644 --- a/hub/configure_ports.script +++ b/hub/configure_ports.script @@ -1,25 +1,32 @@ #Temporary: remove all other hubs in network from CTS hub despite used hub - trbcmd w 0x8001 0xc0 0x2001 - trbcmd w 0x8001 0xc1 0x2001 - trbcmd w 0x8001 0xc3 0x2001 + trbcmd w 0x8001 0xc0 0xff81 + trbcmd w 0x8001 0xc1 0xff81 + trbcmd w 0x8001 0xc3 0xff81 + trbcmd w 0x8002 0xc0 0xff81 + trbcmd w 0x8002 0xc1 0xff81 + trbcmd w 0x8002 0xc3 0xff81 + trbcmd w 0x8003 0xc0 0xff8f + trbcmd w 0x8003 0xc1 0xff8f + trbcmd w 0x8003 0xc3 0xff8f + trbcmd w 0x8004 0xc0 0xffff + trbcmd w 0x8004 0xc1 0xffff + trbcmd w 0x8004 0xc3 0xffff + trbcmd w 0x8000 0xc0 0xfffb + trbcmd w 0x8000 0xc1 0xfffb + trbcmd w 0x8000 0xc3 0xfffb -!ifdef ALL - trbcmd setbit 0x8001 0xc0 0x2FFF - trbcmd setbit 0x8001 0xc1 0x2FFF - trbcmd setbit 0x8001 0xc3 0x2FFF -!endif !ifdef RICH - trbcmd setbit 0x8001 0xc0 0x0700 - trbcmd setbit 0x8001 0xc1 0x0700 - trbcmd setbit 0x8001 0xc3 0x0700 + trbcmd setbit 0x8001 0xc0 0x0038 + trbcmd setbit 0x8001 0xc1 0x0038 + trbcmd setbit 0x8001 0xc3 0x0038 !endif !ifdef TOF - trbcmd setbit 0x8001 0xc0 0x0040 - trbcmd setbit 0x8001 0xc1 0x0040 - trbcmd setbit 0x8001 0xc3 0x0040 + trbcmd setbit 0x8002 0xc0 0x0002 + trbcmd setbit 0x8002 0xc1 0x0002 + trbcmd setbit 0x8002 0xc3 0x0002 !endif !ifdef RPC @@ -29,150 +36,154 @@ !endif !ifdef SHOWER - trbcmd setbit 0x8001 0xc0 0x0080 - trbcmd setbit 0x8001 0xc1 0x0080 - trbcmd setbit 0x8001 0xc3 0x0080 + trbcmd setbit 0x8000 0xc0 0x0004 + trbcmd setbit 0x8000 0xc1 0x0004 + trbcmd setbit 0x8000 0xc3 0x0004 !endif !ifdef WALL - trbcmd setbit 0x8001 0xc0 0x0020 - trbcmd setbit 0x8001 0xc1 0x0020 - trbcmd setbit 0x8001 0xc3 0x0020 -!endif - -!ifdef MDC12 - trbcmd setbit 0x8001 0xc0 0x0008 - trbcmd setbit 0x8001 0xc1 0x0008 - trbcmd setbit 0x8001 0xc3 0x0008 -!endif - -!ifdef MDC34 - trbcmd setbit 0x8001 0xc0 0x0010 - trbcmd setbit 0x8001 0xc1 0x0010 - trbcmd setbit 0x8001 0xc3 0x0010 -!endif - -!ifdef MDC134 - trbcmd setbit 0x8001 0xc0 0x0018 - trbcmd setbit 0x8001 0xc1 0x0018 - trbcmd setbit 0x8001 0xc3 0x0018 - - trbcmd clearbit 0x8101 0xc0 0x44 - trbcmd clearbit 0x8101 0xc1 0x44 - trbcmd clearbit 0x8101 0xc3 0x44 - trbcmd clearbit 0x1000 0xc0 0x0c - trbcmd clearbit 0x1000 0xc1 0x0c - trbcmd clearbit 0x1000 0xc3 0x0c - trbcmd clearbit 0x1040 0xc0 0x0c - trbcmd clearbit 0x1040 0xc1 0x0c - trbcmd clearbit 0x1040 0xc3 0x0c -!endif - -!ifdef MDC234 - trbcmd setbit 0x8001 0xc0 0x0018 - trbcmd setbit 0x8001 0xc1 0x0018 - trbcmd setbit 0x8001 0xc3 0x0018 - - trbcmd clearbit 0x8101 0xc0 0x18 - trbcmd clearbit 0x8101 0xc1 0x18 - trbcmd clearbit 0x8101 0xc3 0x18 - trbcmd clearbit 0x1000 0xc0 0x03 - trbcmd clearbit 0x1000 0xc1 0x03 - trbcmd clearbit 0x1000 0xc3 0x03 - trbcmd clearbit 0x1040 0xc0 0x03 - trbcmd clearbit 0x1040 0xc1 0x03 - trbcmd clearbit 0x1040 0xc3 0x03 -!endif - -!ifdef MDC234_p1s24 - trbcmd setbit 0x8001 0xc0 0x0018 - trbcmd setbit 0x8001 0xc1 0x0018 - trbcmd setbit 0x8001 0xc3 0x0018 - - trbcmd clearbit 0x8101 0xc0 0x10 - trbcmd clearbit 0x8101 0xc1 0x10 - trbcmd clearbit 0x8101 0xc3 0x10 - trbcmd clearbit 0x1030 0xc0 0x03 - trbcmd clearbit 0x1030 0xc1 0x03 - trbcmd clearbit 0x1030 0xc3 0x03 - trbcmd clearbit 0x1040 0xc0 0x03 - trbcmd clearbit 0x1040 0xc1 0x03 - trbcmd clearbit 0x1040 0xc3 0x03 -!endif - -!ifdef MDC234_p1s25 - trbcmd setbit 0x8001 0xc0 0x0018 - trbcmd setbit 0x8001 0xc1 0x0018 - trbcmd setbit 0x8001 0xc3 0x0018 - - trbcmd clearbit 0x1000 0xc0 0x03 - trbcmd clearbit 0x1000 0xc1 0x03 - trbcmd clearbit 0x1000 0xc3 0x03 - trbcmd clearbit 0x1020 0xc0 0x03 - trbcmd clearbit 0x1020 0xc1 0x03 - trbcmd clearbit 0x1020 0xc3 0x03 - trbcmd clearbit 0x1030 0xc0 0x03 - trbcmd clearbit 0x1030 0xc1 0x03 - trbcmd clearbit 0x1030 0xc3 0x03 - trbcmd clearbit 0x1040 0xc0 0x03 - trbcmd clearbit 0x1040 0xc1 0x03 - trbcmd clearbit 0x1040 0xc3 0x03 -!endif - -!ifdef MDC234_p1s1245 - trbcmd setbit 0x8001 0xc0 0x0018 - trbcmd setbit 0x8001 0xc1 0x0018 - trbcmd setbit 0x8001 0xc3 0x0018 - -# trbcmd clearbit 0x1000 0xc0 0x03 -# trbcmd clearbit 0x1000 0xc1 0x03 -# trbcmd clearbit 0x1000 0xc3 0x03 - - trbcmd clearbit 0x1020 0xc0 0x03 - trbcmd clearbit 0x1020 0xc1 0x03 - trbcmd clearbit 0x1020 0xc3 0x03 - - trbcmd clearbit 0x1040 0xc0 0x03 - trbcmd clearbit 0x1040 0xc1 0x03 - trbcmd clearbit 0x1040 0xc3 0x03 -!endif - - -!ifdef MDC234_p1s1245_p34s2 - trbcmd setbit 0x8001 0xc0 0x0018 - trbcmd setbit 0x8001 0xc1 0x0018 - trbcmd setbit 0x8001 0xc3 0x0018 - - trbcmd clearbit 0x8111 0xc0 0x04 - trbcmd clearbit 0x8111 0xc1 0x04 - trbcmd clearbit 0x8111 0xc3 0x04 - - trbcmd clearbit 0x1020 0xc0 0x03 - trbcmd clearbit 0x1020 0xc1 0x03 - trbcmd clearbit 0x1020 0xc3 0x03 - - trbcmd clearbit 0x1040 0xc0 0x03 - trbcmd clearbit 0x1040 0xc1 0x03 - trbcmd clearbit 0x1040 0xc3 0x03 + trbcmd setbit 0x8001 0xc0 0x0040 + trbcmd setbit 0x8001 0xc1 0x0040 + trbcmd setbit 0x8001 0xc3 0x0040 !endif +# +# !ifdef MDC12 +# trbcmd setbit 0x8001 0xc0 0x0008 +# trbcmd setbit 0x8001 0xc1 0x0008 +# trbcmd setbit 0x8001 0xc3 0x0008 +# !endif +# +# !ifdef MDC34 +# trbcmd setbit 0x8001 0xc0 0x0010 +# trbcmd setbit 0x8001 0xc1 0x0010 +# trbcmd setbit 0x8001 0xc3 0x0010 +# !endif +# +# !ifdef MDC134 +# trbcmd setbit 0x8001 0xc0 0x0018 +# trbcmd setbit 0x8001 0xc1 0x0018 +# trbcmd setbit 0x8001 0xc3 0x0018 +# +# trbcmd clearbit 0x8101 0xc0 0x44 +# trbcmd clearbit 0x8101 0xc1 0x44 +# trbcmd clearbit 0x8101 0xc3 0x44 +# trbcmd clearbit 0x1000 0xc0 0x0c +# trbcmd clearbit 0x1000 0xc1 0x0c +# trbcmd clearbit 0x1000 0xc3 0x0c +# trbcmd clearbit 0x1040 0xc0 0x0c +# trbcmd clearbit 0x1040 0xc1 0x0c +# trbcmd clearbit 0x1040 0xc3 0x0c +# !endif +# +# !ifdef MDC234 +# trbcmd setbit 0x8001 0xc0 0x0018 +# trbcmd setbit 0x8001 0xc1 0x0018 +# trbcmd setbit 0x8001 0xc3 0x0018 +# +# trbcmd clearbit 0x8101 0xc0 0x18 +# trbcmd clearbit 0x8101 0xc1 0x18 +# trbcmd clearbit 0x8101 0xc3 0x18 +# trbcmd clearbit 0x1000 0xc0 0x03 +# trbcmd clearbit 0x1000 0xc1 0x03 +# trbcmd clearbit 0x1000 0xc3 0x03 +# trbcmd clearbit 0x1040 0xc0 0x03 +# trbcmd clearbit 0x1040 0xc1 0x03 +# trbcmd clearbit 0x1040 0xc3 0x03 +# !endif +# +# !ifdef MDC234_p1s24 +# trbcmd setbit 0x8001 0xc0 0x0018 +# trbcmd setbit 0x8001 0xc1 0x0018 +# trbcmd setbit 0x8001 0xc3 0x0018 +# +# trbcmd clearbit 0x8101 0xc0 0x10 +# trbcmd clearbit 0x8101 0xc1 0x10 +# trbcmd clearbit 0x8101 0xc3 0x10 +# trbcmd clearbit 0x1030 0xc0 0x03 +# trbcmd clearbit 0x1030 0xc1 0x03 +# trbcmd clearbit 0x1030 0xc3 0x03 +# trbcmd clearbit 0x1040 0xc0 0x03 +# trbcmd clearbit 0x1040 0xc1 0x03 +# trbcmd clearbit 0x1040 0xc3 0x03 +# !endif +# +# !ifdef MDC234_p1s25 +# trbcmd setbit 0x8001 0xc0 0x0018 +# trbcmd setbit 0x8001 0xc1 0x0018 +# trbcmd setbit 0x8001 0xc3 0x0018 +# +# trbcmd clearbit 0x1000 0xc0 0x03 +# trbcmd clearbit 0x1000 0xc1 0x03 +# trbcmd clearbit 0x1000 0xc3 0x03 +# trbcmd clearbit 0x1020 0xc0 0x03 +# trbcmd clearbit 0x1020 0xc1 0x03 +# trbcmd clearbit 0x1020 0xc3 0x03 +# trbcmd clearbit 0x1030 0xc0 0x03 +# trbcmd clearbit 0x1030 0xc1 0x03 +# trbcmd clearbit 0x1030 0xc3 0x03 +# trbcmd clearbit 0x1040 0xc0 0x03 +# trbcmd clearbit 0x1040 0xc1 0x03 +# trbcmd clearbit 0x1040 0xc3 0x03 +# !endif +# +# !ifdef MDC234_p1s1245 +# trbcmd setbit 0x8001 0xc0 0x0018 +# trbcmd setbit 0x8001 0xc1 0x0018 +# trbcmd setbit 0x8001 0xc3 0x0018 +# +# # trbcmd clearbit 0x1000 0xc0 0x03 +# # trbcmd clearbit 0x1000 0xc1 0x03 +# # trbcmd clearbit 0x1000 0xc3 0x03 +# +# trbcmd clearbit 0x1020 0xc0 0x03 +# trbcmd clearbit 0x1020 0xc1 0x03 +# trbcmd clearbit 0x1020 0xc3 0x03 +# +# trbcmd clearbit 0x1040 0xc0 0x03 +# trbcmd clearbit 0x1040 0xc1 0x03 +# trbcmd clearbit 0x1040 0xc3 0x03 +# !endif + +# +# !ifdef MDC234_p1s1245_p34s2 +# trbcmd setbit 0x8001 0xc0 0x0018 +# trbcmd setbit 0x8001 0xc1 0x0018 +# trbcmd setbit 0x8001 0xc3 0x0018 +# +# trbcmd clearbit 0x8111 0xc0 0x04 +# trbcmd clearbit 0x8111 0xc1 0x04 +# trbcmd clearbit 0x8111 0xc3 0x04 +# +# trbcmd clearbit 0x1020 0xc0 0x03 +# trbcmd clearbit 0x1020 0xc1 0x03 +# trbcmd clearbit 0x1020 0xc3 0x03 +# +# trbcmd clearbit 0x1040 0xc0 0x03 +# trbcmd clearbit 0x1040 0xc1 0x03 +# trbcmd clearbit 0x1040 0xc3 0x03 +# !endif !ifdef MDC - trbcmd setbit 0x8001 0xc0 0x0018 - trbcmd setbit 0x8001 0xc1 0x0018 - trbcmd setbit 0x8001 0xc3 0x0018 + trbcmd setbit 0x8000 0xc0 0x00c0 + trbcmd setbit 0x8000 0xc1 0x00c0 + trbcmd setbit 0x8000 0xc3 0x00c0 !endif !ifdef STARTCTS - trbcmd setbit 0x8001 0xc0 0x0800 - trbcmd setbit 0x8001 0xc1 0x0800 - trbcmd setbit 0x8001 0xc3 0x0800 + trbcmd setbit 0x8002 0xc0 0x0004 + trbcmd setbit 0x8002 0xc1 0x0004 + trbcmd setbit 0x8002 0xc3 0x0004 !endif +trbcmd clearbit 0x8a00 0xc0 0x000c +trbcmd clearbit 0x8a00 0xc1 0x000c +trbcmd clearbit 0x8a00 0xc3 0x000c + #Remove both SCS from Trigger Distribution -trbcmd w 0x8000 0xc0 0xfffffffc -trbcmd w 0x8000 0xc1 0xfffffffc +trbcmd w 0x8000 0xc0 0xfdf #remove pexor from trigger +trbcmd w 0x8000 0xc1 0xfdf #remove pexor from trigger #Remove second CTS board from LVL1/IPU #trbcmd clearbit 0x8801 0xc0 0x10 diff --git a/hub/serials_hub.db b/hub/serials_hub.db index bced94e..fbdec2d 100644 --- a/hub/serials_hub.db +++ b/hub/serials_hub.db @@ -18,3 +18,12 @@ 016 0x5c00000270da6728 017 0x5600000270de5c28 018 0x9a00000270ce4928 + 0335 0x7c0000039021d928 + 0745 0x010000031323a828 + 0755 0xd4000003131c6028 + 0800 0xa70000031349f728 + 0801 0x220000031349f028 + 0802 0x9300000313496028 + 0803 0xcb0000031349e628 + 0805 0x330000031349ed28 + diff --git a/hub/startup.script b/hub/startup.script index 25bfef0..0347e7b 100644 --- a/hub/startup.script +++ b/hub/startup.script @@ -10,7 +10,13 @@ wait #Switch off unused parts of the network + +#For old hub only exec_script{pexor} ../hub/configure_ports.script + + + + wait #Configure GbE load_register register_configgbe.db @@ -19,8 +25,11 @@ wait load_register register_configgbe_ip.db !endif +#Remove TRB3 from this + trbcmd clearbit 0x8801 0xc3 0x10 trbcmd w 0xff7f 0x8000 0x8000 trbcmd w 0xff7f 0x8000 0x0000 + trbcmd setbit 0x8801 0xc3 0x10 # Timeout setting for all hubs trbcmd w 0xfffe 0xc5 0x4000 @@ -34,6 +43,7 @@ wait trbcmd loadbit 0xfe15 0xc5 0xffff0000 0x00080000 trbcmd loadbit 0xfe23 0xc5 0xffff0000 0x00080000 + trbcmd loadbit 0x8900 0xc5 0xffff0000 0x00080000 trbcmd loadbit 0x8101 0xc5 0xffff0000 0x00060000 trbcmd loadbit 0x8111 0xc5 0xffff0000 0x00060000 @@ -61,4 +71,7 @@ wait trbcmd loadbit 0x8800 0xc5 0xffff0000 0x00040000 trbcmd loadbit 0x8001 0xc5 0xffff0000 0x00020000 + trbcmd loadbit 0x8002 0xc5 0xffff0000 0x00020000 + trbcmd loadbit 0x8003 0xc5 0xffff0000 0x00020000 + trbcmd loadbit 0x8004 0xc5 0xffff0000 0x00020000 diff --git a/hub/trb.db b/hub/trb.db index 6879b44..5708f2f 100644 --- a/hub/trb.db +++ b/hub/trb.db @@ -9,4 +9,3 @@ hub etraxp103 hub etraxp104 hub etraxp121 hubcts etraxp107 -hubcentral etraxp023 diff --git a/main/address_range.db b/main/address_range.db index 0eb5656..ba5e4a5 100644 --- a/main/address_range.db +++ b/main/address_range.db @@ -20,6 +20,7 @@ Shw-Hub 0x8500 0x85FF Hub2 TOF-Hub 0x8600 0x86FF Hub2 Wall-Hub 0x8700 0x87FF Hub2 CTS-Hub 0x8800 0x88FF Hub2 +Pion-Hub 0x8900 0x89FF TRB3 TestSetup 0xF000 0xFEFF Test Broadcast 0xFF00 0xFFFF Broadcast Hub-All 0x8000 0x8FFF Hub2 diff --git a/main/data_sources.db b/main/data_sources.db index ced37dd..3667dcc 100644 --- a/main/data_sources.db +++ b/main/data_sources.db @@ -11,8 +11,10 @@ 0x8320 0 RICH56 mid 0x8400 0 RPC123 mid 0x8410 0 RPC456 mid -0x8600 1 TOF low +0x8600 0 TOF low 0x8700 0 FW low +0x8880 1 StartTRB3 low +0x8900 1 Pion1 mid 0x1000 0 MDC12sec1 high 0x1010 0 MDC12sec2 high 0x1020 0 MDC12sec3 mid diff --git a/main/main_hades.script b/main/main_hades.script index 8130635..d671389 100644 --- a/main/main_hades.script +++ b/main/main_hades.script @@ -40,6 +40,7 @@ read_addrange_db ../main/address_range.db read_trb_db ../shower/trb.db !endif + ################################################# #Load FPGA designs ################################################# @@ -109,10 +110,10 @@ wait exec_script{pexor} ../hub/startup.script wait !endif - - !ifndef MDCNOCOMPILETIME - exec_cmd{nofork} check_compile_time oep 0x4c3b2466 - !endif +wait + !ifndef MDCNOCOMPILETIME + exec_cmd{nofork} check_compile_time oep 0x4c3b2466 + !endif #Configuration on TRBs @@ -126,7 +127,7 @@ wait !endif !ifndef NOSTARTCTS - exec_script{start} ../start/configure_startveto.script + exec_script{start} ../start/configure_startveto.script !endif !ifndef NOTOF @@ -137,18 +138,24 @@ wait !ifndef NOCTS exec_script{blr} ../cts/configure_blr.script !endif - +wait #MDC !ifndef NOMDC exec_cmd{con} echo "Configure MDC" exec_script{pexor} ../mdc/startup.script !endif - +wait #RICH !ifndef NORICH exec_cmd{con} echo "Configure RICH" exec_script{pexor} ../rich/startup.script !endif + +#Pion + !ifndef NOPION + exec_cmd{con} echo "Configure Pion" + exec_script{pexor} ../pion/startup.script + !endif wait @@ -170,7 +177,7 @@ wait exec_script{local} ../wall/startup.script !endif -#Start/Veto + #Start/Veto !ifndef NOSTARTCTS exec_cmd{local} echo "Configure Start/Veto" exec_script{local} ../start/startup.script diff --git a/main/startup.pl b/main/startup.pl index d5ec5a8..1d7068c 100755 --- a/main/startup.pl +++ b/main/startup.pl @@ -2223,20 +2223,21 @@ sub statusServer() LocalAddr => "192.168.100.50", Broadcast => 1, Reuse => 1) - or die "Can't bind : $@\n"; + or return;#or die "Can't bind : $@\n"; #- Inform all clients that DAQ is being restarted $sock_udp->send("STARTING") or die("Socket send error $!"); close($sock_udp); #- Start TCP server - my $sock = new IO::Socket::INET( LocalAddr => "192.168.100.50", - LocalPort => 1972, - Proto => 'tcp', - Listen => SOMAXCONN, - Reuse => 1); - - $sock or die "Cannot bind socket :$!"; +my $sock; +# my $sock = new IO::Socket::INET( LocalAddr => "192.168.100.50", +# LocalPort => 1972, +# Proto => 'tcp', +# Listen => SOMAXCONN, +# Reuse => 1); + + $sock or return; #die "Cannot bind socket :$!"; STDOUT->autoflush(1); diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh index 6a509f4..03e1251 100755 --- a/main/startup_briccolage.sh +++ b/main/startup_briccolage.sh @@ -21,12 +21,13 @@ notifyall.sh "DAQ" " DAQ is going to be restarted." "STARTUP" & ssh hades31 "pgrep trbnetd 1>/dev/null || trbnetd" echo " Enable ports..." + trbcmd w 0xfffe 0xc5 0x4000 # switchport.pl 0x1040 0 off # P0S3 missing - mounting #Switch on all MDC OEPs, small workaround for one broken hardware port: switchport.pl 0x1030 0 off - switchport.pl 0xfe11 all on + switchport.pl 0xfe11 all on switchport.pl 0x1030 0 on trbcmd w 0x1031 0xc0 0xfbf #one hardware port is not working, but nothing connected trbcmd w 0x1031 0xc1 0xfbf #one hardware port is not working, but nothing connected @@ -60,7 +61,7 @@ notifyall.sh "DAQ" " DAQ is going to be restarted." "STARTUP" & time ./startup.pl -f main_hades.script -eb off -o file \ -m TOF -m RPC -m WALL -m RICH -m SHOWER \ -m STARTCTS -m NORESET -m CONFIGONLY -m MON_CTS \ - -m MDC -m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv + -m NOMDC #-m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv ######################################## ### DO NOT CHANGE ANY MDC SETTINGS HERE - without changing them in reviveoep.pl as well!!!!!! diff --git a/main/subevtids.db b/main/subevtids.db index 7dc475d..9315004 100644 --- a/main/subevtids.db +++ b/main/subevtids.db @@ -31,5 +31,6 @@ 0x8600 #Hub2 0x8700 #Hub2 0x8800 #Hub2 +0x8880 #StartTRB3 0x8900 #Pion1 0x8910 #Pion2 diff --git a/nettools/nettracedb.pl b/nettools/nettracedb.pl index 9963a32..657a98e 100755 --- a/nettools/nettracedb.pl +++ b/nettools/nettracedb.pl @@ -8,7 +8,7 @@ use Storable; $Data::Dumper::Purity = 1; -my $dbfile="/home/hadaq/trbsoft/daq/tools/nettrace.db"; +my $dbfile="/home/hadaq/trbsoft/hadesdaq/nettools/nettrace.db"; my $hublist; sub usage { diff --git a/rich/register_thresholds.db b/rich/register_thresholds.db index fa5cca7..a0f6435 120000 --- a/rich/register_thresholds.db +++ b/rich/register_thresholds.db @@ -1 +1 @@ -/home/hadaq/trbsoft/daq/rich/peds/ri1332909181501/register_thresholds.db \ No newline at end of file +/home/hadaq/trbsoft/daq/rich/peds/ri1333906050801/register_thresholds.db \ No newline at end of file diff --git a/start/addresses_start.db b/start/addresses_start.db index 12e43b3..ec68213 100644 --- a/start/addresses_start.db +++ b/start/addresses_start.db @@ -2,4 +2,9 @@ ################################################### 0x4000 082 1 17 082 0x4010 107 1 21 107 -0x4001 076 1 21 076 \ No newline at end of file +0x4001 076 1 21 076 + +0x5000 0740 0 0 0 +0x5001 0741 1 0 0 +0x5002 0742 2 0 0 +0x5003 0743 3 0 0 diff --git a/start/serials_start.db b/start/serials_start.db index 471bec9..e7c65ad 100644 --- a/start/serials_start.db +++ b/start/serials_start.db @@ -5,4 +5,8 @@ 082 0xe2000001fc5dbd28 107 0x59000001c1711828 076 0x36000001fc5df528 + 0740 0x6800000313245528 + 0741 0x6e00000313246028 + 0742 0xa700000313245f28 + 0743 0x3100000313245628 diff --git a/start/startup.script b/start/startup.script index f2a3b2e..be8db16 100644 --- a/start/startup.script +++ b/start/startup.script @@ -4,3 +4,11 @@ set_addresses serials_start.db addresses_start.db #addresses for Start/Veto TRB !endif + + + +#TRB3 settings +trbcmd w 0x5000 0xc801 0x000f0000 +trbcmd w 0x5001 0xc801 0x000f0000 +trbcmd w 0x5002 0xc801 0x000f0000 +trbcmd w 0x5003 0xc801 0x000f0000 \ No newline at end of file -- 2.43.0