From 247da1ddfc7047dc8c0eae42c9b93b904a1a7499 Mon Sep 17 00:00:00 2001 From: Thomas Reis Date: Wed, 28 Mar 2018 18:37:07 +0200 Subject: [PATCH 1/3] Replace legacy L1 FED monitoring with upgrade FED monitoring. --- .../clients/fed_dqm_sourceclient-live_cfg.py | 10 +++++----- DQM/L1TMonitor/python/L1TStage2FED_cff.py | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 DQM/L1TMonitor/python/L1TStage2FED_cff.py diff --git a/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py index 791e42e1cdaa8..c79fd06451e64 100644 --- a/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py @@ -29,9 +29,9 @@ folder_name = 'FEDIntegrity_EvF' # L1T sequence: -process.load('DQM.L1TMonitor.L1TFED_cfi') +process.load('DQM.L1TMonitor.L1Tstage2FED_cff') # stage2 L1T path = 'L1T/%s/' % folder_name -process.l1tfed.FEDDirName = cms.untracked.string(path) +process.l1tStage2Fed.FEDDirName = cms.untracked.string(path) # Pixel sequence: process.load('Configuration.StandardSequences.MagneticField_cff') process.load('EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi') @@ -80,7 +80,7 @@ # Setting raw data collection label for all subsytem modules, depending on run type: if (process.runType.getRunType() == process.runType.hi_run): - process.l1tfed.rawTag = cms.InputTag('rawDataRepacker') + process.l1tStage2Fed.rawTag = cms.InputTag('rawDataRepacker') process.siPixelDigis.InputLabel = cms.InputTag('rawDataRepacker') process.SiPixelHLTSource.RawInput = cms.InputTag('rawDataRepacker') process.siStripFEDCheck.RawDataTag = cms.InputTag('rawDataRepacker') @@ -93,7 +93,7 @@ process.rpcunpacker.InputLabel = cms.InputTag('rawDataRepacker') process.cscDQMEvF.InputObjects = cms.untracked.InputTag('rawDataRepacker') else: - process.l1tfed.rawTag = cms.InputTag('rawDataCollector') + process.l1tStage2Fed.rawTag = cms.InputTag('rawDataCollector') process.siPixelDigis.InputLabel = cms.InputTag('rawDataCollector') process.SiPixelHLTSource.RawInput = cms.InputTag('rawDataCollector') process.siStripFEDCheck.RawDataTag = cms.InputTag('rawDataCollector') @@ -114,7 +114,7 @@ # Modules for the FED process.FEDModulesPath = cms.Path( - process.l1tfed + process.l1tStage2Fed + process.siPixelDigis + process.SiPixelHLTSource + process.siStripFEDCheck diff --git a/DQM/L1TMonitor/python/L1TStage2FED_cff.py b/DQM/L1TMonitor/python/L1TStage2FED_cff.py new file mode 100644 index 0000000000000..bd21bc1db1558 --- /dev/null +++ b/DQM/L1TMonitor/python/L1TStage2FED_cff.py @@ -0,0 +1,14 @@ +from DQM.L1TMonitor.L1TFED_cfi import * + +l1tStage2Fed = l1tfed.clone() +l1tStage2Fed.L1FEDS = cms.vint32( + 1354, 1356, 1358, # CALOL1 + 1360, # CALOL2 + 1376, 1377, # BMTF + 1380, 1381, # OMTF + 1384, 1385, # EMTF + 1386, # CPPF + 1402, # GMT + 1404, # UGT + 1405) # UGTSPARE + From 12864846c9fe2fbc688f75f3b69a8003987b95db Mon Sep 17 00:00:00 2001 From: Thomas Reis Date: Wed, 28 Mar 2018 18:48:14 +0200 Subject: [PATCH 2/3] Increase maximal FED size and label bins of profile histogram. --- DQM/L1TMonitor/src/L1TFED.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DQM/L1TMonitor/src/L1TFED.cc b/DQM/L1TMonitor/src/L1TFED.cc index 161d4d83e1c42..b3b16a4a5b789 100755 --- a/DQM/L1TMonitor/src/L1TFED.cc +++ b/DQM/L1TMonitor/src/L1TFED.cc @@ -34,13 +34,14 @@ void L1TFED::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & iRun, fedentries = ibooker.book1D("FEDEntries", "Fed ID occupancy", l1feds_.size(), 0.,l1feds_.size() ); fedfatal = ibooker.book1D("FEDFatal", "Fed ID non present ", l1feds_.size(), 0., l1feds_.size()); fednonfatal = ibooker.book1D("FEDNonFatal", "Fed corrupted data ", l1feds_.size(), 0.,l1feds_.size() ); - hfedprof = ibooker.bookProfile("fedprofile","FED Size by ID", l1feds_.size(), 0., l1feds_.size(),0,0.,5000.); + hfedprof = ibooker.bookProfile("fedprofile","FED Size by ID", l1feds_.size(), 0., l1feds_.size(),0,0.,10000.); for(unsigned int i=0;isetBinLabel(i+1,"FED "+ sfed.str()); fedfatal->setBinLabel(i+1,"FED "+ sfed.str()); fednonfatal->setBinLabel(i+1,"FED "+ sfed.str()); + hfedprof->setBinLabel(i+1,"FED "+ sfed.str()); } hfedsize = ibooker.book1D("fedsize","FED Size Distribution",100,0.,10000.); From 5cbd3157bada1e896bd4663d97d1c0727adc1876 Mon Sep 17 00:00:00 2001 From: Thomas Reis Date: Thu, 29 Mar 2018 09:44:11 +0200 Subject: [PATCH 3/3] Fix typo. --- DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py index c79fd06451e64..9aa9d9c373b70 100644 --- a/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py @@ -29,7 +29,7 @@ folder_name = 'FEDIntegrity_EvF' # L1T sequence: -process.load('DQM.L1TMonitor.L1Tstage2FED_cff') # stage2 L1T +process.load('DQM.L1TMonitor.L1TStage2FED_cff') # stage2 L1T path = 'L1T/%s/' % folder_name process.l1tStage2Fed.FEDDirName = cms.untracked.string(path) # Pixel sequence: