Merge pull request #29617 from jaehyeok/hbhe-mahi-always-8pulse-fit

[HBHE] Always use 8 pulses in MAHI without 1-pulse to 8-pulse switch for Run3 and beyond

HLTrigger/Configuration/python/customizeHLTforCMSSW.py

@@ -76,6 +76,12 @@ def synchronizeHCALHLTofflineRun3on2018data(process):
         producer.setNoiseFlagsQIE8 = cms.bool( True )
         producer.setPulseShapeFlagsQIE8 = cms.bool( True )
 
+    #----------------------------------------------------------
+    # Use 1+8p fit (PR29617) and apply HB- correction (PR26177)
+    for producer in producers_by_type(process, "HBHEPhase1Reconstructor"):
+        producer.algorithm.applyLegacyHBMCorrection = cms.bool( True )
+        producer.algorithm.chiSqSwitch = cms.double(15.0)
+
     return process
 
 def synchronizeHCALHLTofflineRun2(process):
@@ -166,7 +172,7 @@ def customiseFor2017DtUnpacking(process):
 
 def customiseFor29512(process):
     """Refresh configuration of ElectronNHitSeedProducer instances.
-    
+
     Loops over some parameters of ElectronNHitSeedProducer instances and changes their type from string to ESInputTag.
 
     For PR https://github.com/cms-sw/cmssw/pull/29512 "ElectronNHitSeedProducer modernization"
@@ -196,12 +202,20 @@ def customiseFor29658(process):
 
     return process
 
+# Use 8p fit (PR29617) and don't apply HB- correction (PR26177)
+def customiseFor29617(process):
+    for producer in producers_by_type(process, "HBHEPhase1Reconstructor"):
+        producer.algorithm.chiSqSwitch = cms.double(-1.0)
+        producer.algorithm.applyLegacyHBMCorrection = cms.bool( False )
+    return process
+
 # CMSSW version specific customizations
 def customizeHLTforCMSSW(process, menuType="GRun"):
 
     # add call to action function in proper order: newest last!
     # process = customiseFor12718(process)
     process = customiseFor29512(process)
     process = customiseFor29658(process)
+    process = customiseFor29617(process)
 
     return process

RecoLocalCalo/HcalRecProducers/python/HBHEMahiParameters_cfi.py

@@ -13,3 +13,8 @@
     deltaChiSqThresh  = cms.double(1e-3),
     nnlsThresh        = cms.double(1e-11)
 )
+
+from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017
+from Configuration.Eras.Modifier_run3_HB_cff import run3_HB
+#--- >= Run3 modification:
+(run3_HB & run2_HE_2017).toModify(mahiParameters, chiSqSwitch = -1)