Synchronise with CMSSW_11_2_0_pre2

cms-patatrack · Nov 26, 2020 · f95560a · f95560a
1 parent e4406a3
commit f95560a
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 26 deletions.
diff --git a/RecoLocalCalo/Configuration/python/hcalGlobalReco_cff.py b/RecoLocalCalo/Configuration/python/hcalGlobalReco_cff.py
@@ -4,7 +4,18 @@
 hcalGlobalRecoTask = cms.Task(hbhereco)
 hcalGlobalRecoSequence = cms.Sequence(hcalGlobalRecoTask)
 
+#--- for Run 3 and later
+from Configuration.Eras.Modifier_run3_HB_cff import run3_HB
+
 from RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi import hbheprereco as _phase1_hbheprereco
+run3_HB.toReplaceWith(hbhereco, _phase1_hbheprereco)
+
+#--- for Run 3 on GPU
+from Configuration.ProcessModifiers.gpu_cff import gpu
 
-from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal
-phase2_hcal.toReplaceWith( hbhereco, _phase1_hbheprereco )
+from RecoLocalCalo.HcalRecProducers.hcalCPURecHitsProducer_cfi import hcalCPURecHitsProducer as _hcalCPURecHitsProducer
+gpu.toReplaceWith(hbhereco, _hcalCPURecHitsProducer.clone(
+    recHitsM0LabelIn = "hbheRecHitProducerGPU",
+    recHitsM0LabelOut = "",
+    recHitsLegacyLabelOut = ""
+))
diff --git a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py
@@ -1,41 +1,40 @@
 import FWCore.ParameterSet.Config as cms
 
 from RecoLocalCalo.HcalRecAlgos.hcalRecAlgoESProd_cfi import *
+from RecoLocalCalo.HcalRecAlgos.hcalChannelPropertiesESProd_cfi import *
 hcalOOTPileupESProducer = cms.ESProducer('OOTPileupDBCompatibilityESProducer')
 
 from RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi import hbheprereco as _phase1_hbheprereco
 hbheprereco = _phase1_hbheprereco.clone(
-    processQIE11 = cms.bool(False),
-    tsFromDB = cms.bool(True),
+    processQIE11 = False,
+    tsFromDB = True,
     pulseShapeParametersQIE8 = dict(
-        TrianglePeakTS = cms.uint32(4),
+        TrianglePeakTS = 4,
     )
 )
 
 from RecoLocalCalo.HcalRecProducers.HcalHitReconstructor_ho_cfi import *
 from RecoLocalCalo.HcalRecProducers.HcalHitReconstructor_hf_cfi import *
 from RecoLocalCalo.HcalRecProducers.HcalHitReconstructor_zdc_cfi import *
-hcalLocalRecoTask = cms.Task(hbheprereco,hfreco,horeco,zdcreco)
+hcalLocalRecoTask = cms.Task(hbheprereco, hfreco, horeco, zdcreco)
 hcalLocalRecoSequence = cms.Sequence(hcalLocalRecoTask)
 
 from RecoLocalCalo.HcalRecProducers.hfprereco_cfi import hfprereco
 from RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi import hfreco as _phase1_hfreco
 from RecoLocalCalo.HcalRecProducers.hbheplan1_cfi import hbheplan1
 
-#--- for HCALonly wf
-hcalOnlyLocalRecoTask = cms.Task(hbheprereco,hfprereco,hfreco,horeco)
-
-# copy for cosmics
+#--- for cosmics
 _default_hfreco = hfreco.clone()
 
+#--- for Phase 1
 _phase1_hcalLocalRecoTask = hcalLocalRecoTask.copy()
 _phase1_hcalLocalRecoTask.add(hfprereco)
 
 from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017
 run2_HF_2017.toReplaceWith( hcalLocalRecoTask, _phase1_hcalLocalRecoTask )
 run2_HF_2017.toReplaceWith( hfreco, _phase1_hfreco )
 from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017
