From 9b6c051548d9c21f473e9abebf041fc8e07f16b6 Mon Sep 17 00:00:00 2001 From: hadaq Date: Wed, 6 Feb 2019 14:18:45 +0100 Subject: [PATCH] cleanup 6-feb-2019 cs --- users/gsi_dirc/dmon_config.pl | 60 ++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/users/gsi_dirc/dmon_config.pl b/users/gsi_dirc/dmon_config.pl index 74c38ed..c6a4fcf 100755 --- a/users/gsi_dirc/dmon_config.pl +++ b/users/gsi_dirc/dmon_config.pl @@ -15,31 +15,40 @@ activeScripts => [['time','ping','-','-','daqop'], #Names to be shown in left column of Overview (max 4 letters!) qaNames => ['sys','main','beam','rate','Pdwa','Heat','EB'], -#Expected number of FPGAs in system (50 minus two switchport blocks of MCP-TOF 1/2 -NumberOfFpga => 48, -NumberOfPadiwa => 87, +NumberOfFpga => 39, +NumberOfPadiwa => 59, #The address of the individual boards -CtsAddress => 0x7999, +CtsAddress => 0xc000, PadiwaBroadcastAddress => 0xfe4c, PadiwaTrbAddresses => [0x2000,0x2001,0x2002,0x2003,0x2004,0x2005,0x2006,0x2007, 0x2008,0x2009,0x200a,0x200b,0x200c,0x200d,0x200e,0x200f, - 0x2010,0x2011,0x2012,0x2013,0x2014,0x2015,0x2016,0x2018, - 0x2019,0x201a,0x201c,0x201d], -PadiwaChainMask => [0x0007,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007, - 0x0006,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007, - 0x0007,0x0007,0x0007,0x0007,0x0001,0x0003,0x0003,0x0001, - 0x0003,0x0003,0x0001,0x0003], + 0x2014,0x2015, + #0x2016,0x2017, + 0x2018,0x2019, + #0x201a,0x201b, + 0x201c,0x201d], +PadiwaChainMask => [0x0007,0x0001,0x0004,0x0001,0x0007,0x0001,0x0004,0x0007, + 0x0004,0x0001,0x0004,0x0007,0x0007,0x0001,0x0000,0x0007, + 0x0001,0x0001,0x0001,0x0001, + 0x0001,0x0001,0x0001,0x0001,0x003,0x0001], + ## 0x0001,0x0003,0x0003,0x0001, +# 0x0007,0x0001, +# 0x0001,0x0003], +# 0x0003,0x0003,0x0001,0x0003], #0x2020,0x2023, no padiwa #,0x201d,0x201e,0x201f off #0x2029,0x202a,0x202b,0x202c,0x202d,0x202e,0x202f -OtherTrbAddresses => [0x7999,0x202c,0x202d], +#old OtherTrbAddresses => [0xc00,0x202c,0x202d], +OtherTrbAddresses => [0xc000], -HubTrbAddresses => [0x8100,0x8101,0x8102,0x8103,0x8000,0X8001,0x8002,0x8003,0x8004,0x8005,0x8006,0x8007,0x8008], + +##HubTrbAddresses => [0x8100,0x8101,0x8102,0x8103,0x8000,0X8001,0x8002,0x8003,0x8004,0x8005,0x8006,0x8007,0x8008], +HubTrbAddresses => [0x8000,0X8001,0x8002,0x8003,0x8004,0x8005,0x8006,0x8007], #Addresses of all TDCs. Either single or broadcast addresses @@ -47,27 +56,26 @@ TdcAddress => [0xfe4c,0xfe48,0xfe4a], #IPs of all devices which should react on a ping TrbIP => [ - "192.168.0.72", "192.168.0.99", "192.168.0.73", - "192.168.0.74", + "192.168.0.72", "192.168.0.104", + "192.168.0.57", "192.168.0.97", "192.168.0.59", - "192.168.0.89", - "192.168.0.57", - "192.168.10.56" + "192.168.0.83", + "192.168.0.56" ], #Channel to read spill intensity from. Give limit for off-spill detection -BeamTRB => 0x202c, +BeamTRB => 0x2011, BeamChan => 0xc001, SpillThreshold => 50, #Name detectors -BeamDetectorsTrb => [0x202c,0x202c,0x202c,0x2014,0x2018], -BeamDetectorsChan => [0xc001,0xc003,0xc002,0xc001,0xc001], -BeamDetectorsName => ['Trig1','Trig2','Laser1','MCP1','MCP2'], +BeamDetectorsTrb => [0x2011,0x2011,0x2011,0x201c,0x201c], +BeamDetectorsChan => [0xc001,0xc002,0xc003,0xc001,0xc003], +BeamDetectorsName => ['Trig1','Trig2','Trig3','MCP1','MCP2'], #BeamDetectorsTrb => [0x0110, 0x0110, 0x0111,0x0110,0x0111,0x0110,0x0113,0x0111,0x0110], #BeamDetectorsChan => [0xc001, 0xc003, 0xc001,0xc009,0xc005,0xc00b,0xc009,0xc009,0xc005], #BeamDetectorsName => ['Fngr_d', 'Lead_d', 'C1', 'C1_d', 'C2', 'C2_d', 'Lead1', 'Lead2', 'Hodo'], @@ -79,10 +87,10 @@ UserDirectory => '/home/hadaq/trbsoft/daqtools/users/gsi_dirc/', #BarrelDirc Heatmap settings HeatmapDirc => { # upper limit for high end of color scale -# max_count_uclamp => 100000000, -# max_count_uclamp =>500, -# max_count_uclamp => 5000, -# max_count_uclamp => 10000, + max_count_uclamp => 100000000, +# max_count_uclamp => 100000, +# max_count_uclamp => 20000, +# max_count_uclamp => 4000, # lower limit for high end of color scale max_count_lclamp => 10, @@ -98,7 +106,7 @@ HeatmapDircZoom => { # upper limit for high end of color scale # max_count_uclamp => 100000000, # max_count_uclamp =>500, - max_count_uclamp => 5000, + max_count_uclamp =>20000, # lower limit for high end of color scale max_count_lclamp => 10, -- 2.43.0