Merge pull request #17754 from kpedro88/Phase1-HE20

fix sequences for HE plan1 [84X]
cms-sw · Mar 3, 2017 · 2ce390f · 2ce390f
2 parents 3c11244 + 9cd33f1
commit 2ce390f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/Configuration/StandardSequences/python/ReconstructionCosmics_cff.py b/Configuration/StandardSequences/python/ReconstructionCosmics_cff.py
@@ -45,8 +45,6 @@
 
 # local reco
 trackerCosmics = cms.Sequence(offlineBeamSpot*trackerlocalreco*MeasurementTrackerEvent*tracksP5)
-hbhereco = hbheprereco.clone()
-calolocalrecoCosmics.replace(hbheprereco,hbhereco)
 caloCosmics = cms.Sequence(calolocalrecoCosmics*ecalClustersCosmics)
 caloCosmics_HcalNZS = cms.Sequence(calolocalrecoCosmicsNZS*ecalClustersCosmics)
 muonsLocalRecoCosmics = cms.Sequence(muonlocalreco+muonlocalrecoT0Seg)

diff --git a/RecoLocalCalo/Configuration/python/RecoLocalCalo_Cosmics_cff.py b/RecoLocalCalo/Configuration/python/RecoLocalCalo_Cosmics_cff.py
@@ -16,7 +16,7 @@
 #
 # sequence CaloLocalReco
 #
-hbheprereco = _hcalLocalReco_cff._default_hbheprereco.clone(
+hbhereco = _hcalLocalReco_cff._default_hbheprereco.clone(
     puCorrMethod = 0,
     firstSample = 0,
     samplesToAdd = 10,
@@ -54,7 +54,7 @@
 from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017
 from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017
 
-_phase1_hbheprereco = _hcalLocalReco_cff._phase1_hbheprereco.clone(
+_phase1_hbhereco = _hcalLocalReco_cff._phase1_hbheprereco.clone(
     tsFromDB = cms.bool(False),
     recoParamsFromDB = cms.bool(False),
     algorithm = dict(
@@ -74,7 +74,7 @@
 )
 
 
-run2_HCAL_2017.toReplaceWith(hbheprereco, _phase1_hbheprereco )
+run2_HCAL_2017.toReplaceWith(hbhereco, _phase1_hbhereco )
 run2_HF_2017.toReplaceWith(hfreco, _phase1_hfreco )
 
 hfprereco = _hcalLocalReco_cff.hfprereco.clone(
@@ -84,15 +84,18 @@
 from RecoLocalCalo.HcalRecProducers.hbheplan1_cfi import hbheplan1
 
 # redefine hcal sequence
-hcalLocalRecoSequence = cms.Sequence(hbheprereco+hfreco+horeco+zdcreco)
+hcalLocalRecoSequence = cms.Sequence(hbhereco+hfreco+horeco+zdcreco)
 
 _phase1_hcalLocalRecoSequence = hcalLocalRecoSequence.copy()
 _phase1_hcalLocalRecoSequence.insert(0,hfprereco)
 run2_HF_2017.toReplaceWith(hcalLocalRecoSequence, _phase1_hcalLocalRecoSequence)
 
-_plan1_hcalLocalRecoSequence = _phase1_hcalLocalRecoSequence.copy() 
-_plan1_hcalLocalRecoSequence += hbheplan1
+# shuffle modules so "hbheplan1" produces final collection of hits named "hbhereco"
+_plan1_hcalLocalRecoSequence = _phase1_hcalLocalRecoSequence.copy()
+hbheprereco = _phase1_hbhereco.clone()
+_plan1_hcalLocalRecoSequence.insert(0,hbheprereco)
 from Configuration.Eras.Modifier_run2_HEPlan1_2017_cff import run2_HEPlan1_2017
+run2_HEPlan1_2017.toReplaceWith(hbhereco, hbheplan1)
 run2_HEPlan1_2017.toReplaceWith(hcalLocalRecoSequence, _plan1_hcalLocalRecoSequence)
 
 calolocalrecoCosmics = cms.Sequence(ecalLocalRecoSequenceCosmics+hcalLocalRecoSequence)

diff --git a/RecoLocalCalo/Configuration/python/hcalLocalRecoNZS_cff.py b/RecoLocalCalo/Configuration/python/hcalLocalRecoNZS_cff.py
@@ -39,7 +39,10 @@
         rejectAllFailures = cms.bool(False)
     ),
 )
-from RecoLocalCalo.HcalRecProducers.hbheplan1_cfi import hbheplan1
+import RecoLocalCalo.HcalRecProducers.hbheplan1_cfi
+hbheplan1MB = RecoLocalCalo.HcalRecProducers.hbheplan1_cfi.hbheplan1.clone(
+    hbheInput = cms.InputTag("hbheprerecoMB")
+)
 
 _phase1_hcalLocalRecoSequenceNZS = hcalLocalRecoSequenceNZS.copy()
 _phase1_hcalLocalRecoSequenceNZS.insert(0,hfprerecoMB)
@@ -51,6 +54,8 @@
 run2_HCAL_2017.toReplaceWith( hbherecoMB, _phase1_hbherecoMB )
 
 _plan1_hcalLocalRecoSequenceNZS = _phase1_hcalLocalRecoSequenceNZS.copy()
-_plan1_hcalLocalRecoSequenceNZS += hbheplan1
+hbheprerecoMB = _phase1_hbherecoMB.clone()
+_plan1_hcalLocalRecoSequenceNZS.insert(0,hbheprerecoMB)
 from Configuration.Eras.Modifier_run2_HEPlan1_2017_cff import run2_HEPlan1_2017
+run2_HEPlan1_2017.toReplaceWith(hbherecoMB, hbheplan1MB)
 run2_HEPlan1_2017.toReplaceWith(hcalLocalRecoSequenceNZS, _plan1_hcalLocalRecoSequenceNZS)