diff --git a/RecoEgamma/EgammaPhotonProducers/interface/ConversionTrackCandidateProducer.h b/RecoEgamma/EgammaPhotonProducers/interface/ConversionTrackCandidateProducer.h index ef8e8db8cd40d..58547f6e4afbd 100644 --- a/RecoEgamma/EgammaPhotonProducers/interface/ConversionTrackCandidateProducer.h +++ b/RecoEgamma/EgammaPhotonProducers/interface/ConversionTrackCandidateProducer.h @@ -44,7 +44,6 @@ class ConversionTrackCandidateProducer : public edm::EDProducer { ~ConversionTrackCandidateProducer(); virtual void beginRun (edm::Run const&, edm::EventSetup const & es) override final; - virtual void endRun (edm::Run const&, edm::EventSetup const & es) override final; virtual void produce(edm::Event& evt, const edm::EventSetup& es); private: @@ -65,7 +64,6 @@ class ConversionTrackCandidateProducer : public edm::EDProducer { edm::EDGetTokenT > bcEndcapCollection_; edm::EDGetTokenT > scHybridBarrelProducer_; edm::EDGetTokenT > scIslandEndcapProducer_; - edm::ParameterSet conf_; edm::EDGetTokenT hcalTowers_; edm::EDGetTokenT barrelecalCollection_; edm::EDGetTokenT endcapecalCollection_; diff --git a/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackCandidateProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackCandidateProducer.cc index a41b2c8a8f6e1..d3cb9e3cca353 100644 --- a/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackCandidateProducer.cc +++ b/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackCandidateProducer.cc @@ -53,7 +53,6 @@ namespace { } ConversionTrackCandidateProducer::ConversionTrackCandidateProducer(const edm::ParameterSet& config) : - conf_(config), theTrajectoryBuilder_(createBaseCkfTrajectoryBuilder(config.getParameter("TrajectoryBuilder"), consumesCollector())), theNavigationSchool_(0), theOutInSeedFinder_(new OutInConversionSeedFinder(config)), @@ -68,41 +67,41 @@ ConversionTrackCandidateProducer::ConversionTrackCandidateProducer(const edm::Pa bcBarrelCollection_ = - consumes >(conf_.getParameter("bcBarrelCollection")); + consumes >(config.getParameter("bcBarrelCollection")); bcEndcapCollection_ = - consumes >(conf_.getParameter("bcEndcapCollection")); + consumes >(config.getParameter("bcEndcapCollection")); scHybridBarrelProducer_ = - consumes >(conf_.getParameter("scHybridBarrelProducer")); + consumes >(config.getParameter("scHybridBarrelProducer")); scIslandEndcapProducer_ = - consumes >(conf_.getParameter("scIslandEndcapProducer")); + consumes >(config.getParameter("scIslandEndcapProducer")); - OutInTrackCandidateCollection_ = conf_.getParameter("outInTrackCandidateCollection"); - InOutTrackCandidateCollection_ = conf_.getParameter("inOutTrackCandidateCollection"); + OutInTrackCandidateCollection_ = config.getParameter("outInTrackCandidateCollection"); + InOutTrackCandidateCollection_ = config.getParameter("inOutTrackCandidateCollection"); - OutInTrackSuperClusterAssociationCollection_ = conf_.getParameter("outInTrackCandidateSCAssociationCollection"); - InOutTrackSuperClusterAssociationCollection_ = conf_.getParameter("inOutTrackCandidateSCAssociationCollection"); + OutInTrackSuperClusterAssociationCollection_ = config.getParameter("outInTrackCandidateSCAssociationCollection"); + InOutTrackSuperClusterAssociationCollection_ = config.getParameter("inOutTrackCandidateSCAssociationCollection"); barrelecalCollection_ = - consumes(conf_.getParameter("barrelEcalRecHitCollection")); + consumes(config.getParameter("barrelEcalRecHitCollection")); endcapecalCollection_ = - consumes(conf_.getParameter("endcapEcalRecHitCollection")); + consumes(config.getParameter("endcapEcalRecHitCollection")); hcalTowers_ = - consumes(conf_.getParameter("hcalTowers")); - hOverEConeSize_ = conf_.getParameter("hOverEConeSize"); - maxHOverE_ = conf_.getParameter("maxHOverE"); - minSCEt_ = conf_.getParameter("minSCEt"); - isoConeR_ = conf_.getParameter("isoConeR"); - isoInnerConeR_ = conf_.getParameter("isoInnerConeR"); - isoEtaSlice_ = conf_.getParameter("isoEtaSlice"); - isoEtMin_ = conf_.getParameter("isoEtMin"); - isoEMin_ = conf_.getParameter("isoEMin"); - vetoClusteredHits_ = conf_.getParameter("vetoClusteredHits"); - useNumXtals_ = conf_.getParameter("useNumXstals"); - ecalIsoCut_offset_ = conf_.getParameter("ecalIsoCut_offset"); - ecalIsoCut_slope_ = conf_.getParameter("ecalIsoCut_slope"); + consumes(config.getParameter("hcalTowers")); + hOverEConeSize_ = config.getParameter("hOverEConeSize"); + maxHOverE_ = config.getParameter("maxHOverE"); + minSCEt_ = config.getParameter("minSCEt"); + isoConeR_ = config.getParameter("isoConeR"); + isoInnerConeR_ = config.getParameter("isoInnerConeR"); + isoEtaSlice_ = config.getParameter("isoEtaSlice"); + isoEtMin_ = config.getParameter("isoEtMin"); + isoEMin_ = config.getParameter("isoEMin"); + vetoClusteredHits_ = config.getParameter("vetoClusteredHits"); + useNumXtals_ = config.getParameter("useNumXstals"); + ecalIsoCut_offset_ = config.getParameter("ecalIsoCut_offset"); + ecalIsoCut_slope_ = config.getParameter("ecalIsoCut_slope"); //Flags and Severities to be excluded from photon calculations const std::vector flagnamesEB = @@ -157,12 +156,6 @@ void ConversionTrackCandidateProducer::beginRun (edm::Run const& r , edm::Event } -void ConversionTrackCandidateProducer::endRun (edm::Run const& r , edm::EventSetup const & theEventSetup) { -} - - - - void ConversionTrackCandidateProducer::produce(edm::Event& theEvent, const edm::EventSetup& theEventSetup) { using namespace edm;