applyFixPCC both in RH and TP

Author: TaeunKwon

CalibCalorimetry/HcalPlugins/python/Hcal_PCCUpdate_cff.py

@@ -0,0 +1,9 @@
+import FWCore.ParameterSet.Config as cms
+
+# Turn on the PCC update which synchronize timePhase in PCC as in SIM
+PCCUpdate = cms.PSet(
+  applyFixPCC = cms.bool(False)
+)
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(PCCUpdate, applyFixPCC=cms.bool(True))

CalibCalorimetry/HcalTPGEventSetup/src/HcalTPGCoderULUT.cc

@@ -87,9 +87,9 @@ HcalTPGCoderULUT::HcalTPGCoderULUT(const edm::ParameterSet& iConfig) {
   contain1TSHE_ = iConfig.getParameter<bool>("contain1TSHE");
   containPhaseNSHB_ = iConfig.getParameter<double>("containPhaseNSHB");
   containPhaseNSHE_ = iConfig.getParameter<double>("containPhaseNSHE");
-  applyFixPCC_ = iConfig.getParameter<bool>("applyFixPCC");
   overrideDBweightsAndFilterHB_ = iConfig.getParameter<bool>("overrideDBweightsAndFilterHB");
   overrideDBweightsAndFilterHE_ = iConfig.getParameter<bool>("overrideDBweightsAndFilterHE");
+  applyFixPCC_ = iConfig.getParameter<bool>("applyFixPCC");
 
   //the following line is needed to tell the framework what
   // data is being produced

RecoLocalCalo/HcalRecAlgos/interface/SimpleHBHEPhase1Algo.h

@@ -45,6 +45,7 @@ class SimpleHBHEPhase1Algo : public AbsHBHEPhase1Algo {
                        float timeShift,
                        bool correctForPhaseContainment,
                        bool applyLegacyHBMCorrection,
+                       bool applyFixPCC,
                        std::unique_ptr<PulseShapeFitOOTPileupCorrection> m2,
                        std::unique_ptr<HcalDeterministicFit> detFit,
                        std::unique_ptr<MahiFit> mahi,

RecoLocalCalo/HcalRecAlgos/src/SimpleHBHEPhase1Algo.cc

@@ -25,12 +25,13 @@ SimpleHBHEPhase1Algo::SimpleHBHEPhase1Algo(const int firstSampleShift,
                                            const float timeShift,
                                            const bool correctForPhaseContainment,
                                            const bool applyLegacyHBMCorrection,
+                                           const bool applyFixPCC,
                                            std::unique_ptr<PulseShapeFitOOTPileupCorrection> m2,
                                            std::unique_ptr<HcalDeterministicFit> detFit,
                                            std::unique_ptr<MahiFit> mahi,
                                            edm::ConsumesCollector iC)
     : delayToken_(iC.esConsumes<edm::Transition::BeginRun>(edm::ESInputTag("", "HBHE"))),
-      pulseCorr_(PulseContainmentFractionalError, false, iC),
+      pulseCorr_(PulseContainmentFractionalError, applyFixPCC, iC),
       firstSampleShift_(firstSampleShift),
       samplesToAdd_(samplesToAdd),
       phaseNS_(phaseNS),

RecoLocalCalo/HcalRecAlgos/src/parseHBHEPhase1AlgoDescription.cc

@@ -134,6 +134,7 @@ std::unique_ptr<AbsHBHEPhase1Algo> parseHBHEPhase1AlgoDescription(const edm::Par
                                                   ps.getParameter<double>("tdcTimeShift"),
                                                   ps.getParameter<bool>("correctForPhaseContainment"),
                                                   ps.getParameter<bool>("applyLegacyHBMCorrection"),
+                                                  ps.getParameter<bool>("applyFixPCC"),
                                                   std::move(m2),
                                                   std::move(detFit),
                                                   std::move(mahi),
@@ -158,6 +159,7 @@ edm::ParameterSetDescription fillDescriptionForParseHBHEPhase1Algo() {
   desc.add<bool>("correctForPhaseContainment", true);
   desc.add<bool>("applyLegacyHBMCorrection", true);
   desc.add<bool>("calculateArrivalTime", false);
+  desc.add<bool>("applyFixPCC", false);
 
   return desc;
 }

RecoLocalCalo/HcalRecProducers/python/HBHEMethod0Parameters_cfi.py

@@ -47,9 +47,12 @@
 # moves reco window to the left w.r.t. the signal (AFAIK, the behavior
 # of PhaseDelay QIE11 configuration register is the opposite).
 #
+from CalibCalorimetry.HcalPlugins.Hcal_PCCUpdate_cff import *
+
 m0Parameters = cms.PSet(
     firstSampleShift = cms.int32(0),
     samplesToAdd = cms.int32(2),
     correctForPhaseContainment = cms.bool(True),
     correctionPhaseNS = cms.double(6.0),
+    applyFixPCC = PCCUpdate.applyFixPCC
 )

SimCalorimetry/HcalTrigPrimProducers/python/hcaltpdigi_cff.py

@@ -9,6 +9,8 @@
 
 from SimCalorimetry.HcalTrigPrimProducers.hcaltpdigi_cfi import *
 from CalibCalorimetry.CaloTPG.CaloTPGTranscoder_cfi import *
+from CalibCalorimetry.HcalPlugins.Hcal_PCCUpdate_cff import *
+
 HcalTPGCoderULUT = cms.ESProducer("HcalTPGCoderULUT",
     read_Ascii_LUTs = cms.bool(False),
     read_XML_LUTs = cms.bool(False),
@@ -19,7 +21,7 @@
     contain1TSHE = cms.bool(False),
     containPhaseNSHE = cms.double(6.0),
     containPhaseNSHB = cms.double(6.0),
-    applyFixPCC = cms.bool(False),
+    applyFixPCC = PCCUpdate.applyFixPCC,
     overrideDBweightsAndFilterHB = cms.bool(False),
     overrideDBweightsAndFilterHE = cms.bool(False),
     tpScales = tpScales,