Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

synching to 72X online configuration #6335

Merged
merged 1 commit into from Nov 11, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 25 additions & 10 deletions DQM/Integration/python/test/ecal_dqm_sourceclient-live_cfg.py
Expand Up @@ -80,7 +80,8 @@
)

process.ecalPhysicsFilter = cms.EDFilter("EcalMonitorPrescaler",
clusterPrescaleFactor = cms.untracked.int32(1),
cosmics = cms.untracked.uint32(1),
physics = cms.untracked.uint32(1),
EcalRawDataCollection = cms.InputTag("ecalDigis")
)

Expand All @@ -96,17 +97,29 @@
threshold = cms.untracked.string('WARNING'),
noLineBreaks = cms.untracked.bool(True)
),
categories = cms.untracked.vstring('EcalLaserDbService'),
destinations = cms.untracked.vstring('cerr')
cout = cms.untracked.PSet(
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
EcalDQM = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
threshold = cms.untracked.string('INFO')
),
categories = cms.untracked.vstring('EcalDQM',
'EcalLaserDbService'),
destinations = cms.untracked.vstring('cerr',
'cout')
)

process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(-1)
)

process.simEcalTriggerPrimitiveDigis.InstanceEB = "ebDigis"
process.simEcalTriggerPrimitiveDigis.InstanceEE = "eeDigis"
process.simEcalTriggerPrimitiveDigis.Label = "ecalDigis"
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.GlobalTag.toGet = cms.VPSet(cms.PSet(
record = cms.string('EcalDQMChannelStatusRcd'),
Expand All @@ -127,10 +140,12 @@

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.simEcalTriggerPrimitiveDigis.InstanceEB = "ebDigis"
process.simEcalTriggerPrimitiveDigis.InstanceEE = "eeDigis"
process.simEcalTriggerPrimitiveDigis.Label = "ecalDigis"

process.ecalRecHit.EEuncalibRecHitCollection = "ecalGlobalUncalibRecHit:EcalUncalibRecHitsEE"
process.ecalRecHit.EBuncalibRecHitCollection = "ecalGlobalUncalibRecHit:EcalUncalibRecHitsEB"

process.ecalMonitorTask.workers = ['ClusterTask', 'EnergyTask', 'IntegrityTask', 'OccupancyTask', 'RawDataTask', 'TimingTask', 'TrigPrimTask', 'PresampleTask', 'SelectiveReadoutTask']
process.ecalMonitorTask.verbosity = 0
Expand Down
58 changes: 33 additions & 25 deletions DQM/Integration/python/test/ecalcalib_dqm_sourceclient-live_cfg.py
Expand Up @@ -37,8 +37,19 @@
threshold = cms.untracked.string('WARNING'),
noLineBreaks = cms.untracked.bool(True)
),
categories = cms.untracked.vstring('EcalLaserDbService'),
destinations = cms.untracked.vstring('cerr')
cout = cms.untracked.PSet(
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
EcalDQM = cms.untracked.PSet(
limit = cms.untracked.int32(-1)
),
threshold = cms.untracked.string('INFO')
),
categories = cms.untracked.vstring('EcalDQM',
'EcalLaserDbService'),
destinations = cms.untracked.vstring('cerr',
'cout')
)

process.maxEvents = cms.untracked.PSet(
Expand All @@ -62,19 +73,19 @@
)

process.ecalLaserLedFilter = cms.EDFilter("EcalMonitorPrescaler",
laserPrescaleFactor = cms.untracked.int32(1),
ledPrescaleFactor = cms.untracked.int32(1),
laser = cms.untracked.uint32(1),
led = cms.untracked.uint32(1),
EcalRawDataCollection = cms.InputTag("ecalDigis")
)

process.ecalPedestalFilter = cms.EDFilter("EcalMonitorPrescaler",
EcalRawDataCollection = cms.InputTag("ecalDigis"),
pedestalPrescaleFactor = cms.untracked.int32(1)
pedestal = cms.untracked.uint32(1),
EcalRawDataCollection = cms.InputTag("ecalDigis")
)

