From 00ed37ac4fa8aa1d915bc44fcd3d7acd10deed88 Mon Sep 17 00:00:00 2001 From: Mark Grimes Date: Mon, 16 Nov 2015 18:49:55 +0100 Subject: [PATCH 1/2] Add the "isUpgrade" parameter to loads of analyzers and set it to true if pixel phase 1 era is active --- .../python/SiPixelMonitorCluster_cfi.py | 7 +++++++ DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py | 7 +++++++ .../python/SiPixelMonitorRawData_cfi.py | 8 +++++++- .../python/SiPixelMonitorRecHit_cfi.py | 8 ++++++++ .../python/SiPixelMonitorEfficiency_cfi.py | 8 ++++++++ DQM/SiPixelMonitorTrack/python/SiPixelMonitorTrack_cfi.py | 8 ++++++++ 6 files changed, 45 insertions(+), 1 deletion(-) diff --git a/DQM/SiPixelMonitorCluster/python/SiPixelMonitorCluster_cfi.py b/DQM/SiPixelMonitorCluster/python/SiPixelMonitorCluster_cfi.py index 8eac0b62255f0..0c5a83448d405 100644 --- a/DQM/SiPixelMonitorCluster/python/SiPixelMonitorCluster_cfi.py +++ b/DQM/SiPixelMonitorCluster/python/SiPixelMonitorCluster_cfi.py @@ -1,5 +1,10 @@ import FWCore.ParameterSet.Config as cms +# +# This object is used to make changes for different running scenarios +# +from Configuration.StandardSequences.Eras import eras + SiPixelClusterSource = cms.EDAnalyzer("SiPixelClusterSource", TopFolderName = cms.string('Pixel'), src = cms.InputTag("siPixelClusters"), @@ -20,3 +25,5 @@ bigEventSize = cms.untracked.int32(100) ) +# Modify for if the phase 1 pixel detector is active +eras.phase1Pixel.toModify( SiPixelClusterSource, isUpgrade=cms.untracked.bool(True) ) diff --git a/DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py b/DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py index 620c45328a233..961e77cfe6323 100644 --- a/DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py +++ b/DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py @@ -1,5 +1,10 @@ import FWCore.ParameterSet.Config as cms +# +# This object is used to make changes for different running scenarios +# +from Configuration.StandardSequences.Eras import eras + SiPixelDigiSource = cms.EDAnalyzer("SiPixelDigiSource", TopFolderName = cms.string('Pixel'), src = cms.InputTag("siPixelDigis"), @@ -26,4 +31,6 @@ bigEventSize = cms.untracked.int32(1000) ) +# Modify for if the phase 1 pixel detector is active +eras.phase1Pixel.toModify( SiPixelDigiSource, isUpgrade=cms.untracked.bool(True) ) diff --git a/DQM/SiPixelMonitorRawData/python/SiPixelMonitorRawData_cfi.py b/DQM/SiPixelMonitorRawData/python/SiPixelMonitorRawData_cfi.py index 79f05bee044d3..850e4d8122b72 100644 --- a/DQM/SiPixelMonitorRawData/python/SiPixelMonitorRawData_cfi.py +++ b/DQM/SiPixelMonitorRawData/python/SiPixelMonitorRawData_cfi.py @@ -1,5 +1,10 @@ import FWCore.ParameterSet.Config as cms +# +# This object is used to make changes for different running scenarios +# +from Configuration.StandardSequences.Eras import eras + SiPixelRawDataErrorSource = cms.EDAnalyzer("SiPixelRawDataErrorSource", TopFolderName = cms.string('Pixel'), src = cms.InputTag("siPixelDigis"), @@ -13,4 +18,5 @@ bladeOn = cms.untracked.bool(False) ) - +# Modify for if the phase 1 pixel detector is active +eras.phase1Pixel.toModify( SiPixelRawDataErrorSource, isUpgrade=cms.untracked.bool(True) ) diff --git a/DQM/SiPixelMonitorRecHit/python/SiPixelMonitorRecHit_cfi.py b/DQM/SiPixelMonitorRecHit/python/SiPixelMonitorRecHit_cfi.py index a41a75859d4b2..51012ea91c711 100644 --- a/DQM/SiPixelMonitorRecHit/python/SiPixelMonitorRecHit_cfi.py +++ b/DQM/SiPixelMonitorRecHit/python/SiPixelMonitorRecHit_cfi.py @@ -1,5 +1,10 @@ import FWCore.ParameterSet.Config as cms +# +# This object is used to make changes for different running scenarios +# +from Configuration.StandardSequences.Eras import eras + SiPixelRecHitSource = cms.EDAnalyzer("SiPixelRecHitSource", TopFolderName = cms.string('Pixel'), src = cms.InputTag("siPixelRecHits"), @@ -17,3 +22,6 @@ bladeOn = cms.untracked.bool(False), diskOn = cms.untracked.bool(False) ) + +# Modify for if the phase 1 pixel detector is active +eras.phase1Pixel.toModify( SiPixelRecHitSource, isUpgrade=cms.untracked.bool(True) ) diff --git a/DQM/SiPixelMonitorTrack/python/SiPixelMonitorEfficiency_cfi.py b/DQM/SiPixelMonitorTrack/python/SiPixelMonitorEfficiency_cfi.py index 4079443104014..b62f84b7d33ea 100644 --- a/DQM/SiPixelMonitorTrack/python/SiPixelMonitorEfficiency_cfi.py +++ b/DQM/SiPixelMonitorTrack/python/SiPixelMonitorEfficiency_cfi.py @@ -1,5 +1,10 @@ import FWCore.ParameterSet.Config as cms +# +# This object is used to make changes for different running scenarios +# +from Configuration.StandardSequences.Eras import eras + SiPixelHitEfficiencySource = cms.EDAnalyzer("SiPixelHitEfficiencySource", src = cms.InputTag("siPixelHitEfficiency"), debug = cms.untracked.bool(False), @@ -18,3 +23,6 @@ applyEdgeCut = cms.untracked.bool(False), nSigma_EdgeCut = cms.untracked.double(2.) ) + +# Modify for if the phase 1 pixel detector is active +eras.phase1Pixel.toModify( SiPixelHitEfficiencySource, isUpgrade=cms.untracked.bool(True) ) diff --git a/DQM/SiPixelMonitorTrack/python/SiPixelMonitorTrack_cfi.py b/DQM/SiPixelMonitorTrack/python/SiPixelMonitorTrack_cfi.py index 7d7e08026b9c1..e880cdc5fa825 100644 --- a/DQM/SiPixelMonitorTrack/python/SiPixelMonitorTrack_cfi.py +++ b/DQM/SiPixelMonitorTrack/python/SiPixelMonitorTrack_cfi.py @@ -1,5 +1,10 @@ import FWCore.ParameterSet.Config as cms +# +# This object is used to make changes for different running scenarios +# +from Configuration.StandardSequences.Eras import eras + SiPixelTrackResidualSource = cms.EDAnalyzer("SiPixelTrackResidualSource", TopFolderName = cms.string('Pixel'), src = cms.InputTag("siPixelTrackResiduals"), @@ -24,3 +29,6 @@ trajectoryInput = cms.InputTag('generalTracks') ) + +# Modify for if the phase 1 pixel detector is active +eras.phase1Pixel.toModify( SiPixelTrackResidualSource, isUpgrade=cms.untracked.bool(True) ) From d6a990d7f20876b63a64806ffd584e33a3925fe1 Mon Sep 17 00:00:00 2001 From: Mark Grimes Date: Mon, 16 Nov 2015 18:59:44 +0100 Subject: [PATCH 2/2] Take muonAnalyzer out of the sequence if the phase 1 pixel era is active --- DQMOffline/Muon/python/muonMonitors_cff.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/DQMOffline/Muon/python/muonMonitors_cff.py b/DQMOffline/Muon/python/muonMonitors_cff.py index 850685e99f3e1..cce467f718abc 100644 --- a/DQMOffline/Muon/python/muonMonitors_cff.py +++ b/DQMOffline/Muon/python/muonMonitors_cff.py @@ -1,5 +1,10 @@ import FWCore.ParameterSet.Config as cms +# +# This object is used to make changes for different running scenarios +# +from Configuration.StandardSequences.Eras import eras + #Analyzer taken from online dqm from DQM.TrackingMonitor.MonitorTrackSTAMuons_cfi import * from DQM.TrackingMonitor.MonitorTrackGLBMuons_cfi import * @@ -27,6 +32,9 @@ muonIdDQM* dqmInfoMuons* muIsoDQM_seq) +# Modify for if the phase 1 pixel detector is active +if eras.phase1Pixel.isChosen() : + muonMonitors.remove(muonAnalyzer) muonMonitorsAndQualityTests = cms.Sequence(muonMonitors*muonQualityTests)