Merge pull request #5779 from yiiyama/ecaldqm-online-config-73X

synching 71X and 73X
cms-sw · Oct 13, 2014 · fbacce0 · fbacce0
2 parents 590b9d7 + 0899197
commit fbacce0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/DQM/Integration/python/test/ecal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/ecal_dqm_sourceclient-live_cfg.py
@@ -1,5 +1,4 @@
 ### AUTO-GENERATED CMSRUN CONFIGURATION FOR ECAL DQM ###
-
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("process")
@@ -12,7 +11,7 @@
 process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
 process.load("Geometry.EcalMapping.EcalMapping_cfi")
 process.load("Geometry.EcalMapping.EcalMappingRecord_cfi")
-process.load("RecoLocalCalo.EcalRecProducers.ecalMultiFitUncalibRecHit_cfi")
+process.load("RecoLocalCalo.EcalRecProducers.ecalGlobalUncalibRecHit_cfi")
 process.load("RecoLocalCalo.EcalRecProducers.ecalDetIdToBeRecovered_cfi")
 process.load("RecoLocalCalo.EcalRecProducers.ecalRecHit_cfi")
 process.load("RecoLocalCalo.EcalRecAlgos.EcalSeverityLevelESProducer_cfi")
@@ -90,10 +89,14 @@
         default = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
         ),
-        threshold = cms.untracked.string('WARNING'),
+        EcalLaserDbService = cms.untracked.PSet(
+            limit = cms.untracked.int32(10)
+        ),
         noTimeStamps = cms.untracked.bool(True),
+        threshold = cms.untracked.string('WARNING'),
         noLineBreaks = cms.untracked.bool(True)
     ),
+    categories = cms.untracked.vstring('EcalLaserDbService'),
     destinations = cms.untracked.vstring('cerr')
 )
 
@@ -122,27 +125,31 @@
 
 process.dqmEnv.subSystemFolder = cms.untracked.string('Ecal')
 
+process.dqmSaver.convention = cms.untracked.string('Online')
+
 process.ecalMonitorClient.verbosity = 0
 process.ecalMonitorClient.workers = ['IntegrityClient', 'OccupancyClient', 'PresampleClient', 'RawDataClient', 'TimingClient', 'SelectiveReadoutClient', 'TrigPrimClient', 'SummaryClient']
 process.ecalMonitorClient.workerParameters.SummaryClient.params.activeSources = ['Integrity', 'RawData', 'Presample', 'TriggerPrimitives', 'Timing', 'HotCell']
 process.ecalMonitorClient.commonParameters.onlineMode = True
 
 process.ecalMonitorTask.workers = ['ClusterTask', 'EnergyTask', 'IntegrityTask', 'OccupancyTask', 'RawDataTask', 'TimingTask', 'TrigPrimTask', 'PresampleTask', 'SelectiveReadoutTask']
 process.ecalMonitorTask.verbosity = 0
+process.ecalMonitorTask.collectionTags.EEUncalibRecHit = "ecalGlobalUncalibRecHit:EcalUncalibRecHitsEE"
 process.ecalMonitorTask.collectionTags.EESuperCluster = "multi5x5SuperClusters:multi5x5EndcapSuperClusters"
 process.ecalMonitorTask.collectionTags.EBBasicCluster = "hybridSuperClusters:hybridBarrelBasicClusters"
 process.ecalMonitorTask.collectionTags.EEBasicCluster = "multi5x5SuperClusters:multi5x5EndcapBasicClusters"
 process.ecalMonitorTask.collectionTags.Source = "rawDataCollector"
 process.ecalMonitorTask.collectionTags.EBSuperCluster = "correctedHybridSuperClusters"
 process.ecalMonitorTask.collectionTags.TrigPrimEmulDigi = "simEcalTriggerPrimitiveDigis"
+process.ecalMonitorTask.collectionTags.EBUncalibRecHit = "ecalGlobalUncalibRecHit:EcalUncalibRecHitsEB"
 process.ecalMonitorTask.workerParameters.TrigPrimTask.params.runOnEmul = True
 process.ecalMonitorTask.commonParameters.willConvertToEDM = False
 process.ecalMonitorTask.commonParameters.onlineMode = True
 
 ### Sequences ###
 
 process.ecalPreRecoSequence = cms.Sequence(process.ecalDigis)
-process.ecalRecoSequence = cms.Sequence((process.ecalMultiFitUncalibRecHit+process.ecalDetIdToBeRecovered+process.ecalRecHit)+(process.simEcalTriggerPrimitiveDigis+process.gtDigis)+(process.hybridClusteringSequence+process.multi5x5ClusteringSequence))
+process.ecalRecoSequence = cms.Sequence((process.ecalGlobalUncalibRecHit+process.ecalDetIdToBeRecovered+process.ecalRecHit)+(process.simEcalTriggerPrimitiveDigis+process.gtDigis)+(process.hybridClusteringSequence+process.multi5x5ClusteringSequence))
 process.multi5x5ClusteringSequence = cms.Sequence(process.multi5x5BasicClustersCleaned+process.multi5x5SuperClustersCleaned+process.multi5x5BasicClustersUncleaned+process.multi5x5SuperClustersUncleaned+process.multi5x5SuperClusters)
 process.hybridClusteringSequence = cms.Sequence(process.cleanedHybridSuperClusters+process.uncleanedHybridSuperClusters+process.hybridSuperClusters+process.correctedHybridSuperClusters+process.uncleanedOnlyCorrectedHybridSuperClusters)
 

