From 72ac6951de0d07b11e74b2e7473e88d22c16ec13 Mon Sep 17 00:00:00 2001 From: "R. Alex Barbieri" Date: Thu, 19 Nov 2015 14:00:17 -0500 Subject: [PATCH 1/3] add customization to switch to Global ECAL reco from multifit --- .../Configuration/python/customise_ECALsequence.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 RecoHI/Configuration/python/customise_ECALsequence.py diff --git a/RecoHI/Configuration/python/customise_ECALsequence.py b/RecoHI/Configuration/python/customise_ECALsequence.py new file mode 100644 index 0000000000000..3c56af2deadf3 --- /dev/null +++ b/RecoHI/Configuration/python/customise_ECALsequence.py @@ -0,0 +1,14 @@ +import FWCore.ParameterSet.Config as cms + +def changeHeavyIonsToUseECALGlobalFit(process) : + process.load('RecoLocalCalo.EcalRecProducers.ecalGlobalUncalibRecHit_cfi') + process.ecalUncalibRecHitSequenceHI = cms.Sequence(process.ecalGlobalUncalibRecHit* + process.ecalDetIdToBeRecovered) + process.ecalLocalRecoSequenceHI = cms.Sequence(process.ecalUncalibRecHitSequenceHI* + process.ecalRecHitSequence) + process.ecalRecHit.EEuncalibRecHitCollection = cms.InputTag("ecalGlobalUncalibRecHit","EcalUncalibRecHitsEE") + process.ecalRecHit.EBuncalibRecHitCollection = cms.InputTag("ecalGlobalUncalibRecHit","EcalUncalibRecHitsEB") + + process.caloReco.replace(process.ecalUncalibRecHitSequence, process.ecalUncalibRecHitSequenceHI) + + return process From 9badbab65569ff2b9bd3d766408d991d8edec362 Mon Sep 17 00:00:00 2001 From: "R. Alex Barbieri" Date: Thu, 19 Nov 2015 16:14:42 -0500 Subject: [PATCH 2/3] guard customise with hasattr --- .../python/customise_ECALsequence.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/RecoHI/Configuration/python/customise_ECALsequence.py b/RecoHI/Configuration/python/customise_ECALsequence.py index 3c56af2deadf3..7570b864c61a9 100644 --- a/RecoHI/Configuration/python/customise_ECALsequence.py +++ b/RecoHI/Configuration/python/customise_ECALsequence.py @@ -1,14 +1,14 @@ import FWCore.ParameterSet.Config as cms def changeHeavyIonsToUseECALGlobalFit(process) : - process.load('RecoLocalCalo.EcalRecProducers.ecalGlobalUncalibRecHit_cfi') - process.ecalUncalibRecHitSequenceHI = cms.Sequence(process.ecalGlobalUncalibRecHit* - process.ecalDetIdToBeRecovered) - process.ecalLocalRecoSequenceHI = cms.Sequence(process.ecalUncalibRecHitSequenceHI* - process.ecalRecHitSequence) - process.ecalRecHit.EEuncalibRecHitCollection = cms.InputTag("ecalGlobalUncalibRecHit","EcalUncalibRecHitsEE") - process.ecalRecHit.EBuncalibRecHitCollection = cms.InputTag("ecalGlobalUncalibRecHit","EcalUncalibRecHitsEB") - - process.caloReco.replace(process.ecalUncalibRecHitSequence, process.ecalUncalibRecHitSequenceHI) + if hasattr (process, "caloReco") : + process.load('RecoLocalCalo.EcalRecProducers.ecalGlobalUncalibRecHit_cfi') + process.ecalUncalibRecHitSequenceHI = cms.Sequence(process.ecalGlobalUncalibRecHit* + process.ecalDetIdToBeRecovered) + process.ecalLocalRecoSequenceHI = cms.Sequence(process.ecalUncalibRecHitSequenceHI* + process.ecalRecHitSequence) + process.ecalRecHit.EEuncalibRecHitCollection = cms.InputTag("ecalGlobalUncalibRecHit","EcalUncalibRecHitsEE") + process.ecalRecHit.EBuncalibRecHitCollection = cms.InputTag("ecalGlobalUncalibRecHit","EcalUncalibRecHitsEB") + process.caloReco.replace(process.ecalUncalibRecHitSequence, process.ecalUncalibRecHitSequenceHI) return process From 16c237f20e27d48249a27b01b3d808361824679d Mon Sep 17 00:00:00 2001 From: "R. Alex Barbieri" Date: Fri, 20 Nov 2015 08:40:56 -0500 Subject: [PATCH 3/3] also correct DQM sequence in customize statement --- RecoHI/Configuration/python/customise_ECALsequence.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RecoHI/Configuration/python/customise_ECALsequence.py b/RecoHI/Configuration/python/customise_ECALsequence.py index 7570b864c61a9..7fe57e179e2b7 100644 --- a/RecoHI/Configuration/python/customise_ECALsequence.py +++ b/RecoHI/Configuration/python/customise_ECALsequence.py @@ -11,4 +11,10 @@ def changeHeavyIonsToUseECALGlobalFit(process) : process.ecalRecHit.EBuncalibRecHitCollection = cms.InputTag("ecalGlobalUncalibRecHit","EcalUncalibRecHitsEB") process.caloReco.replace(process.ecalUncalibRecHitSequence, process.ecalUncalibRecHitSequenceHI) + if hasattr (process, "ecalMonitorTask") : + process.ecalMonitorTask.collectionTags.EBUncalibRecHit = cms.untracked.InputTag("ecalGlobalUncalibRecHit","EcalUncalibRecHitsEB") + process.ecalMonitorTask.collectionTags.EEUncalibRecHit = cms.untracked.InputTag("ecalGlobalUncalibRecHit","EcalUncalibRecHitsEE") + process.ecalMonitorTask.collectionTags.EBLaserLedUncalibRecHit = cms.untracked.InputTag("ecalGlobalUncalibRecHit","EcalUncalibRecHitsEB") + process.ecalMonitorTask.collectionTags.EELaserLedUncalibRecHit = cms.untracked.InputTag("ecalGlobalUncalibRecHit","EcalUncalibRecHitsEE") + return process