-run2_HCAL_2017.toReplaceWith( hbheprereco, _phase1_hbheprereco )
+run2_HCAL_2017.toReplaceWith(hbheprereco, _phase1_hbheprereco)
 
 _plan1_hcalLocalRecoTask = _phase1_hcalLocalRecoTask.copy()
 _plan1_hcalLocalRecoTask.add(hbheplan1)
@@ -48,33 +47,39 @@
 from Configuration.ProcessModifiers.run2_HECollapse_2018_cff import run2_HECollapse_2018
 run2_HECollapse_2018.toReplaceWith(hcalLocalRecoTask, _collapse_hcalLocalRecoTask)
 
-# Run 3 HCAL workflow on GPU
+#--- for Run 3 and later
+_run3_hcalLocalRecoTask = _phase1_hcalLocalRecoTask.copy()
+_run3_hcalLocalRecoTask.remove(hbheprereco)
+from Configuration.Eras.Modifier_run3_HB_cff import run3_HB
+run3_HB.toReplaceWith(hcalLocalRecoTask, _run3_hcalLocalRecoTask)
+
+#--- for Run 3 on GPU
 from Configuration.ProcessModifiers.gpu_cff import gpu
 
 from RecoLocalCalo.HcalRecProducers.hbheRecHitProducerGPUTask_cff import *
-_hcalLocalRecoTaskGPU = hcalLocalRecoTask.copy()
-_hcalLocalRecoTaskGPU.add(hbheRecHitProducerGPUTask)
-gpu.toReplaceWith(hcalLocalRecoTask, _hcalLocalRecoTaskGPU)
+_run3_hcalLocalRecoGPUTask = _run3_hcalLocalRecoTask.copy()
+_run3_hcalLocalRecoGPUTask.add(hbheRecHitProducerGPUTask)
+gpu.toReplaceWith(hcalLocalRecoTask, _run3_hcalLocalRecoGPUTask)
+
+#--- HCAL-only workflow for Run 3
+# FIXME rename `hbheprereco` to `hbhereco` and use it from hcalGlobalRecoTask
+hcalOnlyLocalRecoTask = cms.Task(hbheprereco, hfprereco, hfreco, horeco)
+
+#--- HCAL-only workflow for Run 3 on GPU
+from Configuration.ProcessModifiers.gpu_cff import gpu
 
-_hcalOnlyLocalRecoTaskGPU = hcalOnlyLocalRecoTask.copy()
-_hcalOnlyLocalRecoTaskGPU.add(hbheRecHitProducerGPUTask)
-gpu.toReplaceWith(hcalOnlyLocalRecoTask, _hcalOnlyLocalRecoTaskGPU)
+_hcalOnlyLocalRecoGPUTask = hcalOnlyLocalRecoTask.copy()
+_hcalOnlyLocalRecoGPUTask.add(hbheRecHitProducerGPUTask)
+gpu.toReplaceWith(hcalOnlyLocalRecoTask, _hcalOnlyLocalRecoGPUTask)
 
 from RecoLocalCalo.HcalRecProducers.hcalCPURecHitsProducer_cfi import hcalCPURecHitsProducer as _hcalCPURecHitsProducer
 gpu.toReplaceWith(hbheprereco, _hcalCPURecHitsProducer.clone(
     recHitsM0LabelIn = "hbheRecHitProducerGPU",
     recHitsM0LabelOut = "",
     recHitsLegacyLabelOut = ""
 ))
-#---
-
-_phase2_hcalLocalRecoTask = hcalLocalRecoTask.copy()
-_phase2_hcalLocalRecoTask.remove(hbheprereco)
-
-from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal
-phase2_hcal.toReplaceWith( hcalLocalRecoTask, _phase2_hcalLocalRecoTask )
-
 
+#--- for FastSim
 _fastSim_hcalLocalRecoTask = hcalLocalRecoTask.copyAndExclude([zdcreco])
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
 fastSim.toReplaceWith( hcalLocalRecoTask, _fastSim_hcalLocalRecoTask )