diff --git a/DQM/Integration/python/test/ecalcalib_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/ecalcalib_dqm_sourceclient-live_cfg.py
@@ -1,5 +1,4 @@
 ### AUTO-GENERATED CMSRUN CONFIGURATION FOR ECAL DQM ###
-
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("process")
@@ -31,10 +30,14 @@
         default = cms.untracked.PSet(
             limit = cms.untracked.int32(-1)
         ),
-        threshold = cms.untracked.string('WARNING'),
+        EcalLaserDbService = cms.untracked.PSet(
+            limit = cms.untracked.int32(10)
+        ),
         noTimeStamps = cms.untracked.bool(True),
+        threshold = cms.untracked.string('WARNING'),
         noLineBreaks = cms.untracked.bool(True)
     ),
+    categories = cms.untracked.vstring('EcalLaserDbService'),
     destinations = cms.untracked.vstring('cerr')
 )
 
@@ -81,7 +84,7 @@
     syncCheck = cms.bool(True),
     feIdCheck = cms.bool(True),
     silentMode = cms.untracked.bool(True),
-    InputLabel = cms.InputTag("rawDataCollector"),
+    InputLabel = cms.InputTag("hltEcalCalibrationRaw"),
     orderedFedList = cms.vint32(601, 602, 603, 604, 605, 
         606, 607, 608, 609, 610, 
         611, 612, 613, 614, 615, 
@@ -142,12 +145,18 @@
 )
 
 process.ecalCalibMonitorClient.verbosity = 0
+process.ecalCalibMonitorClient.commonParameters.onlineMode = True
 
 process.preScaler.prescaleFactor = 1
 
+process.source.streamLabel = "streamDQMCalibration"
+
 process.DQMStore.referenceFileName = "/dqmdata/dqm/reference/ecalcalib_reference.root"
 
 process.ecalPNDiodeMonitorTask.verbosity = 0
+process.ecalPNDiodeMonitorTask.commonParameters.onlineMode = True
+
+process.dqmSaver.convention = cms.untracked.string('Online')
 
 process.GlobalTag.toGet = cms.VPSet(cms.PSet(
     record = cms.string('EcalDQMChannelStatusRcd'),
@@ -161,10 +170,13 @@
     ))
 
 process.ecalLaserLedMonitorTask.verbosity = 0
+process.ecalLaserLedMonitorTask.commonParameters.onlineMode = True
 
 process.ecalPedestalMonitorTask.verbosity = 0
+process.ecalPedestalMonitorTask.commonParameters.onlineMode = True
 
 process.ecalTestPulseMonitorTask.verbosity = 0
+process.ecalTestPulseMonitorTask.commonParameters.onlineMode = True
 
 process.dqmEnv.subSystemFolder = cms.untracked.string('EcalCalibration')
 
@@ -177,8 +189,8 @@
 
 process.ecalLaserLedPath = cms.Path(process.preScaler+process.ecalPreRecoSequence+process.ecalLaserLedFilter+process.ecalRecoSequence+process.ecalLaserLedUncalibRecHit+process.ecalLaserLedMonitorTask+process.ecalPNDiodeMonitorTask)
 process.ecalTestPulsePath = cms.Path(process.preScaler+process.ecalPreRecoSequence+process.ecalTestPulseFilter+process.ecalRecoSequence+process.ecalTestPulseUncalibRecHit+process.ecalTestPulseMonitorTask+process.ecalPNDiodeMonitorTask)
-process.ecalPedestalPath = cms.Path(process.preScaler+process.ecalPreRecoSequence+process.ecalPedestalFilter+process.ecalPedestalFilter+process.ecalRecoSequence+process.ecalPedestalMonitorTask+process.ecalPNDiodeMonitorTask)
-process.ecalClientPath = cms.Path(process.preScaler+process.ecalPreRecoSequence+process.ecalCalibrationFilter+process.ecalCalibrationFilter+process.ecalCalibMonitorClient)
+process.ecalPedestalPath = cms.Path(process.preScaler+process.ecalPreRecoSequence+process.ecalPedestalFilter+process.ecalRecoSequence+process.ecalPedestalMonitorTask+process.ecalPNDiodeMonitorTask)
+process.ecalClientPath = cms.Path(process.preScaler+process.ecalPreRecoSequence+process.ecalCalibrationFilter+process.ecalCalibMonitorClient)
 
 process.dqmEndPath = cms.EndPath(process.dqmEnv)
 process.dqmOutputPath = cms.EndPath(process.dqmSaver)