Skip to content

Commit

Permalink
Remove ParameterSet member from ConversionTrackCandidateProducer
Browse files Browse the repository at this point in the history
  • Loading branch information
@makortel
makortel committed Apr 14, 2014
1 parent 1b1c44c commit f797a07
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 32 deletions.
2 changes: 0 additions & 2 deletions RecoEgamma/EgammaPhotonProducers/interface/ConversionTrackCandidateProducer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -65,7 +64,6 @@ class ConversionTrackCandidateProducer : public edm::EDProducer {
edm::EDGetTokenT<edm::View<reco::CaloCluster> > bcEndcapCollection_;
edm::EDGetTokenT<edm::View<reco::CaloCluster> > scHybridBarrelProducer_;
edm::EDGetTokenT<edm::View<reco::CaloCluster> > scIslandEndcapProducer_;
edm::ParameterSet conf_;
edm::EDGetTokenT<CaloTowerCollection> hcalTowers_;
edm::EDGetTokenT<EcalRecHitCollection> barrelecalCollection_;
edm::EDGetTokenT<EcalRecHitCollection> endcapecalCollection_;
Expand Down
53 changes: 23 additions & 30 deletions RecoEgamma/EgammaPhotonProducers/src/ConversionTrackCandidateProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ namespace {
}

ConversionTrackCandidateProducer::ConversionTrackCandidateProducer(const edm::ParameterSet& config) :
conf_(config),
theTrajectoryBuilder_(createBaseCkfTrajectoryBuilder(config.getParameter<edm::ParameterSet>("TrajectoryBuilder"), consumesCollector())),
theNavigationSchool_(0),
theOutInSeedFinder_(new OutInConversionSeedFinder(config)),
Expand All @@ -68,41 +67,41 @@ ConversionTrackCandidateProducer::ConversionTrackCandidateProducer(const edm::Pa


bcBarrelCollection_ =
consumes<edm::View<reco::CaloCluster> >(conf_.getParameter<edm::InputTag>("bcBarrelCollection"));
consumes<edm::View<reco::CaloCluster> >(config.getParameter<edm::InputTag>("bcBarrelCollection"));
bcEndcapCollection_ =
consumes<edm::View<reco::CaloCluster> >(conf_.getParameter<edm::InputTag>("bcEndcapCollection"));
consumes<edm::View<reco::CaloCluster> >(config.getParameter<edm::InputTag>("bcEndcapCollection"));

scHybridBarrelProducer_ =
consumes<edm::View<reco::CaloCluster> >(conf_.getParameter<edm::InputTag>("scHybridBarrelProducer"));
consumes<edm::View<reco::CaloCluster> >(config.getParameter<edm::InputTag>("scHybridBarrelProducer"));
scIslandEndcapProducer_ =
consumes<edm::View<reco::CaloCluster> >(conf_.getParameter<edm::InputTag>("scIslandEndcapProducer"));
consumes<edm::View<reco::CaloCluster> >(config.getParameter<edm::InputTag>("scIslandEndcapProducer"));

OutInTrackCandidateCollection_ = conf_.getParameter<std::string>("outInTrackCandidateCollection");
InOutTrackCandidateCollection_ = conf_.getParameter<std::string>("inOutTrackCandidateCollection");
OutInTrackCandidateCollection_ = config.getParameter<std::string>("outInTrackCandidateCollection");
InOutTrackCandidateCollection_ = config.getParameter<std::string>("inOutTrackCandidateCollection");


OutInTrackSuperClusterAssociationCollection_ = conf_.getParameter<std::string>("outInTrackCandidateSCAssociationCollection");
InOutTrackSuperClusterAssociationCollection_ = conf_.getParameter<std::string>("inOutTrackCandidateSCAssociationCollection");
OutInTrackSuperClusterAssociationCollection_ = config.getParameter<std::string>("outInTrackCandidateSCAssociationCollection");
InOutTrackSuperClusterAssociationCollection_ = config.getParameter<std::string>("inOutTrackCandidateSCAssociationCollection");

barrelecalCollection_ =
consumes<EcalRecHitCollection>(conf_.getParameter<edm::InputTag>("barrelEcalRecHitCollection"));
consumes<EcalRecHitCollection>(config.getParameter<edm::InputTag>("barrelEcalRecHitCollection"));
endcapecalCollection_ =
consumes<EcalRecHitCollection>(conf_.getParameter<edm::InputTag>("endcapEcalRecHitCollection"));
consumes<EcalRecHitCollection>(config.getParameter<edm::InputTag>("endcapEcalRecHitCollection"));

hcalTowers_ =
consumes<CaloTowerCollection>(conf_.getParameter<edm::InputTag>("hcalTowers"));
hOverEConeSize_ = conf_.getParameter<double>("hOverEConeSize");
maxHOverE_ = conf_.getParameter<double>("maxHOverE");
minSCEt_ = conf_.getParameter<double>("minSCEt");
isoConeR_ = conf_.getParameter<double>("isoConeR");
isoInnerConeR_ = conf_.getParameter<double>("isoInnerConeR");
isoEtaSlice_ = conf_.getParameter<double>("isoEtaSlice");
isoEtMin_ = conf_.getParameter<double>("isoEtMin");
isoEMin_ = conf_.getParameter<double>("isoEMin");
vetoClusteredHits_ = conf_.getParameter<bool>("vetoClusteredHits");
useNumXtals_ = conf_.getParameter<bool>("useNumXstals");
ecalIsoCut_offset_ = conf_.getParameter<double>("ecalIsoCut_offset");
ecalIsoCut_slope_ = conf_.getParameter<double>("ecalIsoCut_slope");
consumes<CaloTowerCollection>(config.getParameter<edm::InputTag>("hcalTowers"));
hOverEConeSize_ = config.getParameter<double>("hOverEConeSize");
maxHOverE_ = config.getParameter<double>("maxHOverE");
minSCEt_ = config.getParameter<double>("minSCEt");
isoConeR_ = config.getParameter<double>("isoConeR");
isoInnerConeR_ = config.getParameter<double>("isoInnerConeR");
isoEtaSlice_ = config.getParameter<double>("isoEtaSlice");
isoEtMin_ = config.getParameter<double>("isoEtMin");
isoEMin_ = config.getParameter<double>("isoEMin");
vetoClusteredHits_ = config.getParameter<bool>("vetoClusteredHits");
useNumXtals_ = config.getParameter<bool>("useNumXstals");
ecalIsoCut_offset_ = config.getParameter<double>("ecalIsoCut_offset");
ecalIsoCut_slope_ = config.getParameter<double>("ecalIsoCut_slope");

//Flags and Severities to be excluded from photon calculations
const std::vector<std::string> flagnamesEB =
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit f797a07

Please sign in to comment.