Merge pull request #45155 from thomreis/ecal-rollback-to-ratio-timing

ECAL - Roll back to ECAL ratio timing for Run 3

Configuration/ProcessModifiers/python/ecal_cctiming_cff.py

@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+# This modifier is for the ECAL Cross-Correlation timing algorithm
+
+ecal_cctiming =  cms.Modifier()
+

RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cfi.py

@@ -5,8 +5,8 @@
 
 # use CC timing method for Run3 and Phase 2 (carried over from Run3 era)
 import FWCore.ParameterSet.Config as cms
-from Configuration.Eras.Modifier_run3_ecal_cff import run3_ecal
-run3_ecal.toModify(ecalMultiFitUncalibRecHit,
+from Configuration.ProcessModifiers.ecal_cctiming_cff import ecal_cctiming
+ecal_cctiming.toModify(ecalMultiFitUncalibRecHit,
     algoPSet = dict(timealgo = 'crossCorrelationMethod',
         EBtimeNconst = 25.5,
         EBtimeConstantTerm = 0.85,
@@ -19,7 +19,7 @@
     )
 )
 
-# this overrides the modifications made by run3_ecal if both modifiers are active
+# this overrides the modifications made by the ecal_cctiming modifier if both modifiers are active
 from Configuration.ProcessModifiers.gpuValidationEcal_cff import gpuValidationEcal
 gpuValidationEcal.toModify(ecalMultiFitUncalibRecHit,
     algoPSet = dict(timealgo = 'RatioMethod',

RecoLocalCalo/EcalRecProducers/python/ecalRecHit_cfi.py

@@ -100,13 +100,13 @@
                 )
 
 # use CC timing method for Run3 and Phase 2 (carried over from Run3 era)
-from Configuration.Eras.Modifier_run3_ecal_cff import run3_ecal
-run3_ecal.toModify(ecalRecHit,
+from Configuration.ProcessModifiers.ecal_cctiming_cff import ecal_cctiming
+ecal_cctiming.toModify(ecalRecHit,
     timeCalibTag = ':CC',
     timeOffsetTag = ':CC'
 )
 
-# this overrides the modifications made by run3_ecal if both modifiers are active
+# this overrides the modifications made by ecal_cctiming if both modifiers are active
 from Configuration.ProcessModifiers.gpuValidationEcal_cff import gpuValidationEcal
 gpuValidationEcal.toModify(ecalRecHit,
     timeCalibTag = ':',