Fix the parameter set of the AlcaPCCIntegrator module

cms-sw · May 25, 2022 · 0d3cbd7 · 0d3cbd7
1 parent 9c0c506
commit 0d3cbd7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 18 deletions.
diff --git a/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCIntegrator.cc b/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCIntegrator.cc
@@ -47,19 +47,16 @@ class AlcaPCCIntegrator : public edm::global::EDProducer<edm::LuminosityBlockSum
                                        reco::PixelClusterCounts const* iCounts) const override;
 
 private:
-  edm::EDPutTokenT<reco::PixelClusterCounts> lumiPutToken_;
-  edm::InputTag thePCCInputTag_;
-  edm::EDGetTokenT<reco::PixelClusterCountsInEvent> pccToken_;
+  const edm::EDPutTokenT<reco::PixelClusterCounts> lumiPutToken_;
+  const edm::EDGetTokenT<reco::PixelClusterCountsInEvent> pccToken_;
 };
 
 AlcaPCCIntegrator::AlcaPCCIntegrator(const edm::ParameterSet& iConfig)
     : lumiPutToken_(produces<reco::PixelClusterCounts, edm::Transition::EndLuminosityBlock>(
           iConfig.getParameter<edm::ParameterSet>("AlcaPCCIntegratorParameters").getParameter<std::string>("ProdInst"))),
-      thePCCInputTag_(iConfig.getParameter<edm::ParameterSet>("AlcaPCCIntegratorParameters")
-                          .getParameter<std::string>("inputPccLabel"),
-                      iConfig.getParameter<edm::ParameterSet>("AlcaPCCIntegratorParameters")
-                          .getUntrackedParameter<std::string>("trigstring", "alcaPCC")),
-      pccToken_(consumes<reco::PixelClusterCountsInEvent>(thePCCInputTag_)) {}
+      pccToken_(consumes<reco::PixelClusterCountsInEvent>(
+          iConfig.getParameter<edm::ParameterSet>("AlcaPCCIntegratorParameters")
+              .getParameter<edm::InputTag>("inputPccLabel"))) {}
 
 std::unique_ptr<reco::PixelClusterCounts> AlcaPCCIntegrator::beginStream(edm::StreamID StreamID) const {
   return std::make_unique<reco::PixelClusterCounts>();

diff --git a/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_cff.py b/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_cff.py
@@ -12,9 +12,7 @@
 
 from Calibration.LumiAlCaRecoProducers.alcaPCCIntegrator_cfi import alcaPCCIntegrator
 alcaPCCIntegratorRandom = alcaPCCIntegrator.clone()
-alcaPCCIntegratorRandom.AlcaPCCIntegratorParameters.inputPccLabel="hltAlcaPixelClusterCounts"
-alcaPCCIntegratorRandom.AlcaPCCIntegratorParameters.trigstring    = "alcaPCCEvent"
-alcaPCCIntegratorRandom.AlcaPCCIntegratorParameters.ProdInst      = "alcaPCCRandom"
+alcaPCCIntegratorRandom.AlcaPCCIntegratorParameters.ProdInst = "alcaPCCRandom"
 
 
 # Sequence #

diff --git a/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_cff.py b/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_cff.py
@@ -11,9 +11,7 @@
 
 from Calibration.LumiAlCaRecoProducers.alcaPCCIntegrator_cfi import alcaPCCIntegrator
 alcaPCCIntegratorZeroBias = alcaPCCIntegrator.clone()
-alcaPCCIntegratorZeroBias.AlcaPCCIntegratorParameters.inputPccLabel="hltAlcaPixelClusterCounts"
-alcaPCCIntegratorZeroBias.AlcaPCCIntegratorParameters.trigstring    = "alcaPCCEvent"
-alcaPCCIntegratorZeroBias.AlcaPCCIntegratorParameters.ProdInst      = "alcaPCCZeroBias"
+alcaPCCIntegratorZeroBias.AlcaPCCIntegratorParameters.ProdInst = "alcaPCCZeroBias"
 
 
 seqALCARECOAlCaPCCZeroBias = cms.Sequence(ALCARECOZeroBiasHLT + alcaPCCIntegratorZeroBias)
diff --git a/Calibration/LumiAlCaRecoProducers/python/alcaPCCIntegrator_cfi.py b/Calibration/LumiAlCaRecoProducers/python/alcaPCCIntegrator_cfi.py
@@ -2,8 +2,7 @@
 
 alcaPCCIntegrator = cms.EDProducer("AlcaPCCIntegrator",
     AlcaPCCIntegratorParameters = cms.PSet(
-        inputPccLabel = cms.string("hltAlcaPixelClusterCounts"),
-        trigstring = cms.untracked.string("alcaPCCEvent"),
+        inputPccLabel = cms.InputTag("hltAlcaPixelClusterCounts","alcaPCCEvent"),
         ProdInst = cms.string("alcaPCCRandom")
     )
 )
diff --git a/Calibration/LumiAlCaRecoProducers/test/PCC_Random_Event_Integrator_cfg.py b/Calibration/LumiAlCaRecoProducers/test/PCC_Random_Event_Integrator_cfg.py
@@ -28,8 +28,7 @@
 
 process.alcaPCCIntegrator = cms.EDProducer("AlcaPCCIntegrator",
     AlcaPCCIntegratorParameters = cms.PSet(
-        inputPccLabel = cms.string("alcaPCCEventProducer"),
-        trigstring = cms.untracked.string("alcaPCCRandomEvent"),
+        inputPccLabel = cms.InputTag("alcaPCCEventProducer","alcaPCCRandomEvent"),
         ProdInst = cms.string("alcaPCCRandom")
     ),
 )