Merge pull request #22784 from thomreis/l1t_fedintegrity_update

L1T DQM FEDIntegrity update to stage2
cms-sw · Apr 3, 2018 · 31cf3a4 · 31cf3a4
2 parents 62f86a2 + 5cbd315
commit 31cf3a4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git 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
@@ -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
+
diff --git 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;i<l1feds_.size();i++){
     ostringstream sfed;
     sfed << l1feds_[i];
     fedentries->setBinLabel(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.);