process.ecalTestPulseFilter = cms.EDFilter("EcalMonitorPrescaler",
testpulsePrescaleFactor = cms.untracked.int32(1),
EcalRawDataCollection = cms.InputTag("ecalDigis")
EcalRawDataCollection = cms.InputTag("ecalDigis"),
testPulse = cms.untracked.uint32(1)
)

process.ecalDigis = cms.EDProducer("EcalRawToDigi",
Expand Down Expand Up @@ -128,14 +139,6 @@
memUnpacking = cms.bool(True)
)

process.ecalCalibrationFilter = cms.EDFilter("EcalMonitorPrescaler",
laserPrescaleFactor = cms.untracked.int32(1),
testpulsePrescaleFactor = cms.untracked.int32(1),
ledPrescaleFactor = cms.untracked.int32(1),
EcalRawDataCollection = cms.InputTag("ecalDigis"),
pedestalPrescaleFactor = cms.untracked.int32(1)
)

process.ecalTestPulseUncalibRecHit = cms.EDProducer("EcalUncalibRecHitProducer",
EBdigiCollection = cms.InputTag("ecalDigis","ebDigis"),
EEhitCollection = cms.string('EcalUncalibRecHitsEE'),
Expand All @@ -153,11 +156,16 @@

process.DQMStore.referenceFileName = "/dqmdata/dqm/reference/ecalcalib_reference.root"

process.ecalPNDiodeMonitorTask.verbosity = 0
process.ecalPNDiodeMonitorTask.commonParameters.onlineMode = True
process.ecalPedestalMonitorTask.verbosity = 0
process.ecalPedestalMonitorTask.commonParameters.onlineMode = True

process.dqmSaver.convention = cms.untracked.string('Online')

process.ecalLaserLedMonitorTask.verbosity = 0
process.ecalLaserLedMonitorTask.collectionTags.EBLaserLedUncalibRecHit = "ecalLaserLedUncalibRecHit:EcalUncalibRecHitsEB"
process.ecalLaserLedMonitorTask.collectionTags.EELaserLedUncalibRecHit = "ecalLaserLedUncalibRecHit:EcalUncalibRecHitsEE"
process.ecalLaserLedMonitorTask.commonParameters.onlineMode = True

process.GlobalTag.toGet = cms.VPSet(cms.PSet(
record = cms.string('EcalDQMChannelStatusRcd'),
tag = cms.string('EcalDQMChannelStatus_v1_hlt'),
Expand All @@ -169,15 +177,15 @@
connect = cms.untracked.string('frontier://(proxyurl=http://frontier.cms:3128)(serverurl=http://frontier.cms:8000/FrontierOnProd)(serverurl=http://frontier.cms:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_34X_ECAL')
))

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.ecalRecHit.EEuncalibRecHitCollection = "ecalGlobalUncalibRecHit:EcalUncalibRecHitsEE"
process.ecalRecHit.EBuncalibRecHitCollection = "ecalGlobalUncalibRecHit:EcalUncalibRecHitsEB"

process.ecalPNDiodeMonitorTask.verbosity = 0
process.ecalPNDiodeMonitorTask.commonParameters.onlineMode = True

process.dqmEnv.subSystemFolder = cms.untracked.string('EcalCalibration')

### Sequences ###
Expand All @@ -190,7 +198,7 @@
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.ecalRecoSequence+process.ecalPedestalMonitorTask+process.ecalPNDiodeMonitorTask)
process.ecalClientPath = cms.Path(process.preScaler+process.ecalPreRecoSequence+process.ecalCalibrationFilter+process.ecalCalibMonitorClient)
process.ecalClientPath = cms.Path(process.ecalCalibMonitorClient)

process.dqmEndPath = cms.EndPath(process.dqmEnv)
process.dqmOutputPath = cms.EndPath(process.dqmSaver)
Expand Down