diff --git a/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronSeedProducer.h b/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronSeedProducer.h index b11f45dd255dd..c04aad390ac2a 100644 --- a/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronSeedProducer.h +++ b/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronSeedProducer.h @@ -2,7 +2,7 @@ #define SiStripElectronSeedProducer_h -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -12,7 +12,7 @@ class SiStripElectronSeedGenerator; -class SiStripElectronSeedProducer : public edm::EDProducer +class SiStripElectronSeedProducer : public edm::stream::EDProducer<> { public: diff --git a/RecoEgamma/EgammaHFProducers/plugins/HFRecoEcalCandidateAlgo.cc b/RecoEgamma/EgammaHFProducers/plugins/HFRecoEcalCandidateAlgo.cc index b6adf4999fa49..fc0de117b5024 100644 --- a/RecoEgamma/EgammaHFProducers/plugins/HFRecoEcalCandidateAlgo.cc +++ b/RecoEgamma/EgammaHFProducers/plugins/HFRecoEcalCandidateAlgo.cc @@ -25,7 +25,6 @@ HFRecoEcalCandidateAlgo::HFRecoEcalCandidateAlgo(bool correct,double e9e25Cut,do const std::vector& eSeLCut, const reco::HFValueStruct hfvv ) : - m_correct(correct), m_e9e25Cut(e9e25Cut), m_intercept2DCut(intercept2DCut), @@ -39,10 +38,9 @@ HFRecoEcalCandidateAlgo::HFRecoEcalCandidateAlgo(bool correct,double e9e25Cut,do m_era(4), m_hfvv(hfvv) { - } -RecoEcalCandidate HFRecoEcalCandidateAlgo::correctEPosition(const SuperCluster& original , const HFEMClusterShape& shape,int nvtx) { +RecoEcalCandidate HFRecoEcalCandidateAlgo::correctEPosition(const SuperCluster& original , const HFEMClusterShape& shape,int nvtx) const { double corEta=original.eta(); //piece-wise log energy correction to eta double logel=log(shape.eLong3x3()/100.0); @@ -108,7 +106,7 @@ RecoEcalCandidate HFRecoEcalCandidateAlgo::correctEPosition(const SuperCluster& void HFRecoEcalCandidateAlgo::produce(const edm::Handle& SuperClusters, const HFEMClusterShapeAssociationCollection& AssocShapes, RecoEcalCandidateCollection& RecoECand, - int nvtx) { + int nvtx) const { diff --git a/RecoEgamma/EgammaHFProducers/plugins/HFRecoEcalCandidateAlgo.h b/RecoEgamma/EgammaHFProducers/plugins/HFRecoEcalCandidateAlgo.h index 92f0c342524bf..2a45ef6fbd5f4 100644 --- a/RecoEgamma/EgammaHFProducers/plugins/HFRecoEcalCandidateAlgo.h +++ b/RecoEgamma/EgammaHFProducers/plugins/HFRecoEcalCandidateAlgo.h @@ -35,24 +35,24 @@ class HFRecoEcalCandidateAlgo { void produce(const edm::Handle& SuperClusters, const reco::HFEMClusterShapeAssociationCollection& AssocShapes, reco::RecoEcalCandidateCollection& RecoECand, - int nvtx); + int nvtx) const; private: - reco::RecoEcalCandidate correctEPosition(const reco::SuperCluster& original, const reco::HFEMClusterShape& shape, int nvtx); - bool m_correct; - double m_e9e25Cut; - double m_intercept2DCut; - double m_intercept2DSlope; - double m_e1e9Cuthi; - double m_eCOREe9Cuthi; - double m_eSeLCuthi; - double m_e1e9Cutlo; - double m_eCOREe9Cutlo; - double m_eSeLCutlo; - int m_era; - bool m_correctForPileup; - reco::HFValueStruct m_hfvv; + reco::RecoEcalCandidate correctEPosition(const reco::SuperCluster& original, const reco::HFEMClusterShape& shape, int nvtx) const; + + const bool m_correct; + const double m_e9e25Cut; + const double m_intercept2DCut; + const double m_intercept2DSlope; + const double m_e1e9Cuthi; + const double m_eCOREe9Cuthi; + const double m_eSeLCuthi; + const double m_e1e9Cutlo; + const double m_eCOREe9Cutlo; + const double m_eSeLCutlo; + const int m_era; + const reco::HFValueStruct m_hfvv; }; diff --git a/RecoEgamma/EgammaHFProducers/plugins/HLTHFRecoEcalCandidateProducer.cc b/RecoEgamma/EgammaHFProducers/plugins/HLTHFRecoEcalCandidateProducer.cc index d7474b37b1ca9..db72ca66ca805 100644 --- a/RecoEgamma/EgammaHFProducers/plugins/HLTHFRecoEcalCandidateProducer.cc +++ b/RecoEgamma/EgammaHFProducers/plugins/HLTHFRecoEcalCandidateProducer.cc @@ -49,7 +49,7 @@ HLTHFRecoEcalCandidateProducer::HLTHFRecoEcalCandidateProducer(edm::ParameterSet } -void HLTHFRecoEcalCandidateProducer::produce(edm::Event & e, edm::EventSetup const& iSetup) { +void HLTHFRecoEcalCandidateProducer::produce(edm::StreamID sid, edm::Event & e, edm::EventSetup const& iSetup) const { edm::Handle super_clus; diff --git a/RecoEgamma/EgammaHFProducers/plugins/HLTHFRecoEcalCandidateProducer.h b/RecoEgamma/EgammaHFProducers/plugins/HLTHFRecoEcalCandidateProducer.h index 64472434d09d2..88b10fa21ed59 100644 --- a/RecoEgamma/EgammaHFProducers/plugins/HLTHFRecoEcalCandidateProducer.h +++ b/RecoEgamma/EgammaHFProducers/plugins/HLTHFRecoEcalCandidateProducer.h @@ -13,7 +13,7 @@ // // -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -21,19 +21,18 @@ #include "HFRecoEcalCandidateAlgo.h" #include "HFValueStruct.h" -class HLTHFRecoEcalCandidateProducer : public edm::EDProducer { +class HLTHFRecoEcalCandidateProducer : public edm::global::EDProducer<> { public: explicit HLTHFRecoEcalCandidateProducer(edm::ParameterSet const& conf); - void produce(edm::Event& e, edm::EventSetup const& iSetup) override; + void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override; private: - edm::InputTag hfclusters_,vertices_; - int HFDBversion_; - std::vector HFDBvector_; - bool doPU_; - double Cut2D_; - double defaultSlope2D_; - reco::HFValueStruct hfvars_; - HFRecoEcalCandidateAlgo algo_; + const edm::InputTag hfclusters_,vertices_; + const int HFDBversion_; + const std::vector HFDBvector_; + const double Cut2D_; + const double defaultSlope2D_; + const reco::HFValueStruct hfvars_; + const HFRecoEcalCandidateAlgo algo_; }; #endif diff --git a/RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTEcalIsolation.h b/RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTEcalIsolation.h index ddd638fb75250..73f1e28230bc4 100644 --- a/RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTEcalIsolation.h +++ b/RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTEcalIsolation.h @@ -42,12 +42,12 @@ class EgammaHLTEcalIsolation float isolPtSum(const reco::RecoCandidate *recocandidate, const std::vector& sclusters, - const std::vector& bclusters); + const std::vector& bclusters) const; /// Get Et cut for ecal hits - float getetMin() { return etMin; } + float getetMin() const { return etMin; } /// Get isolation cone size. - float getConeSize() { return conesize; } + float getConeSize() const { return conesize; } private: diff --git a/RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTHcalIsolationDoubleCone.h b/RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTHcalIsolationDoubleCone.h index be1a477278e34..f12c3f14be736 100644 --- a/RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTHcalIsolationDoubleCone.h +++ b/RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTHcalIsolationDoubleCone.h @@ -50,23 +50,23 @@ class EgammaHLTHcalIsolationDoubleCone } - float isolPtSum(const reco::RecoCandidate* recocandidate, const HBHERecHitCollection* hbhe, const HFRecHitCollection* hf, const CaloGeometry* geometry); + float isolPtSum(const reco::RecoCandidate* recocandidate, const HBHERecHitCollection* hbhe, const HFRecHitCollection* hf, const CaloGeometry* geometry) const; /// Get pt cut for hcal hits - float getptMin() { return ptMin; } + float getptMin() const { return ptMin; } /// Get isolation cone size. - float getConeSize() { return conesize; } + float getConeSize() const { return conesize; } /// Get exclusion region - float getExclusion() { return exclusion; } + float getExclusion() const { return exclusion; } private: // ---------- member data -------------------------------- // Parameters of isolation cone geometry. - float ptMin; - float conesize; - float exclusion; + const float ptMin; + const float conesize; + const float exclusion; }; diff --git a/RecoEgamma/EgammaHLTAlgos/src/EgammaHLTEcalIsolation.cc b/RecoEgamma/EgammaHLTAlgos/src/EgammaHLTEcalIsolation.cc index b0919549977a5..eba194742984a 100644 --- a/RecoEgamma/EgammaHLTAlgos/src/EgammaHLTEcalIsolation.cc +++ b/RecoEgamma/EgammaHLTAlgos/src/EgammaHLTEcalIsolation.cc @@ -21,7 +21,7 @@ float EgammaHLTEcalIsolation::isolPtSum(const reco::RecoCandidate* recocandidate, const std::vector& sclusters, - const std::vector& bclusters){ + const std::vector& bclusters) const { float ecalIsol=0.; diff --git a/RecoEgamma/EgammaHLTAlgos/src/EgammaHLTHcalIsolationDoubleCone.cc b/RecoEgamma/EgammaHLTAlgos/src/EgammaHLTHcalIsolationDoubleCone.cc index b7165d216d070..37e881146b049 100644 --- a/RecoEgamma/EgammaHLTAlgos/src/EgammaHLTHcalIsolationDoubleCone.cc +++ b/RecoEgamma/EgammaHLTAlgos/src/EgammaHLTHcalIsolationDoubleCone.cc @@ -21,7 +21,7 @@ -float EgammaHLTHcalIsolationDoubleCone::isolPtSum(const reco::RecoCandidate* recocandidate, const HBHERecHitCollection* hbhe, const HFRecHitCollection* hf, const CaloGeometry* geometry){ +float EgammaHLTHcalIsolationDoubleCone::isolPtSum(const reco::RecoCandidate* recocandidate, const HBHERecHitCollection* hbhe, const HFRecHitCollection* hf, const CaloGeometry* geometry) const { float hcalIsol=0.; diff --git a/RecoEgamma/EgammaHLTProducers/interface/ESListOfFEDSProducer.h b/RecoEgamma/EgammaHLTProducers/interface/ESListOfFEDSProducer.h index 6ba5c618a2ca7..5ddaf8c085b91 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/ESListOfFEDSProducer.h +++ b/RecoEgamma/EgammaHLTProducers/interface/ESListOfFEDSProducer.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include @@ -28,14 +28,12 @@ namespace edm { class ConfigurationDescriptions; } -class ESListOfFEDSProducer : public edm::EDProducer { +class ESListOfFEDSProducer : public edm::stream::EDProducer<> { public: ESListOfFEDSProducer(const edm::ParameterSet& pset); ~ESListOfFEDSProducer() override; void produce(edm::Event & e, const edm::EventSetup& c) override; - void beginJob(void) override; - void endJob(void) override; void Egamma(edm::Event& e, const edm::EventSetup& es, std::vector& done, std::vector& FEDs); void Muon(edm::Event& e, const edm::EventSetup& es, std::vector& done, std::vector& FEDs); void Jets(edm::Event& e, const edm::EventSetup& es, std::vector& done, std::vector& FEDs); diff --git a/RecoEgamma/EgammaHLTProducers/interface/ESRecHitsMerger.h b/RecoEgamma/EgammaHLTProducers/interface/ESRecHitsMerger.h index 177626c3a7657..9269ea14fcf1a 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/ESRecHitsMerger.h +++ b/RecoEgamma/EgammaHLTProducers/interface/ESRecHitsMerger.h @@ -2,7 +2,7 @@ #define EventFilter_ESRecHitsMerger_H #include -#include +#include #include #include @@ -18,12 +18,12 @@ namespace edm { class ConfigurationDescriptions; } -class ESRecHitsMerger : public edm::EDProducer { +class ESRecHitsMerger : public edm::global::EDProducer<> { public: ESRecHitsMerger(const edm::ParameterSet& pset); ~ESRecHitsMerger() override; - void produce(edm::Event & e, const edm::EventSetup& c) override; + void produce(edm::StreamID sid, edm::Event & e, const edm::EventSetup& c) const override; void beginJob(void) override; void endJob(void) override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); diff --git a/RecoEgamma/EgammaHLTProducers/interface/EcalListOfFEDSProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EcalListOfFEDSProducer.h index 8f65c96b13b0a..a5c76ba5103e1 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EcalListOfFEDSProducer.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EcalListOfFEDSProducer.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include @@ -27,14 +27,13 @@ namespace edm { class ConfigurationDescriptions; } -class EcalListOfFEDSProducer : public edm::EDProducer { +class EcalListOfFEDSProducer : public edm::stream::EDProducer<> { public: EcalListOfFEDSProducer(const edm::ParameterSet& pset); ~EcalListOfFEDSProducer() override; void produce(edm::Event & e, const edm::EventSetup& c) override; - void beginJob(void) override; - void endJob(void) override; + void Egamma(edm::Event& e, const edm::EventSetup& es, std::vector& done, std::vector& FEDs); void Muon(edm::Event& e, const edm::EventSetup& es, std::vector& done, std::vector& FEDs); void Jets(edm::Event& e, const edm::EventSetup& es, std::vector& done, std::vector& FEDs); diff --git a/RecoEgamma/EgammaHLTProducers/interface/EcalRecHitsMerger.h b/RecoEgamma/EgammaHLTProducers/interface/EcalRecHitsMerger.h index 6e8accae781de..81d74d34b9694 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EcalRecHitsMerger.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EcalRecHitsMerger.h @@ -2,7 +2,7 @@ #define EventFilter_EcalRecHitsMerger_H #include -#include +#include #include #include @@ -18,12 +18,12 @@ namespace edm { class ConfigurationDescriptions; } -class EcalRecHitsMerger : public edm::EDProducer { +class EcalRecHitsMerger : public edm::global::EDProducer<> { public: EcalRecHitsMerger(const edm::ParameterSet& pset); ~EcalRecHitsMerger() override; - void produce(edm::Event & e, const edm::EventSetup& c) override; + void produce(edm::StreamID sid, edm::Event & e, const edm::EventSetup& c) const override; void beginJob(void) override; void endJob(void) override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTCombinedIsolationProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTCombinedIsolationProducer.h index 9971956bd0468..65226ea20d280 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTCombinedIsolationProducer.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTCombinedIsolationProducer.h @@ -13,7 +13,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -27,20 +27,20 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTCombinedIsolationProducer : public edm::EDProducer { +class EgammaHLTCombinedIsolationProducer : public edm::global::EDProducer<> { public: explicit EgammaHLTCombinedIsolationProducer(const edm::ParameterSet&); ~EgammaHLTCombinedIsolationProducer() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override; private: // ----------member data --------------------------- edm::EDGetTokenT recoEcalCandidateProducer_; std::vector > IsolTag_; std::vector IsolWeight_; - edm::ParameterSet conf_; + const edm::ParameterSet conf_; }; diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTEcalIsolationProducersRegional.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTEcalIsolationProducersRegional.h index 6e159d1c73fc4..545edeb598031 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTEcalIsolationProducersRegional.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTEcalIsolationProducersRegional.h @@ -23,7 +23,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -42,25 +42,25 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTEcalIsolationProducersRegional : public edm::EDProducer { +class EgammaHLTEcalIsolationProducersRegional : public edm::global::EDProducer<> { public: explicit EgammaHLTEcalIsolationProducersRegional(const edm::ParameterSet&); ~EgammaHLTEcalIsolationProducersRegional() override; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - edm::EDGetTokenT recoEcalCandidateProducer_; - edm::EDGetTokenT bcBarrelProducer_; - edm::EDGetTokenT bcEndcapProducer_; - edm::EDGetTokenT scIslandBarrelProducer_; - edm::EDGetTokenT scIslandEndcapProducer_; + const edm::ParameterSet conf_; - edm::ParameterSet conf_; + const edm::EDGetTokenT recoEcalCandidateProducer_; + const edm::EDGetTokenT bcBarrelProducer_; + const edm::EDGetTokenT bcEndcapProducer_; + const edm::EDGetTokenT scIslandBarrelProducer_; + const edm::EDGetTokenT scIslandEndcapProducer_; - double egEcalIsoEtMin_; - double egEcalIsoConeSize_; - int algoType_; - EgammaHLTEcalIsolation* test_; + const double egEcalIsoEtMin_; + const double egEcalIsoConeSize_; + const int algoType_; + EgammaHLTEcalIsolation const * const test_; }; diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTEcalRecIsolationProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTEcalRecIsolationProducer.h index 6f97d1dd1e27d..145e6f41afbf3 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTEcalRecIsolationProducer.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTEcalRecIsolationProducer.h @@ -18,7 +18,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -31,11 +31,11 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTEcalRecIsolationProducer : public edm::EDProducer { +class EgammaHLTEcalRecIsolationProducer : public edm::global::EDProducer<> { public: explicit EgammaHLTEcalRecIsolationProducer(const edm::ParameterSet&); ~EgammaHLTEcalRecIsolationProducer() override; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTElectronCombinedIsolationProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTElectronCombinedIsolationProducer.h index 4c99002f4a447..bcc015d19ef5d 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTElectronCombinedIsolationProducer.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTElectronCombinedIsolationProducer.h @@ -13,7 +13,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -30,11 +30,11 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTElectronCombinedIsolationProducer : public edm::EDProducer { +class EgammaHLTElectronCombinedIsolationProducer : public edm::global::EDProducer<> { public: explicit EgammaHLTElectronCombinedIsolationProducer(const edm::ParameterSet&); ~EgammaHLTElectronCombinedIsolationProducer() override; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHcalIsolationDoubleConeProducers.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHcalIsolationDoubleConeProducers.h index b2643ea12cde9..b3a5c1b5b5d70 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHcalIsolationDoubleConeProducers.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHcalIsolationDoubleConeProducers.h @@ -20,7 +20,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -34,25 +34,25 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTHcalIsolationDoubleConeProducers : public edm::EDProducer { +class EgammaHLTHcalIsolationDoubleConeProducers : public edm::global::EDProducer<> { public: explicit EgammaHLTHcalIsolationDoubleConeProducers(const edm::ParameterSet&); ~EgammaHLTHcalIsolationDoubleConeProducers() override; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - edm::EDGetTokenT recoEcalCandidateProducer_; - edm::EDGetTokenT hbRecHitProducer_; - edm::EDGetTokenT hfRecHitProducer_; + const edm::ParameterSet conf_; - double egHcalIsoPtMin_; - double egHcalIsoConeSize_; - double egHcalExclusion_; + const edm::EDGetTokenT recoEcalCandidateProducer_; + const edm::EDGetTokenT hbRecHitProducer_; + const edm::EDGetTokenT hfRecHitProducer_; - edm::ParameterSet conf_; + const double egHcalIsoPtMin_; + const double egHcalIsoConeSize_; + const double egHcalExclusion_; - EgammaHLTHcalIsolationDoubleCone* test_; + EgammaHLTHcalIsolationDoubleCone const * const test_; }; diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHcalIsolationProducersRegional.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHcalIsolationProducersRegional.h index b811514ba9215..280f13581e7ad 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHcalIsolationProducersRegional.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHcalIsolationProducersRegional.h @@ -18,7 +18,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -35,29 +35,27 @@ namespace edm { class EgammaHLTHcalIsolation; -class EgammaHLTHcalIsolationProducersRegional : public edm::EDProducer { +class EgammaHLTHcalIsolationProducersRegional : public edm::global::EDProducer<> { public: explicit EgammaHLTHcalIsolationProducersRegional(const edm::ParameterSet&); ~EgammaHLTHcalIsolationProducersRegional() override; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - EgammaHLTHcalIsolationProducersRegional(const EgammaHLTHcalIsolationProducersRegional& rhs){} - EgammaHLTHcalIsolationProducersRegional& operator=(const EgammaHLTHcalIsolationProducersRegional& rhs){return *this;} - edm::EDGetTokenT recoEcalCandidateProducer_; - edm::EDGetTokenT hbheRecHitProducer_; - edm::EDGetTokenT rhoProducer_; - - bool doRhoCorrection_; - float rhoScale_; - float rhoMax_; - bool doEtSum_; - float effectiveAreaBarrel_; - float effectiveAreaEndcap_; - - EgammaHLTHcalIsolation* isolAlgo_; + const edm::EDGetTokenT recoEcalCandidateProducer_; + const edm::EDGetTokenT hbheRecHitProducer_; + const edm::EDGetTokenT rhoProducer_; + + const bool doRhoCorrection_; + const float rhoMax_; + const float rhoScale_; + const bool doEtSum_; + const float effectiveAreaBarrel_; + const float effectiveAreaEndcap_; + + EgammaHLTHcalIsolation const * const isolAlgo_; }; diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHybridClusterProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHybridClusterProducer.h index 255cc221359ed..15d5dab163643 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHybridClusterProducer.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHybridClusterProducer.h @@ -4,7 +4,7 @@ #include #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -20,39 +20,34 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTHybridClusterProducer : public edm::EDProducer { +class EgammaHLTHybridClusterProducer : public edm::stream::EDProducer<> { public: EgammaHLTHybridClusterProducer(const edm::ParameterSet& ps); ~EgammaHLTHybridClusterProducer() override; void produce(edm::Event&, const edm::EventSetup&) override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - private: + private: - int nMaxPrintout_; // max # of printouts - int nEvt_; // internal counter of events + const std::string basicclusterCollection_; + const std::string superclusterCollection_; + const edm::EDGetTokenT hittoken_; + const edm::InputTag hitcollection_; + + const edm::EDGetTokenT l1TagIsolated_; + const edm::EDGetTokenT l1TagNonIsolated_; + + const bool doIsolated_; + const double l1LowerThr_; + const double l1UpperThr_; + const double l1LowerThrIgnoreIsolation_; - bool doIsolated_; + const double regionEtaMargin_; + const double regionPhiMargin_; - std::string basicclusterCollection_; - std::string superclusterCollection_; - edm::EDGetTokenT hittoken_; - edm::InputTag hitcollection_; - - edm::EDGetTokenT l1TagIsolated_; - edm::EDGetTokenT l1TagNonIsolated_; - //edm::InputTag l1Tag_; - double l1LowerThr_; - double l1UpperThr_; - double l1LowerThrIgnoreIsolation_; + const PositionCalc posCalculator_; // position calculation algorithm + HybridClusterAlgo * const hybrid_p; // clustering algorithm - double regionEtaMargin_; - double regionPhiMargin_; - - HybridClusterAlgo * hybrid_p; // clustering algorithm - PositionCalc posCalculator_; // position calculation algorithm - - bool counterExceeded() const { return ((nEvt_ > nMaxPrintout_) || (nMaxPrintout_ < 0));} }; #endif diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTIslandClusterProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTIslandClusterProducer.h index b8d7ccf8dfedc..85fc3534c6c27 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTIslandClusterProducer.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTIslandClusterProducer.h @@ -5,7 +5,7 @@ #include #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -22,7 +22,7 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTIslandClusterProducer : public edm::EDProducer { +class EgammaHLTIslandClusterProducer : public edm::stream::EDProducer<> { public: EgammaHLTIslandClusterProducer(const edm::ParameterSet& ps); ~EgammaHLTIslandClusterProducer() override; @@ -31,45 +31,39 @@ class EgammaHLTIslandClusterProducer : public edm::EDProducer { private: - int nMaxPrintout_; // max # of printouts - int nEvt_; // internal counter of events - - IslandClusterAlgo::VerbosityLevel verbosity; - - bool doBarrel_; - bool doEndcaps_; - bool doIsolated_; - - edm::InputTag barrelHitCollection_; - edm::InputTag endcapHitCollection_; - edm::EDGetTokenT barrelHitToken_; - edm::EDGetTokenT endcapHitToken_; + const bool doBarrel_; + const bool doEndcaps_; + const bool doIsolated_; - std::string barrelClusterCollection_; - std::string endcapClusterCollection_; + const edm::InputTag barrelHitCollection_; + const edm::InputTag endcapHitCollection_; + const edm::EDGetTokenT barrelHitToken_; + const edm::EDGetTokenT endcapHitToken_; - edm::EDGetTokenT l1TagIsolated_; - edm::EDGetTokenT l1TagNonIsolated_; - double l1LowerThr_; - double l1UpperThr_; - double l1LowerThrIgnoreIsolation_; + const std::string barrelClusterCollection_; + const std::string endcapClusterCollection_; - double regionEtaMargin_; - double regionPhiMargin_; + const edm::EDGetTokenT l1TagIsolated_; + const edm::EDGetTokenT l1TagNonIsolated_; + const double l1LowerThr_; + const double l1UpperThr_; + const double l1LowerThrIgnoreIsolation_; - PositionCalc posCalculator_; // position calculation algorithm - IslandClusterAlgo * island_p; + const double regionEtaMargin_; + const double regionPhiMargin_; - bool counterExceeded() const { return ((nEvt_ > nMaxPrintout_) || (nMaxPrintout_ < 0)); } + const PositionCalc posCalculator_; // position calculation algorithm + const std::string verb_; + IslandClusterAlgo * const island_p; const EcalRecHitCollection * getCollection(edm::Event& evt, - edm::EDGetTokenT& hitToken); + const edm::EDGetTokenT& hitToken) const ; void clusterizeECALPart(edm::Event &evt, const edm::EventSetup &es, - edm::EDGetTokenT& hitToken, + const edm::EDGetTokenT& hitToken, const std::string& clusterCollection, const std::vector& regions, - const IslandClusterAlgo::EcalPart& ecalPart); + const IslandClusterAlgo::EcalPart& ecalPart) const ; }; #endif diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTMulti5x5ClusterProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTMulti5x5ClusterProducer.h index 1d8379a00b071..79052399fc8b2 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTMulti5x5ClusterProducer.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTMulti5x5ClusterProducer.h @@ -5,7 +5,7 @@ #include #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -24,7 +24,7 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTMulti5x5ClusterProducer : public edm::EDProducer { +class EgammaHLTMulti5x5ClusterProducer : public edm::stream::EDProducer<> { public: EgammaHLTMulti5x5ClusterProducer(const edm::ParameterSet& ps); ~EgammaHLTMulti5x5ClusterProducer() override; @@ -32,8 +32,6 @@ class EgammaHLTMulti5x5ClusterProducer : public edm::EDProducer { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - int nMaxPrintout_; // max # of printouts - int nEvt_; // internal counter of events bool doBarrel_; bool doEndcaps_; @@ -58,18 +56,16 @@ class EgammaHLTMulti5x5ClusterProducer : public edm::EDProducer { PositionCalc posCalculator_; // position calculation algorithm Multi5x5ClusterAlgo * Multi5x5_p; - - bool counterExceeded() const { return ((nEvt_ > nMaxPrintout_) || (nMaxPrintout_ < 0)); } const EcalRecHitCollection * getCollection(edm::Event& evt, - edm::EDGetTokenT& hitToken); + const edm::EDGetTokenT& hitToken) const ; void clusterizeECALPart(edm::Event &evt, const edm::EventSetup &es, - edm::EDGetTokenT& hitToken, + const edm::EDGetTokenT& hitToken, const std::string& clusterCollection, const std::vector& regions, - const reco::CaloID::Detectors detector); + const reco::CaloID::Detectors detector) const ; void outputValidationInfo(reco::CaloClusterPtrVector &clusterPtrVector); diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPFChargedIsolationProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPFChargedIsolationProducer.h index efcb790c2c247..2e5368049720d 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPFChargedIsolationProducer.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPFChargedIsolationProducer.h @@ -8,7 +8,7 @@ #include #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -28,12 +28,12 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTPFChargedIsolationProducer : public edm::EDProducer { +class EgammaHLTPFChargedIsolationProducer : public edm::global::EDProducer<> { public: explicit EgammaHLTPFChargedIsolationProducer(const edm::ParameterSet&); ~EgammaHLTPFChargedIsolationProducer() override {}; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPFNeutralIsolationProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPFNeutralIsolationProducer.h index 9fdc92de5eefe..792a51a32cfb0 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPFNeutralIsolationProducer.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPFNeutralIsolationProducer.h @@ -9,7 +9,7 @@ #include #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -29,12 +29,12 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTPFNeutralIsolationProducer : public edm::EDProducer { +class EgammaHLTPFNeutralIsolationProducer : public edm::global::EDProducer<> { public: explicit EgammaHLTPFNeutralIsolationProducer(const edm::ParameterSet&); ~EgammaHLTPFNeutralIsolationProducer() override {}; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPFPhotonIsolationProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPFPhotonIsolationProducer.h index 3a3390c1d93da..c1bf1bb4048dc 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPFPhotonIsolationProducer.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPFPhotonIsolationProducer.h @@ -9,7 +9,7 @@ #include #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -29,12 +29,12 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTPFPhotonIsolationProducer : public edm::EDProducer { +class EgammaHLTPFPhotonIsolationProducer : public edm::global::EDProducer<> { public: explicit EgammaHLTPFPhotonIsolationProducer(const edm::ParameterSet&); ~EgammaHLTPFPhotonIsolationProducer() override {}; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTRegionalPixelSeedGeneratorProducers.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTRegionalPixelSeedGeneratorProducers.h index 05ec79f709a0b..87200bb086187 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTRegionalPixelSeedGeneratorProducers.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTRegionalPixelSeedGeneratorProducers.h @@ -9,7 +9,7 @@ // to find TrajectorySeeds. -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -28,7 +28,7 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTRegionalPixelSeedGeneratorProducers : public edm::EDProducer +class EgammaHLTRegionalPixelSeedGeneratorProducers : public edm::stream::EDProducer<> { public: @@ -38,9 +38,6 @@ class EgammaHLTRegionalPixelSeedGeneratorProducers : public edm::EDProducer void produce(edm::Event& e, const edm::EventSetup& c) override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - void beginRun(edm::Run const&run, const edm::EventSetup& es) final; - void endRun(edm::Run const&run, const edm::EventSetup& es) final; - private: std::unique_ptr combinatorialSeedGenerator; diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTRemoveDuplicatedSC.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTRemoveDuplicatedSC.h index 14ada926c18a1..15705b0c40248 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTRemoveDuplicatedSC.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTRemoveDuplicatedSC.h @@ -16,7 +16,7 @@ #include #include -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -28,12 +28,12 @@ namespace edm { class ConfigurationDescriptions; } -class EgammaHLTRemoveDuplicatedSC : public edm::EDProducer { +class EgammaHLTRemoveDuplicatedSC : public edm::global::EDProducer<> { public: explicit EgammaHLTRemoveDuplicatedSC(const edm::ParameterSet&); ~EgammaHLTRemoveDuplicatedSC() override; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTTimeCleanedRechitProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTTimeCleanedRechitProducer.h index 29d274da21d6a..5cd3b9782f697 100644 --- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTTimeCleanedRechitProducer.h +++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTTimeCleanedRechitProducer.h @@ -6,20 +6,20 @@ #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -class EgammaHLTTimeCleanedRechitProducer : public edm::EDProducer { +class EgammaHLTTimeCleanedRechitProducer : public edm::global::EDProducer<> { public: EgammaHLTTimeCleanedRechitProducer(const edm::ParameterSet& ps); ~EgammaHLTTimeCleanedRechitProducer() override; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: diff --git a/RecoEgamma/EgammaHLTProducers/src/ESListOfFEDSProducer.cc b/RecoEgamma/EgammaHLTProducers/src/ESListOfFEDSProducer.cc index 00f348655caf3..c9dc73616f5ce 100644 --- a/RecoEgamma/EgammaHLTProducers/src/ESListOfFEDSProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/ESListOfFEDSProducer.cc @@ -120,12 +120,6 @@ void ESListOfFEDSProducer::fillDescriptions(edm::ConfigurationDescriptions& desc } -void ESListOfFEDSProducer::beginJob() -{} - -void ESListOfFEDSProducer::endJob() -{} - void ESListOfFEDSProducer::produce(edm::Event & e, const edm::EventSetup& iSetup){ if (first_) { diff --git a/RecoEgamma/EgammaHLTProducers/src/ESRecHitsMerger.cc b/RecoEgamma/EgammaHLTProducers/src/ESRecHitsMerger.cc index 38a130a77c342..a5cd9f6165b53 100644 --- a/RecoEgamma/EgammaHLTProducers/src/ESRecHitsMerger.cc +++ b/RecoEgamma/EgammaHLTProducers/src/ESRecHitsMerger.cc @@ -64,7 +64,7 @@ void ESRecHitsMerger::beginJob(){ void ESRecHitsMerger::endJob(){ } -void ESRecHitsMerger::produce(edm::Event & e, const edm::EventSetup& iSetup){ +void ESRecHitsMerger::produce(edm::StreamID, edm::Event & e, const edm::EventSetup& iSetup) const { if (debug_) std::cout << " ESRecHitMerger : Run " << e.id().run() << " Event " << e.id().event() << std::endl; diff --git a/RecoEgamma/EgammaHLTProducers/src/EcalListOfFEDSProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EcalListOfFEDSProducer.cc index 3d56a59605fc8..438ef8af11200 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EcalListOfFEDSProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EcalListOfFEDSProducer.cc @@ -117,12 +117,6 @@ desc.add("OutputLabel", ""); descriptions.add(("hltEcalListOfFEDSProducer"), desc); } -void EcalListOfFEDSProducer::beginJob() -{} - -void EcalListOfFEDSProducer::endJob() -{} - void EcalListOfFEDSProducer::produce(edm::Event & e, const edm::EventSetup& iSetup){ if (first_) { diff --git a/RecoEgamma/EgammaHLTProducers/src/EcalRecHitsMerger.cc b/RecoEgamma/EgammaHLTProducers/src/EcalRecHitsMerger.cc index 766c04e011a14..9b54cbf1b28f5 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EcalRecHitsMerger.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EcalRecHitsMerger.cc @@ -79,7 +79,7 @@ void EcalRecHitsMerger::beginJob(){ void EcalRecHitsMerger::endJob(){ } -void EcalRecHitsMerger::produce(edm::Event & e, const edm::EventSetup& iSetup){ +void EcalRecHitsMerger::produce(edm::StreamID, edm::Event & e, const edm::EventSetup& iSetup) const { if (debug_) std::cout << " EcalRecHitMerger : Run " << e.id().run() << " Event " << e.id().event() << std::endl; diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTCombinedIsolationProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTCombinedIsolationProducer.cc index b94fefa1f7f88..405ccf6009b3d 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTCombinedIsolationProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTCombinedIsolationProducer.cc @@ -49,7 +49,7 @@ void EgammaHLTCombinedIsolationProducer::fillDescriptions(edm::ConfigurationDesc // ------------ method called to produce the data ------------ void -EgammaHLTCombinedIsolationProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { +EgammaHLTCombinedIsolationProducer::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { edm::Handle recoecalcandHandle; iEvent.getByToken(recoEcalCandidateProducer_, recoecalcandHandle); diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTEcalIsolationProducersRegional.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTEcalIsolationProducersRegional.cc index bdd6ee9fa8cf1..ae6532236f0b7 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTEcalIsolationProducersRegional.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTEcalIsolationProducersRegional.cc @@ -14,21 +14,19 @@ #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -EgammaHLTEcalIsolationProducersRegional::EgammaHLTEcalIsolationProducersRegional(const edm::ParameterSet& config) : conf_(config) { +EgammaHLTEcalIsolationProducersRegional::EgammaHLTEcalIsolationProducersRegional(const edm::ParameterSet& config) + : conf_(config) + , recoEcalCandidateProducer_ (consumes(conf_.getParameter("recoEcalCandidateProducer"))) + , bcBarrelProducer_ (consumes(conf_.getParameter("bcBarrelProducer"))) + , bcEndcapProducer_ (consumes(conf_.getParameter("bcEndcapProducer"))) + , scIslandBarrelProducer_ (consumes(conf_.getParameter("scIslandBarrelProducer"))) + , scIslandEndcapProducer_ (consumes(conf_.getParameter("scIslandEndcapProducer"))) + , egEcalIsoEtMin_ (conf_.getParameter("egEcalIsoEtMin")) + , egEcalIsoConeSize_ (conf_.getParameter("egEcalIsoConeSize")) + , algoType_ (conf_.getParameter("SCAlgoType")) + , test_ (new EgammaHLTEcalIsolation(egEcalIsoEtMin_,egEcalIsoConeSize_,algoType_)) +{ - // use configuration file to setup input/output collection names - - bcBarrelProducer_ = consumes(conf_.getParameter("bcBarrelProducer")); - bcEndcapProducer_ = consumes(conf_.getParameter("bcEndcapProducer")); - scIslandBarrelProducer_ = consumes(conf_.getParameter("scIslandBarrelProducer")); - scIslandEndcapProducer_ = consumes(conf_.getParameter("scIslandEndcapProducer")); - recoEcalCandidateProducer_ = consumes(conf_.getParameter("recoEcalCandidateProducer")); - - egEcalIsoEtMin_ = conf_.getParameter("egEcalIsoEtMin"); - egEcalIsoConeSize_ = conf_.getParameter("egEcalIsoConeSize"); - algoType_ = conf_.getParameter("SCAlgoType"); - test_ = new EgammaHLTEcalIsolation(egEcalIsoEtMin_,egEcalIsoConeSize_,algoType_); - //register your products produces < reco::RecoEcalCandidateIsolationMap >(); } @@ -51,7 +49,7 @@ void EgammaHLTEcalIsolationProducersRegional::fillDescriptions(edm::Configuratio } -void EgammaHLTEcalIsolationProducersRegional::produce(edm::Event& iEvent, const edm::EventSetup& iSetup){ +void EgammaHLTEcalIsolationProducersRegional::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { // Get the basic cluster collection in the Barrel edm::Handle bcBarrelHandle; diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTEcalRecIsolationProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTEcalRecIsolationProducer.cc index c23b09eb41348..fc4b3175dc04f 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTEcalRecIsolationProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTEcalRecIsolationProducer.cc @@ -87,7 +87,7 @@ void EgammaHLTEcalRecIsolationProducer::fillDescriptions(edm::ConfigurationDescr descriptions.add(("hltEgammaHLTEcalRecIsolationProducer"), desc); } -void EgammaHLTEcalRecIsolationProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { +void EgammaHLTEcalRecIsolationProducer::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { // Get the RecoEcalCandidate Collection edm::Handle recoecalcandHandle; diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTElectronCombinedIsolationProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTElectronCombinedIsolationProducer.cc index 42edd9c58cb40..4ee71fb764bce 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTElectronCombinedIsolationProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTElectronCombinedIsolationProducer.cc @@ -46,7 +46,7 @@ desc.add >("CaloIsolationWeight", std::vector()); descriptions.add("hltEgammaHLTElectronCombinedIsolationProducer", desc); } -void EgammaHLTElectronCombinedIsolationProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { +void EgammaHLTElectronCombinedIsolationProducer::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { edm::Handle electronHandle; iEvent.getByToken(electronProducer_,electronHandle); diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTElectronDetaDphiProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTElectronDetaDphiProducer.cc index 6978b0fe67556..1b65420d6bb3b 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTElectronDetaDphiProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTElectronDetaDphiProducer.cc @@ -123,7 +123,6 @@ std::pair EgammaHLTElectronDetaDphiProducer::calDEtaDPhiSCTrk(reco: float deltaeta = fabs(SCcorrPosition.eta()-eleref->track()->eta()); float deltaphi = 999.; - bool recoveryForFailingPropagation = false; if (variablesAtVtx_) { reco::TrackRef track = eleref->track(); reco::TransientTrack tt(track, magField_); @@ -133,10 +132,8 @@ std::pair EgammaHLTElectronDetaDphiProducer::calDEtaDPhiSCTrk(reco: EleRelPointPair scAtVtx(theClus->position(), sclTSOS.globalPosition(), bsPosition); deltaeta = fabs(scAtVtx.dEta()); deltaphi = fabs(scAtVtx.dPhi()); - } else { - recoveryForFailingPropagation = true; } - } else if (useTrackProjectionToEcal_ or recoveryForFailingPropagation) { + } else if (useTrackProjectionToEcal_) { ECALPositionCalculator posCalc; const math::XYZPoint vertex(bsPosition.x(),bsPosition.y(),eleref->track()->vz()); diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTGsfTrackVarProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTGsfTrackVarProducer.cc index 55cbbeede985d..d0621bb987186 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTGsfTrackVarProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTGsfTrackVarProducer.cc @@ -1,4 +1,4 @@ -/** \class EgammaHLTElectronDetaDphiProducer +/** \class EgammaHLTGsfTrackVarProducer * * \author Roberto Covarelli (CERN) * diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHcalIsolationDoubleConeProducers.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHcalIsolationDoubleConeProducers.cc index bd2e9fbb29fb3..4e75c3b2f3073 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHcalIsolationDoubleConeProducers.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHcalIsolationDoubleConeProducers.cc @@ -20,18 +20,16 @@ #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -EgammaHLTHcalIsolationDoubleConeProducers::EgammaHLTHcalIsolationDoubleConeProducers(const edm::ParameterSet& config) : conf_(config) +EgammaHLTHcalIsolationDoubleConeProducers::EgammaHLTHcalIsolationDoubleConeProducers(const edm::ParameterSet& config) + : conf_(config) + , recoEcalCandidateProducer_ (consumes(conf_.getParameter("recoEcalCandidateProducer"))) + , hbRecHitProducer_ (consumes(conf_.getParameter("hbRecHitProducer"))) + , hfRecHitProducer_ (consumes(conf_.getParameter("hfRecHitProducer"))) + , egHcalIsoPtMin_ (conf_.getParameter("egHcalIsoPtMin")) + , egHcalIsoConeSize_ (conf_.getParameter("egHcalIsoConeSize")) + , egHcalExclusion_ (conf_.getParameter("egHcalExclusion")) + , test_ (new EgammaHLTHcalIsolationDoubleCone(egHcalIsoPtMin_,egHcalIsoConeSize_,egHcalExclusion_)) { - // use configuration file to setup input/output collection names - recoEcalCandidateProducer_ = consumes(conf_.getParameter("recoEcalCandidateProducer")); - hbRecHitProducer_ = consumes(conf_.getParameter("hbRecHitProducer")); - hfRecHitProducer_ = consumes(conf_.getParameter("hfRecHitProducer")); - - egHcalIsoPtMin_ = conf_.getParameter("egHcalIsoPtMin"); - egHcalIsoConeSize_ = conf_.getParameter("egHcalIsoConeSize"); - egHcalExclusion_ = conf_.getParameter("egHcalExclusion"); - - test_ = new EgammaHLTHcalIsolationDoubleCone(egHcalIsoPtMin_,egHcalIsoConeSize_,egHcalExclusion_); //register your products produces < reco::RecoEcalCandidateIsolationMap >(); @@ -51,7 +49,7 @@ void EgammaHLTHcalIsolationDoubleConeProducers::fillDescriptions(edm::Configurat descriptions.add(("hltEgammaHLTHcalIsolationDoubleConeProducers"), desc); } -void EgammaHLTHcalIsolationDoubleConeProducers::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { +void EgammaHLTHcalIsolationDoubleConeProducers::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { // Get the HLT filtered objects edm::Handle recoecalcandHandle; iEvent.getByToken(recoEcalCandidateProducer_,recoecalcandHandle); diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHcalIsolationProducersRegional.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHcalIsolationProducersRegional.cc index ead51278cb003..4796d20cf2d7c 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHcalIsolationProducersRegional.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHcalIsolationProducersRegional.cc @@ -25,30 +25,23 @@ #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" EgammaHLTHcalIsolationProducersRegional::EgammaHLTHcalIsolationProducersRegional(const edm::ParameterSet& config) + : recoEcalCandidateProducer_ (consumes(config.getParameter("recoEcalCandidateProducer"))) + , hbheRecHitProducer_ (consumes(config.getParameter("hbheRecHitProducer"))) + , rhoProducer_ (consumes(config.getParameter("rhoProducer"))) + , doRhoCorrection_ (config.getParameter("doRhoCorrection")) + , rhoMax_ (config.getParameter("rhoMax")) + , rhoScale_ (config.getParameter("rhoScale")) + , doEtSum_ (config.getParameter("doEtSum")) + , effectiveAreaBarrel_ (config.getParameter("effectiveAreaBarrel")) + , effectiveAreaEndcap_ (config.getParameter("effectiveAreaEndcap")) + , isolAlgo_ (new EgammaHLTHcalIsolation(config.getParameter("eMinHB"), + config.getParameter("eMinHE"), + config.getParameter("etMinHB"), + config.getParameter("etMinHE"), + config.getParameter("innerCone"), + config.getParameter("outerCone"), + config.getParameter("depth"))) { - // use configuration file to setup input/output collection names - recoEcalCandidateProducer_ = consumes(config.getParameter("recoEcalCandidateProducer")); - hbheRecHitProducer_ = consumes(config.getParameter("hbheRecHitProducer")); - - doRhoCorrection_ = config.getParameter("doRhoCorrection"); - if (doRhoCorrection_) - rhoProducer_ = consumes(config.getParameter("rhoProducer")); - - rhoMax_ = config.getParameter("rhoMax"); - rhoScale_ = config.getParameter("rhoScale"); - - double eMinHB = config.getParameter("eMinHB"); - double eMinHE = config.getParameter("eMinHE"); - double etMinHB = config.getParameter("etMinHB"); - double etMinHE = config.getParameter("etMinHE"); - double innerCone = config.getParameter("innerCone"); - double outerCone = config.getParameter("outerCone"); - int depth = config.getParameter("depth"); - doEtSum_ = config.getParameter("doEtSum"); - effectiveAreaBarrel_ = config.getParameter("effectiveAreaBarrel"); - effectiveAreaEndcap_ = config.getParameter("effectiveAreaEndcap"); - isolAlgo_ = new EgammaHLTHcalIsolation(eMinHB,eMinHE,etMinHB,etMinHE,innerCone,outerCone,depth); - //register your products produces < reco::RecoEcalCandidateIsolationMap >(); } @@ -78,7 +71,7 @@ void EgammaHLTHcalIsolationProducersRegional::fillDescriptions(edm::Configuratio descriptions.add(("hltEgammaHLTHcalIsolationProducersRegional"), desc); } -void EgammaHLTHcalIsolationProducersRegional::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { +void EgammaHLTHcalIsolationProducersRegional::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { // Get the HLT filtered objects edm::Handle recoEcalCandHandle; diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHybridClusterProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHybridClusterProducer.cc index a6f4e497b2970..e1090796c85bc 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHybridClusterProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHybridClusterProducer.cc @@ -43,67 +43,53 @@ #include "RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHybridClusterProducer.h" -EgammaHLTHybridClusterProducer::EgammaHLTHybridClusterProducer(const edm::ParameterSet& ps) { - - basicclusterCollection_ = ps.getParameter("basicclusterCollection"); - superclusterCollection_ = ps.getParameter("superclusterCollection"); - hitcollection_ = ps.getParameter("ecalhitcollection"); - hittoken_ = consumes(hitcollection_); +EgammaHLTHybridClusterProducer::EgammaHLTHybridClusterProducer(const edm::ParameterSet& ps) + : basicclusterCollection_ (ps.getParameter("basicclusterCollection")) + , superclusterCollection_ (ps.getParameter("superclusterCollection")) + , hittoken_ (consumes(hitcollection_)) + , hitcollection_ (ps.getParameter("ecalhitcollection")) // L1 matching parameters - l1TagIsolated_ = consumes(ps.getParameter< edm::InputTag > ("l1TagIsolated")); - l1TagNonIsolated_ = consumes(ps.getParameter< edm::InputTag > ("l1TagNonIsolated")); + , l1TagIsolated_ (consumes(ps.getParameter< edm::InputTag > ("l1TagIsolated"))) + , l1TagNonIsolated_ (consumes(ps.getParameter< edm::InputTag > ("l1TagNonIsolated"))) - doIsolated_ = ps.getParameter("doIsolated"); + , doIsolated_ (ps.getParameter("doIsolated")) - l1LowerThr_ = ps.getParameter ("l1LowerThr"); - l1UpperThr_ = ps.getParameter ("l1UpperThr"); - l1LowerThrIgnoreIsolation_ = ps.getParameter ("l1LowerThrIgnoreIsolation"); + , l1LowerThr_ (ps.getParameter ("l1LowerThr")) + , l1UpperThr_ (ps.getParameter ("l1UpperThr")) + , l1LowerThrIgnoreIsolation_ (ps.getParameter ("l1LowerThrIgnoreIsolation")) - regionEtaMargin_ = ps.getParameter("regionEtaMargin"); - regionPhiMargin_ = ps.getParameter("regionPhiMargin"); + , regionEtaMargin_ (ps.getParameter("regionEtaMargin")) + , regionPhiMargin_ (ps.getParameter("regionPhiMargin")) // Parameters for the position calculation: - posCalculator_ = PositionCalc( ps.getParameter("posCalcParameters") ); - - const std::vector flagnames = - ps.getParameter >("RecHitFlagToBeExcluded"); - - const std::vector flagsexcl= - StringToEnumValue(flagnames); - - const std::vector severitynames = - ps.getParameter >("RecHitSeverityToBeExcluded"); - - const std::vector severitiesexcl= - StringToEnumValue(severitynames); - - - hybrid_p = new HybridClusterAlgo(ps.getParameter("HybridBarrelSeedThr"), - ps.getParameter("step"), - ps.getParameter("ethresh"), - ps.getParameter("eseed"), - ps.getParameter("xi"), - ps.getParameter("useEtForXi"), - ps.getParameter("ewing"), - flagsexcl, - posCalculator_, - ps.getParameter("dynamicEThresh"), - ps.getParameter("eThreshA"), - ps.getParameter("eThreshB"), - severitiesexcl, - ps.getParameter("excludeFlagged") - ); - - bool dynamicPhiRoad = ps.getParameter("dynamicPhiRoad"); - if (dynamicPhiRoad) { + , posCalculator_ (PositionCalc( ps.getParameter("posCalcParameters") )) + + , hybrid_p (new HybridClusterAlgo( + ps.getParameter("HybridBarrelSeedThr"), + ps.getParameter("step"), + ps.getParameter("ethresh"), + ps.getParameter("eseed"), + ps.getParameter("xi"), + ps.getParameter("useEtForXi"), + ps.getParameter("ewing"), + StringToEnumValue( + ps.getParameter >("RecHitFlagToBeExcluded")), + posCalculator_, + ps.getParameter("dynamicEThresh"), + ps.getParameter("eThreshA"), + ps.getParameter("eThreshB"), + StringToEnumValue( + ps.getParameter >("RecHitSeverityToBeExcluded")), + ps.getParameter("excludeFlagged"))) +{ + if (ps.getParameter("dynamicPhiRoad")) { edm::ParameterSet bremRecoveryPset = ps.getParameter("bremRecoveryPset"); hybrid_p->setDynamicPhiRoad(bremRecoveryPset); } produces< reco::BasicClusterCollection >(basicclusterCollection_); produces< reco::SuperClusterCollection >(superclusterCollection_); - nEvt_ = 0; } @@ -158,8 +144,8 @@ void EgammaHLTHybridClusterProducer::fillDescriptions(edm::ConfigurationDescript } -void EgammaHLTHybridClusterProducer::produce(edm::Event& evt, const edm::EventSetup& es) -{ +void EgammaHLTHybridClusterProducer::produce(edm::Event& evt, const edm::EventSetup& es) { + // get the hit collection from the event: edm::Handle rhcHandle; evt.getByToken(hittoken_, rhcHandle); @@ -309,9 +295,6 @@ void EgammaHLTHybridClusterProducer::produce(edm::Event& evt, const edm::EventSe auto superclusters_p = std::make_unique(); superclusters_p->assign(superClusters.begin(), superClusters.end()); evt.put(std::move(superclusters_p), superclusterCollection_); - - - nEvt_++; } diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTIslandClusterProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTIslandClusterProducer.cc index ac7532dda21a6..0206c2f786e94 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTIslandClusterProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTIslandClusterProducer.cc @@ -34,53 +34,46 @@ #include "RecoEgamma/EgammaHLTProducers/interface/EgammaHLTIslandClusterProducer.h" EgammaHLTIslandClusterProducer::EgammaHLTIslandClusterProducer(const edm::ParameterSet& ps) -{ - // The verbosity level - std::string verbosityString = ps.getParameter("VerbosityLevel"); - if (verbosityString == "DEBUG") verbosity = IslandClusterAlgo::pDEBUG; - else if (verbosityString == "WARNING") verbosity = IslandClusterAlgo::pWARNING; - else if (verbosityString == "INFO") verbosity = IslandClusterAlgo::pINFO; - else verbosity = IslandClusterAlgo::pERROR; - - doBarrel_ = ps.getParameter("doBarrel"); - doEndcaps_ = ps.getParameter("doEndcaps"); - doIsolated_ = ps.getParameter("doIsolated"); + : doBarrel_ (ps.getParameter("doBarrel")) + , doEndcaps_ (ps.getParameter("doEndcaps")) + , doIsolated_ (ps.getParameter("doIsolated")) // Parameters to identify the hit collections - barrelHitCollection_ = ps.getParameter("barrelHitProducer"); - endcapHitCollection_ = ps.getParameter("endcapHitProducer"); - barrelHitToken_ = consumes(barrelHitCollection_); - endcapHitToken_ = consumes(endcapHitCollection_); + , barrelHitCollection_ (ps.getParameter("barrelHitProducer")) + , endcapHitCollection_ (ps.getParameter("endcapHitProducer")) + , barrelHitToken_ (consumes(barrelHitCollection_)) + , endcapHitToken_ (consumes(endcapHitCollection_)) // The names of the produced cluster collections - barrelClusterCollection_ = ps.getParameter("barrelClusterCollection"); - endcapClusterCollection_ = ps.getParameter("endcapClusterCollection"); - - // Island algorithm parameters - double barrelSeedThreshold = ps.getParameter("IslandBarrelSeedThr"); - double endcapSeedThreshold = ps.getParameter("IslandEndcapSeedThr"); + , barrelClusterCollection_ (ps.getParameter("barrelClusterCollection")) + , endcapClusterCollection_ (ps.getParameter("endcapClusterCollection")) // L1 matching parameters - l1TagIsolated_ = consumes(ps.getParameter< edm::InputTag > ("l1TagIsolated")); - l1TagNonIsolated_ = consumes(ps.getParameter< edm::InputTag > ("l1TagNonIsolated")); - l1LowerThr_ = ps.getParameter ("l1LowerThr"); - l1UpperThr_ = ps.getParameter ("l1UpperThr"); - l1LowerThrIgnoreIsolation_ = ps.getParameter ("l1LowerThrIgnoreIsolation"); + , l1TagIsolated_ (consumes(ps.getParameter< edm::InputTag > ("l1TagIsolated"))) + , l1TagNonIsolated_ (consumes(ps.getParameter< edm::InputTag > ("l1TagNonIsolated"))) + , l1LowerThr_ (ps.getParameter ("l1LowerThr")) + , l1UpperThr_ (ps.getParameter ("l1UpperThr")) + , l1LowerThrIgnoreIsolation_ (ps.getParameter ("l1LowerThrIgnoreIsolation")) - regionEtaMargin_ = ps.getParameter("regionEtaMargin"); - regionPhiMargin_ = ps.getParameter("regionPhiMargin"); + , regionEtaMargin_ (ps.getParameter("regionEtaMargin")) + , regionPhiMargin_ (ps.getParameter("regionPhiMargin")) // Parameters for the position calculation: - posCalculator_ = PositionCalc( ps.getParameter("posCalcParameters") ); - + , posCalculator_ (PositionCalc( ps.getParameter("posCalcParameters") )) + // Island algorithm parameters + , verb_ (ps.getParameter("VerbosityLevel")) + , island_p (new IslandClusterAlgo(ps.getParameter("IslandBarrelSeedThr"), + ps.getParameter("IslandEndcapSeedThr"), + posCalculator_, + verb_ == "DEBUG" ? IslandClusterAlgo::pDEBUG : + (verb_ == "WARNING" ? IslandClusterAlgo::pWARNING : + (verb_ == "INFO" ? IslandClusterAlgo::pINFO : + IslandClusterAlgo::pERROR))) + ) +{ // Produces a collection of barrel and a collection of endcap clusters - produces< reco::BasicClusterCollection >(endcapClusterCollection_); produces< reco::BasicClusterCollection >(barrelClusterCollection_); - - island_p = new IslandClusterAlgo(barrelSeedThreshold, endcapSeedThreshold, posCalculator_,verbosity); - - nEvt_ = 0; } EgammaHLTIslandClusterProducer::~EgammaHLTIslandClusterProducer() { @@ -239,13 +232,12 @@ void EgammaHLTIslandClusterProducer::produce(edm::Event& evt, const edm::EventSe ) { clusterizeECALPart(evt, es, barrelHitToken_, barrelClusterCollection_, barrelRegions, IslandClusterAlgo::barrel); } - nEvt_++; } const EcalRecHitCollection * EgammaHLTIslandClusterProducer::getCollection(edm::Event& evt, - edm::EDGetTokenT& hitToken_) -{ + const edm::EDGetTokenT& hitToken_) +const { edm::Handle rhcHandle; evt.getByToken(hitToken_, rhcHandle); if (!(rhcHandle.isValid())) @@ -259,11 +251,11 @@ const EcalRecHitCollection * EgammaHLTIslandClusterProducer::getCollection(edm:: void EgammaHLTIslandClusterProducer::clusterizeECALPart(edm::Event &evt, const edm::EventSetup &es, - edm::EDGetTokenT& hitToken, + const edm::EDGetTokenT& hitToken, const std::string& clusterCollection, const std::vector& regions, const IslandClusterAlgo::EcalPart& ecalPart) -{ +const { // get the hit collection from the event: const EcalRecHitCollection *hitCollection_p = getCollection(evt, hitToken); diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTMulti5x5ClusterProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTMulti5x5ClusterProducer.cc index 585a21bddbc8d..292dde096becc 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTMulti5x5ClusterProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTMulti5x5ClusterProducer.cc @@ -78,7 +78,6 @@ EgammaHLTMulti5x5ClusterProducer::EgammaHLTMulti5x5ClusterProducer(const edm::Pa produces< reco::BasicClusterCollection >(barrelClusterCollection_); Multi5x5_p = new Multi5x5ClusterAlgo(barrelSeedThreshold, endcapSeedThreshold, v_chstatus, posCalculator_); - nEvt_ = 0; } EgammaHLTMulti5x5ClusterProducer::~EgammaHLTMulti5x5ClusterProducer() { @@ -245,12 +244,11 @@ void EgammaHLTMulti5x5ClusterProducer::produce(edm::Event& evt, const edm::Event if (doBarrel_) { clusterizeECALPart(evt, es, barrelHitToken_, barrelClusterCollection_, barrelRegions, reco::CaloID::DET_ECAL_BARREL); } - nEvt_++; } const EcalRecHitCollection * EgammaHLTMulti5x5ClusterProducer::getCollection(edm::Event& evt, - edm::EDGetTokenT& hitToken) { + const edm::EDGetTokenT& hitToken) const { edm::Handle rhcHandle; evt.getByToken(hitToken, rhcHandle); @@ -266,10 +264,10 @@ const EcalRecHitCollection * EgammaHLTMulti5x5ClusterProducer::getCollection(edm void EgammaHLTMulti5x5ClusterProducer::clusterizeECALPart(edm::Event &evt, const edm::EventSetup &es, - edm::EDGetTokenT& hitToken, + const edm::EDGetTokenT& hitToken, const std::string& clusterCollection, const std::vector& regions, - const reco::CaloID::Detectors detector) { + const reco::CaloID::Detectors detector) const { // get the hit collection from the event: const EcalRecHitCollection *hitCollection_p = getCollection(evt, hitToken); diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFChargedIsolationProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFChargedIsolationProducer.cc index 2b3796a988fa1..3ede7fd78fcaf 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFChargedIsolationProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFChargedIsolationProducer.cc @@ -57,7 +57,7 @@ void EgammaHLTPFChargedIsolationProducer::fillDescriptions(edm::ConfigurationDes descriptions.add(("hltEgammaHLTPFChargedIsolationProducer"), desc); } -void EgammaHLTPFChargedIsolationProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { +void EgammaHLTPFChargedIsolationProducer::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { edm::Handle electronHandle; edm::Handle recoEcalCandHandle; diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFNeutralIsolationProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFNeutralIsolationProducer.cc index b33a1f93a9cf1..19e61c671f0ff 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFNeutralIsolationProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFNeutralIsolationProducer.cc @@ -79,7 +79,7 @@ void EgammaHLTPFNeutralIsolationProducer::fillDescriptions(edm::ConfigurationDes descriptions.add(("hltEgammaHLTPFNeutralIsolationProducer"), desc); } -void EgammaHLTPFNeutralIsolationProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup){ +void EgammaHLTPFNeutralIsolationProducer::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { edm::Handle rhoHandle; double rho = 0.0; diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFPhotonIsolationProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFPhotonIsolationProducer.cc index 40dedb505018e..1f9589d356dcf 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFPhotonIsolationProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFPhotonIsolationProducer.cc @@ -85,7 +85,7 @@ void EgammaHLTPFPhotonIsolationProducer::fillDescriptions(edm::ConfigurationDesc descriptions.add(("hltEgammaHLTPFPhotonIsolationProducer"), desc); } -void EgammaHLTPFPhotonIsolationProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup){ +void EgammaHLTPFPhotonIsolationProducer::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { edm::Handle rhoHandle; double rho = 0.0; diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTRegionalPixelSeedGeneratorProducers.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTRegionalPixelSeedGeneratorProducers.cc index e48c27dbd463c..c936a6dc45630 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTRegionalPixelSeedGeneratorProducers.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTRegionalPixelSeedGeneratorProducers.cc @@ -103,13 +103,6 @@ void EgammaHLTRegionalPixelSeedGeneratorProducers::fillDescriptions(edm::Configu descriptions.add(("hltEgammaHLTRegionalPixelSeedGeneratorProducers"), desc); } -void EgammaHLTRegionalPixelSeedGeneratorProducers::endRun(edm::Run const&run, const edm::EventSetup& es) {} - - -void EgammaHLTRegionalPixelSeedGeneratorProducers::beginRun(edm::Run const&run, const edm::EventSetup& es) -{ -} - // Functions that gets called by framework every event void EgammaHLTRegionalPixelSeedGeneratorProducers::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTRemoveDuplicatedSC.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTRemoveDuplicatedSC.cc index 68e4db28058f5..e89692c86f09f 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTRemoveDuplicatedSC.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTRemoveDuplicatedSC.cc @@ -39,7 +39,7 @@ void EgammaHLTRemoveDuplicatedSC::fillDescriptions(edm::ConfigurationDescription void -EgammaHLTRemoveDuplicatedSC::produce(edm::Event& evt, const edm::EventSetup& es) { +EgammaHLTRemoveDuplicatedSC::produce(edm::StreamID sid, edm::Event& evt, const edm::EventSetup& es) const { using namespace edm; diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTTimeCleanedRechitProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTTimeCleanedRechitProducer.cc index 3726f2aee6971..c4de2bd1d13d5 100644 --- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTTimeCleanedRechitProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTTimeCleanedRechitProducer.cc @@ -54,7 +54,7 @@ void EgammaHLTTimeCleanedRechitProducer::fillDescriptions(edm::ConfigurationDesc descriptions.add(("hltEgammaHLTTimeCleanedRechitProducer"), desc); } -void EgammaHLTTimeCleanedRechitProducer::produce(edm::Event& evt, const edm::EventSetup& es) { +void EgammaHLTTimeCleanedRechitProducer::produce(edm::StreamID sid, edm::Event& evt, const edm::EventSetup& es) const { edm::Handle rhcH[2]; diff --git a/RecoEgamma/EgammaIsolationAlgos/interface/EgammaTowerIsolation.h b/RecoEgamma/EgammaIsolationAlgos/interface/EgammaTowerIsolation.h index f2202b470451c..282aec55279e2 100644 --- a/RecoEgamma/EgammaIsolationAlgos/interface/EgammaTowerIsolation.h +++ b/RecoEgamma/EgammaIsolationAlgos/interface/EgammaTowerIsolation.h @@ -184,12 +184,6 @@ EgammaTowerIsolationNew::compute(bool et, Sum &sum, reco::SuperCluster const etiStat::Count::count.span += (iu-il); #endif - bool ok[iu-il]; - for (std::size_t i=il;i!=iu; ++i) - ok[i-il] = (std::find(first,last,id[i])==last); - - - // should be restricted in eta.... for (std::size_t i=il;i!=iu; ++i) { float dr2 = reco::deltaR2(candEta,candPhi,eta[i], phi[i]); @@ -200,7 +194,7 @@ EgammaTowerIsolationNew::compute(bool et, Sum &sum, reco::SuperCluster const sum.he[j] +=he[i]*tt; sum.h2[j] +=h2[i]*tt; } - if(ok[i-il]) { + if(std::find(first,last,id[i]) == last) { sum.heBC[j] +=he[i]*tt; sum.h2BC[j] +=h2[i]*tt; } diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaElectronTkNumIsolationProducer.cc b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaElectronTkNumIsolationProducer.cc index 9826297b32bc6..1db78d0f91195 100644 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaElectronTkNumIsolationProducer.cc +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaElectronTkNumIsolationProducer.cc @@ -24,22 +24,22 @@ #include "RecoEgamma/EgammaIsolationAlgos/plugins/EgammaElectronTkNumIsolationProducer.h" #include "RecoEgamma/EgammaIsolationAlgos/interface/ElectronTkIsolation.h" -EgammaElectronTkNumIsolationProducer::EgammaElectronTkNumIsolationProducer(const edm::ParameterSet& config) : conf_(config) -{ +EgammaElectronTkNumIsolationProducer::EgammaElectronTkNumIsolationProducer(const edm::ParameterSet& config) : // use configuration file to setup input/output collection names - electronProducer_ = conf_.getParameter("electronProducer"); + electronProducer_ (config.getParameter("electronProducer")), - trackProducer_ = conf_.getParameter("trackProducer"); - beamspotProducer_ = conf_.getParameter("BeamspotProducer"); + trackProducer_ (config.getParameter("trackProducer")), + beamspotProducer_ (config.getParameter("BeamspotProducer")), - ptMin_ = conf_.getParameter("ptMin"); - intRadiusBarrel_ = conf_.getParameter("intRadiusBarrel"); - intRadiusEndcap_ = conf_.getParameter("intRadiusEndcap"); - stripBarrel_ = conf_.getParameter("stripBarrel"); - stripEndcap_ = conf_.getParameter("stripEndcap"); - extRadius_ = conf_.getParameter("extRadius"); - maxVtxDist_ = conf_.getParameter("maxVtxDist"); - drb_ = conf_.getParameter("maxVtxDistXY"); + ptMin_ (config.getParameter("ptMin")), + intRadiusBarrel_ (config.getParameter("intRadiusBarrel")), + intRadiusEndcap_ (config.getParameter("intRadiusEndcap")), + stripBarrel_ (config.getParameter("stripBarrel")), + stripEndcap_ (config.getParameter("stripEndcap")), + extRadius_ (config.getParameter("extRadius")), + maxVtxDist_ (config.getParameter("maxVtxDist")), + drb_ (config.getParameter("maxVtxDistXY")) +{ //register your products produces < edm::ValueMap >(); @@ -50,7 +50,7 @@ EgammaElectronTkNumIsolationProducer::~EgammaElectronTkNumIsolationProducer(){} -void EgammaElectronTkNumIsolationProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) +void EgammaElectronTkNumIsolationProducer::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { // Get the filtered objects edm::Handle< reco::GsfElectronCollection> electronHandle; diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaElectronTkNumIsolationProducer.h b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaElectronTkNumIsolationProducer.h index fb421fdb65be8..83496a90f7c06 100644 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaElectronTkNumIsolationProducer.h +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaElectronTkNumIsolationProducer.h @@ -10,7 +10,7 @@ //***************************************************************************** #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -20,29 +20,27 @@ -class EgammaElectronTkNumIsolationProducer : public edm::EDProducer { +class EgammaElectronTkNumIsolationProducer : public edm::global::EDProducer<> { public: explicit EgammaElectronTkNumIsolationProducer(const edm::ParameterSet&); ~EgammaElectronTkNumIsolationProducer() override; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; private: - edm::InputTag electronProducer_; - edm::InputTag trackProducer_; - edm::InputTag beamspotProducer_; - - double ptMin_; - double intRadiusBarrel_; - double intRadiusEndcap_; - double stripBarrel_; - double stripEndcap_; - double extRadius_; - double maxVtxDist_; - double drb_; - - edm::ParameterSet conf_; + const edm::InputTag electronProducer_; + const edm::InputTag trackProducer_; + const edm::InputTag beamspotProducer_; + + const double ptMin_; + const double intRadiusBarrel_; + const double intRadiusEndcap_; + const double stripBarrel_; + const double stripEndcap_; + const double extRadius_; + const double maxVtxDist_; + const double drb_; }; diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkIsolationProducer.cc b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkIsolationProducer.cc index 969549d8b8b1b..f1df4d1d41f90 100755 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkIsolationProducer.cc +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkIsolationProducer.cc @@ -23,22 +23,23 @@ #include "RecoEgamma/EgammaIsolationAlgos/interface/PhotonTkIsolation.h" -EgammaPhotonTkIsolationProducer::EgammaPhotonTkIsolationProducer(const edm::ParameterSet& config) : conf_(config) -{ - // use configuration file to setup input/output collection names - photonProducer_ = conf_.getParameter("photonProducer"); +EgammaPhotonTkIsolationProducer::EgammaPhotonTkIsolationProducer(const edm::ParameterSet& config) : + + // use configuration file to setup input/output collection names + photonProducer_ (config.getParameter("photonProducer")), - trackProducer_ = conf_.getParameter("trackProducer"); - beamspotProducer_ = conf_.getParameter("BeamspotProducer"); - - ptMin_ = conf_.getParameter("ptMin"); - intRadiusBarrel_ = conf_.getParameter("intRadiusBarrel"); - intRadiusEndcap_ = conf_.getParameter("intRadiusEndcap"); - stripBarrel_ = conf_.getParameter("stripBarrel"); - stripEndcap_ = conf_.getParameter("stripEndcap"); - extRadius_ = conf_.getParameter("extRadius"); - maxVtxDist_ = conf_.getParameter("maxVtxDist"); - drb_ = conf_.getParameter("maxVtxDistXY"); + trackProducer_ (config.getParameter("trackProducer")), + beamspotProducer_ (config.getParameter("BeamspotProducer")), + + ptMin_ (config.getParameter("ptMin")), + intRadiusBarrel_ (config.getParameter("intRadiusBarrel")), + intRadiusEndcap_ (config.getParameter("intRadiusEndcap")), + stripBarrel_ (config.getParameter("stripBarrel")), + stripEndcap_ (config.getParameter("stripEndcap")), + extRadius_ (config.getParameter("extRadius")), + maxVtxDist_ (config.getParameter("maxVtxDist")), + drb_ (config.getParameter("maxVtxDistXY")) +{ //register your products produces < edm::ValueMap >(); @@ -54,7 +55,7 @@ EgammaPhotonTkIsolationProducer::~EgammaPhotonTkIsolationProducer(){} // ------------ method called to produce the data ------------ void -EgammaPhotonTkIsolationProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) +EgammaPhotonTkIsolationProducer::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { // Get the filtered objects diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkIsolationProducer.h b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkIsolationProducer.h index c2d4a9fb42a4e..686173ed205d2 100644 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkIsolationProducer.h +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkIsolationProducer.h @@ -10,35 +10,35 @@ //***************************************************************************** #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -class EgammaPhotonTkIsolationProducer : public edm::EDProducer { +class EgammaPhotonTkIsolationProducer : public edm::global::EDProducer<> { public: explicit EgammaPhotonTkIsolationProducer(const edm::ParameterSet&); ~EgammaPhotonTkIsolationProducer() override; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; private: - edm::InputTag photonProducer_; - edm::InputTag trackProducer_; - edm::InputTag beamspotProducer_; - - double ptMin_; - double intRadiusBarrel_; - double intRadiusEndcap_; - double stripBarrel_; - double stripEndcap_; - double extRadius_; - double maxVtxDist_; - double drb_; + const edm::InputTag photonProducer_; + const edm::InputTag trackProducer_; + const edm::InputTag beamspotProducer_; + + const double ptMin_; + const double intRadiusBarrel_; + const double intRadiusEndcap_; + const double stripBarrel_; + const double stripEndcap_; + const double extRadius_; + const double maxVtxDist_; + const double drb_; - edm::ParameterSet conf_; + const edm::ParameterSet conf_; }; diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkNumIsolationProducer.cc b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkNumIsolationProducer.cc index 6eb1e6b88dac5..8de1d722adda8 100755 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkNumIsolationProducer.cc +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkNumIsolationProducer.cc @@ -20,23 +20,24 @@ #include "RecoEgamma/EgammaIsolationAlgos/interface/PhotonTkIsolation.h" -EgammaPhotonTkNumIsolationProducer::EgammaPhotonTkNumIsolationProducer(const edm::ParameterSet& config) : conf_(config) -{ - // use configuration file to setup input/output collection names - photonProducer_ = conf_.getParameter("photonProducer"); +EgammaPhotonTkNumIsolationProducer::EgammaPhotonTkNumIsolationProducer(const edm::ParameterSet& config) : + + // use configuration file to setup input/output collection names + photonProducer_ (config.getParameter("photonProducer")), - trackProducer_ = conf_.getParameter("trackProducer"); - beamspotProducer_ = conf_.getParameter("BeamspotProducer"); - - ptMin_ = conf_.getParameter("ptMin"); - intRadiusBarrel_ = conf_.getParameter("intRadiusBarrel"); - intRadiusEndcap_ = conf_.getParameter("intRadiusEndcap"); - stripBarrel_ = conf_.getParameter("stripBarrel"); - stripEndcap_ = conf_.getParameter("stripEndcap"); - extRadius_ = conf_.getParameter("extRadius"); - maxVtxDist_ = conf_.getParameter("maxVtxDist"); - drb_ = conf_.getParameter("maxVtxDistXY"); + trackProducer_ (config.getParameter("trackProducer")), + beamspotProducer_ (config.getParameter("BeamspotProducer")), + + ptMin_ (config.getParameter("ptMin")), + intRadiusBarrel_ (config.getParameter("intRadiusBarrel")), + intRadiusEndcap_ (config.getParameter("intRadiusEndcap")), + stripBarrel_ (config.getParameter("stripBarrel")), + stripEndcap_ (config.getParameter("stripEndcap")), + extRadius_ (config.getParameter("extRadius")), + maxVtxDist_ (config.getParameter("maxVtxDist")), + drb_ (config.getParameter("maxVtxDistXY")) +{ //register your products produces < edm::ValueMap >(); } @@ -51,7 +52,7 @@ EgammaPhotonTkNumIsolationProducer::~EgammaPhotonTkNumIsolationProducer(){} // ------------ method called to produce the data ------------ void -EgammaPhotonTkNumIsolationProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) +EgammaPhotonTkNumIsolationProducer::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { // Get the filtered objects diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkNumIsolationProducer.h b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkNumIsolationProducer.h index c40d5fc5377aa..9442f282b9bee 100644 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkNumIsolationProducer.h +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaPhotonTkNumIsolationProducer.h @@ -10,35 +10,34 @@ //***************************************************************************** #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -class EgammaPhotonTkNumIsolationProducer : public edm::EDProducer { +class EgammaPhotonTkNumIsolationProducer : public edm::global::EDProducer<> { public: explicit EgammaPhotonTkNumIsolationProducer(const edm::ParameterSet&); ~EgammaPhotonTkNumIsolationProducer() override; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; private: - edm::InputTag photonProducer_; - edm::InputTag trackProducer_; - edm::InputTag beamspotProducer_; - - double ptMin_; - double intRadiusBarrel_; - double intRadiusEndcap_; - double stripBarrel_; - double stripEndcap_; - double extRadius_; - double maxVtxDist_; - double drb_; - - edm::ParameterSet conf_; + + const edm::InputTag photonProducer_; + const edm::InputTag trackProducer_; + const edm::InputTag beamspotProducer_; + + const double ptMin_; + const double intRadiusBarrel_; + const double intRadiusEndcap_; + const double stripBarrel_; + const double stripEndcap_; + const double extRadius_; + const double maxVtxDist_; + const double drb_; }; diff --git a/RecoEgamma/EgammaTools/interface/MVAObjectCache.h b/RecoEgamma/EgammaTools/interface/MVAObjectCache.h deleted file mode 100644 index a47c8174618ea..0000000000000 --- a/RecoEgamma/EgammaTools/interface/MVAObjectCache.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef __RecoEgamma_EgammaTools_MVAObjectCache_H__ -#define __RecoEgamma_EgammaTools_MVAObjectCache_H__ - -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -#include "RecoEgamma/EgammaTools/interface/AnyMVAEstimatorRun2Base.h" - -#include -#include -#include - -namespace egamma { - - class MVAObjectCache { - public: - typedef std::unique_ptr MVAPtr; - - MVAObjectCache(const edm::ParameterSet& conf); - - const MVAPtr& getMVA(const std::string& mva) const; - - const std::unordered_map& allMVAs() const { - return mvas_; - } - private: - std::unordered_map mvas_; - }; - -} -#endif diff --git a/RecoEgamma/EgammaTools/interface/MVAValueMapProducer.h b/RecoEgamma/EgammaTools/interface/MVAValueMapProducer.h index 1d0ab1f438c10..aca685710e302 100644 --- a/RecoEgamma/EgammaTools/interface/MVAValueMapProducer.h +++ b/RecoEgamma/EgammaTools/interface/MVAValueMapProducer.h @@ -38,11 +38,9 @@ class MVAValueMapProducer : public edm::stream::EDProducer<> { const std::vector & values, const std::string & label) const ; - // for AOD case - edm::EDGetToken src_; - - // for miniAOD case - edm::EDGetToken srcMiniAOD_; + // for AOD and miniAOD case + const edm::EDGetToken src_; + const edm::EDGetToken srcMiniAOD_; // MVA estimator std::vector> mvaEstimators_; @@ -56,13 +54,10 @@ class MVAValueMapProducer : public edm::stream::EDProducer<> { template MVAValueMapProducer::MVAValueMapProducer(const edm::ParameterSet& iConfig) -{ - - // // Declare consummables, handle both AOD and miniAOD case - // - src_ = mayConsume >(iConfig.getParameter("src")); - srcMiniAOD_ = mayConsume >(iConfig.getParameter("srcMiniAOD")); + : src_ (mayConsume >(iConfig.getParameter("src"))) + , srcMiniAOD_ (mayConsume >(iConfig.getParameter("srcMiniAOD"))) +{ // Loop over the list of MVA configurations passed here from python and // construct all requested MVA estimators. diff --git a/RecoEgamma/EgammaTools/interface/MVAVariableManager.h b/RecoEgamma/EgammaTools/interface/MVAVariableManager.h index 2e91a9c6c4137..73cb8f1bde19d 100644 --- a/RecoEgamma/EgammaTools/interface/MVAVariableManager.h +++ b/RecoEgamma/EgammaTools/interface/MVAVariableManager.h @@ -1,20 +1,15 @@ #ifndef RecoEgamma_EgammaTools_MVAVariableManager_H #define RecoEgamma_EgammaTools_MVAVariableManager_H -#include - #include "CommonTools/Utils/interface/StringObjectFunction.h" #include "CommonTools/Utils/interface/StringCutObjectSelector.h" - #include "FWCore/ParameterSet/interface/FileInPath.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/Common/interface/ValueMap.h" - #include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/ConsumesCollector.h" - #include "DataFormats/Candidate/interface/Candidate.h" +#include + template class MVAVariableManager { @@ -27,7 +22,8 @@ class MVAVariableManager { init(variableDefinitionFileName); }; - int init(const std::string &variableDefinitionFileName) { + int init(const std::string &variableDefinitionFileName) + { nVars_ = 0; variableInfos_.clear(); @@ -56,7 +52,8 @@ class MVAVariableManager { return nVars_; }; - int getVarIndex(std::string &name) { + int getVarIndex(const std::string &name) + { std::map::iterator it = indexMap_.find(name); if (it == indexMap_.end()) { return -1; @@ -65,23 +62,24 @@ class MVAVariableManager { } } - const std::string getName(int index) const { + const std::string& getName(int index) const { return names_[index]; } - const int getNVars() const { + int getNVars() const { return nVars_; } - std::vector getHelperInputTags() const { + const std::vector& getHelperInputTags() const { return helperInputTags_; } - std::vector getGlobalInputTags() const { + const std::vector& getGlobalInputTags() const { return globalInputTags_; } - float getValue(int index, const edm::Ptr& ptclPtr, const edm::EventBase& iEvent) const { + float getValue(int index, const edm::Ptr& ptclPtr, const edm::EventBase& iEvent) const + { float value; MVAVariableInfo varInfo = variableInfos_[index]; if (varInfo.fromVariableHelper) { @@ -115,7 +113,9 @@ class MVAVariableManager { bool isGlobalVariable; }; - void addVariable(std::string &name, std::string &formula, std::string &lowerClip, std::string &upperClip) { + void addVariable(const std::string &name, const std::string &formula, + const std::string &lowerClip, const std::string &upperClip) + { bool hasLowerClip = lowerClip.find("None") == std::string::npos; bool hasUpperClip = upperClip.find("None") == std::string::npos; bool fromVariableHelper = formula.find("MVAVariableHelper") != std::string::npos || diff --git a/RecoEgamma/EgammaTools/plugins/EGEnergyAnalyzer.cc b/RecoEgamma/EgammaTools/plugins/EGEnergyAnalyzer.cc index 49bea8062ff03..3d052ec59e5cf 100644 --- a/RecoEgamma/EgammaTools/plugins/EGEnergyAnalyzer.cc +++ b/RecoEgamma/EgammaTools/plugins/EGEnergyAnalyzer.cc @@ -22,7 +22,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -45,7 +45,7 @@ // class declaration // -class EGEnergyAnalyzer : public edm::EDAnalyzer { +class EGEnergyAnalyzer : public edm::one::EDAnalyzer<> { public: explicit EGEnergyAnalyzer(const edm::ParameterSet&); ~EGEnergyAnalyzer() override; @@ -55,14 +55,9 @@ class EGEnergyAnalyzer : public edm::EDAnalyzer { private: void beginJob() override ; - void analyze(const edm::Event&, const edm::EventSetup&) override; + void analyze( const edm::Event&, const edm::EventSetup&) override; void endJob() override ; - void beginRun(edm::Run const&, edm::EventSetup const&) override; - void endRun(edm::Run const&, edm::EventSetup const&) override; - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - EGEnergyCorrector corfile; EGEnergyCorrector cordb; @@ -92,7 +87,7 @@ EGEnergyAnalyzer::~EGEnergyAnalyzer() // ------------ method called for each event ------------ void -EGEnergyAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) +EGEnergyAnalyzer::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; @@ -146,30 +141,6 @@ EGEnergyAnalyzer::endJob() { } -// ------------ method called when starting to processes a run ------------ -void -EGEnergyAnalyzer::beginRun(edm::Run const&, edm::EventSetup const&) -{ -} - -// ------------ method called when ending the processing of a run ------------ -void -EGEnergyAnalyzer::endRun(edm::Run const&, edm::EventSetup const&) -{ -} - -// ------------ method called when starting to processes a luminosity block ------------ -void -EGEnergyAnalyzer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} - -// ------------ method called when ending the processing of a luminosity block ------------ -void -EGEnergyAnalyzer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void EGEnergyAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { diff --git a/RecoEgamma/EgammaTools/src/EnergyScaleCorrection.cc b/RecoEgamma/EgammaTools/src/EnergyScaleCorrection.cc index e884a0014a552..dd41135e5e4a7 100644 --- a/RecoEgamma/EgammaTools/src/EnergyScaleCorrection.cc +++ b/RecoEgamma/EgammaTools/src/EnergyScaleCorrection.cc @@ -362,7 +362,6 @@ EnergyScaleCorrection::CorrectionCategory::CorrectionCategory(const std::string& }; // R9 region p1 = category.find("-R9"); - p2 = p1 + 1; if(p1 != std::string::npos) { p1 = category.find("_", p1); p2 = category.find("_", p1 + 1); diff --git a/RecoEgamma/EgammaTools/src/MVAObjectCache.cc b/RecoEgamma/EgammaTools/src/MVAObjectCache.cc deleted file mode 100644 index e86cb5a67609e..0000000000000 --- a/RecoEgamma/EgammaTools/src/MVAObjectCache.cc +++ /dev/null @@ -1,45 +0,0 @@ -#include "RecoEgamma/EgammaTools/interface/MVAObjectCache.h" - -using namespace egamma; - -MVAObjectCache::MVAObjectCache(const edm::ParameterSet& conf) { - const std::vector& mvaEstimatorConfigs - = conf.getParameterSetVector("mvaConfigurations"); - - for( auto &imva : mvaEstimatorConfigs ){ - // building the mva class is now done in the ObjectCache, - // so we loop over what's in that. - std::unique_ptr thisEstimator; - thisEstimator.reset(nullptr); - if( !imva.empty() ) { - const std::string& pName = imva.getParameter("mvaName"); - // The factory below constructs the MVA of the appropriate type based - // on the "mvaName" which is the name of the derived MVA class (plugin) - const AnyMVAEstimatorRun2Base *estimator = AnyMVAEstimatorRun2Factory::get()->create( pName, imva ); - // Declare all event content, such as ValueMaps produced upstream or other, - // original event data pieces, that is needed (if any is implemented in the specific - // MVA classes) - const std::string full_name = estimator->getName() + estimator->getTag(); - auto diditwork = mvas_.emplace( full_name, MVAPtr(estimator) ); - if( !diditwork.second ) { - throw cms::Exception("MVA configured twice: ") - << "Tried already to make an mva of name: " << estimator->getName() - << " please ensure that the name of the MVA is unique!" << std::endl; - } - } else { - throw cms::Exception(" MVA configuration not found: ") - << " failed to find proper configuration for " - <<"one of the MVAs in the main python script " << std::endl; - } - } -} - -const MVAObjectCache::MVAPtr& -MVAObjectCache::getMVA(const std::string& mva) const { - auto itr = mvas_.find(mva); - if( itr == mvas_.end() ) { - throw cms::Exception("InvalidMVAName") - << mva << " is not managed by this evaluator!"; - } - return itr->second; -} diff --git a/RecoEgamma/ElectronIdentification/interface/ElectronMVAEstimator.h b/RecoEgamma/ElectronIdentification/interface/ElectronMVAEstimator.h index 074cfa7f174f7..22ed12f51f368 100644 --- a/RecoEgamma/ElectronIdentification/interface/ElectronMVAEstimator.h +++ b/RecoEgamma/ElectronIdentification/interface/ElectronMVAEstimator.h @@ -2,7 +2,7 @@ #define __RecoEgamma_ElectronIdentification_ElectronMVAEstimator_H__ #include "DataFormats/EgammaCandidates/interface/GsfElectron.h" -#include "CondFormats/EgammaObjects/interface/GBRForest.h" +#include "RecoEgamma/EgammaTools/interface/GBRForestTools.h" #include #include @@ -22,26 +22,8 @@ class ElectronMVAEstimator { const Configuration cfg_; void bindVariables(float vars[18]) const; - std::vector > gbr; + std::vector > gbr_; - Float_t fbrem; //0 - Float_t detain; //1 - Float_t dphiin; //2 - Float_t sieie; //3 - Float_t hoe; //4 - Float_t eop; //5 - Float_t e1x5e5x5; //6 - Float_t eleopout; //7 - Float_t detaeleout; //8 - Float_t kfchi2; //9 - Float_t mykfhits; //10 - Float_t mymishits; //11 - Float_t absdist; //12 - Float_t absdcot; //13 - Float_t myNvtx; //14 - Float_t eta; //15 - Float_t pt; //16 - Int_t ecalseed; //17 }; #endif diff --git a/RecoEgamma/ElectronIdentification/interface/ElectronNeuralNet.h b/RecoEgamma/ElectronIdentification/interface/ElectronNeuralNet.h deleted file mode 100644 index 8b98ca86b9a43..0000000000000 --- a/RecoEgamma/ElectronIdentification/interface/ElectronNeuralNet.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef ElectronNeuralNet_H -#define ElectronNeuralNet_H - -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "DataFormats/EgammaCandidates/interface/GsfElectron.h" -#include "RecoEgamma/ElectronIdentification/interface/ElectronIDAlgo.h" - -class ElectronNeuralNet : public ElectronIDAlgo{ - -public: - - ElectronNeuralNet(){}; - - ~ElectronNeuralNet() override{}; - - void setup(const edm::ParameterSet& conf) override {} ; - using ElectronIDAlgo::result; - //the following is a new function not in the base class - double result(const reco::GsfElectron* electron, const edm::Event&); - - private: - -}; - -#endif // ElectronNeuralNet_H diff --git a/RecoEgamma/ElectronIdentification/interface/SoftElectronMVAEstimator.h b/RecoEgamma/ElectronIdentification/interface/SoftElectronMVAEstimator.h index b869130a4eebf..493d18953caf6 100644 --- a/RecoEgamma/ElectronIdentification/interface/SoftElectronMVAEstimator.h +++ b/RecoEgamma/ElectronIdentification/interface/SoftElectronMVAEstimator.h @@ -6,8 +6,8 @@ #include "DataFormats/EgammaCandidates/interface/GsfElectron.h" #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" +#include "RecoEgamma/EgammaTools/interface/GBRForestTools.h" -#include "CondFormats/EgammaObjects/interface/GBRForest.h" #include #include @@ -22,49 +22,15 @@ class SoftElectronMVAEstimator { ~SoftElectronMVAEstimator() ; double mva(const reco::GsfElectron& myElectron, const reco::VertexCollection&) const; - UInt_t GetMVABin(int pu,double eta,double pt ) const; + private: void bindVariables(float vars[25]) const ; void init(); private: const Configuration cfg_; - std::array, ExpectedNBins> gbr; + std::vector > gbr_; - Float_t fbrem; - Float_t EtotOvePin; - Float_t EBremOverDeltaP; - Float_t logSigmaEtaEta; - Float_t DeltaEtaTrackEcalSeed; - Float_t kfchi2; - Float_t kfhits; //number of layers - Float_t gsfchi2; - Float_t SigmaPtOverPt; - - - Float_t deta; - Float_t dphi; - Float_t detacalo; - - Float_t see; - Float_t etawidth; - Float_t phiwidth; - Float_t OneMinusE1x5E5x5; - - Float_t HoE; - //Float_t EoP; //Not being used - Float_t eleEoPout; - - Float_t spp; - Float_t R9; - Float_t IoEmIoP; - Float_t PreShowerOverRaw; - - - Float_t eta; - Float_t pt; - - Float_t nPV; }; #endif diff --git a/RecoEgamma/ElectronIdentification/plugins/ElectronIDSelectorNeuralNet.cc b/RecoEgamma/ElectronIdentification/plugins/ElectronIDSelectorNeuralNet.cc deleted file mode 100644 index 3e46216948f2f..0000000000000 --- a/RecoEgamma/ElectronIdentification/plugins/ElectronIDSelectorNeuralNet.cc +++ /dev/null @@ -1,28 +0,0 @@ -#include "RecoEgamma/ElectronIdentification/plugins/ElectronIDSelectorNeuralNet.h" - -ElectronIDSelectorNeuralNet::ElectronIDSelectorNeuralNet (const edm::ParameterSet& conf, edm::ConsumesCollector & iC) : conf_ (conf) -{ - doNeuralNet_ = conf_.getParameter ("doNeuralNet"); - - if (doNeuralNet_) - neuralNetAlgo_ = new ElectronNeuralNet(); -} - -ElectronIDSelectorNeuralNet::~ElectronIDSelectorNeuralNet () -{ - if (doNeuralNet_) - delete neuralNetAlgo_ ; -} - -void ElectronIDSelectorNeuralNet::newEvent (const edm::Event& e, const edm::EventSetup& es) -{ - if (doNeuralNet_) - neuralNetAlgo_->setup (conf_); -} - -double ElectronIDSelectorNeuralNet::operator () (const reco::GsfElectron & ele, const edm::Event& e, const edm::EventSetup& es) -{ - if (doNeuralNet_) - return static_cast(neuralNetAlgo_->result (& (ele), e) ); - return 0. ; -} diff --git a/RecoEgamma/ElectronIdentification/plugins/ElectronMVANtuplizer.cc b/RecoEgamma/ElectronIdentification/plugins/ElectronMVANtuplizer.cc index ed14caae188b5..1d1d16dd3004c 100644 --- a/RecoEgamma/ElectronIdentification/plugins/ElectronMVANtuplizer.cc +++ b/RecoEgamma/ElectronIdentification/plugins/ElectronMVANtuplizer.cc @@ -66,8 +66,6 @@ class ElectronMVANtuplizer : public edm::one::EDAnalyzer int matchToTruth(const T &el, const V &genParticles, int &genIdx); @@ -421,28 +419,10 @@ ElectronMVANtuplizer::analyze(const edm::Event& iEvent, const edm::EventSetup& i } -void ElectronMVANtuplizer::findFirstNonElectronMother2(const reco::Candidate *particle, - int &ancestorPID, int &ancestorStatus){ - - if( particle == nullptr ){ - edm::LogError ("ElectronNtuplizer") << "ElectronNtuplizer: ERROR! null candidate pointer, this should never happen"; - return; - } - - // Is this the first non-electron parent? If yes, return, otherwise - // go deeper into recursion - if( abs(particle->pdgId()) == 11 ){ - findFirstNonElectronMother2(particle->mother(0), ancestorPID, ancestorStatus); - }else{ - ancestorPID = particle->pdgId(); - ancestorStatus = particle->status(); - } - - return; -} - template -int ElectronMVANtuplizer::matchToTruth(const T &el, const V &prunedGenParticles, int &genIdx){ +int ElectronMVANtuplizer::matchToTruth(const T &el, const V &genParticles, int &genIdx){ + + genIdx = -1; // // Explicit loop and geometric matching method (advised by Josh Bendavid) @@ -450,9 +430,8 @@ int ElectronMVANtuplizer::matchToTruth(const T &el, const V &prunedGenParticles, // Find the closest status 1 gen electron to the reco electron double dR = 999; - const reco::Candidate *closestElectron = nullptr; - for(size_t i=0; isize();i++){ - const reco::Candidate *particle = &(*prunedGenParticles)[i]; + for(size_t i=0; isize();i++){ + const auto particle = genParticles->ptrAt(i); // Drop everything that is not electron or not status 1 if( abs(particle->pdgId()) != 11 || particle->status() != 1 ) continue; @@ -460,36 +439,24 @@ int ElectronMVANtuplizer::matchToTruth(const T &el, const V &prunedGenParticles, double dRtmp = ROOT::Math::VectorUtil::DeltaR( el->p4(), particle->p4() ); if( dRtmp < dR ){ dR = dRtmp; - closestElectron = particle; genIdx = i; } } - // See if the closest electron (if it exists) is close enough. - // If not, no match found. - if( !(closestElectron != nullptr && dR < deltaR_) ) { + // See if the closest electron is close enough. If not, no match found. + if( genIdx == -1 || dR >= deltaR_ ) { return UNMATCHED; } - // - int ancestorPID = -999; - int ancestorStatus = -999; - findFirstNonElectronMother2(closestElectron, ancestorPID, ancestorStatus); - - if( ancestorPID == -999 && ancestorStatus == -999 ){ - // No non-electron parent??? This should never happen. - // Complain. - edm::LogError ("ElectronNtuplizer") << "ElectronNtuplizer: ERROR! null candidate pointer, this should never happen"; - return UNMATCHED; - } + const auto closestElectron = genParticles->ptrAt(genIdx); - if( abs(ancestorPID) > 50 && ancestorStatus == 2 ) - return TRUE_NON_PROMPT_ELECTRON; + if( closestElectron->fromHardProcessFinalState() ) + return TRUE_PROMPT_ELECTRON; - if( abs(ancestorPID) == 15 && ancestorStatus == 2 ) + if( closestElectron->isDirectHardProcessTauDecayProductFinalState() ) return TRUE_ELECTRON_FROM_TAU; - // What remains is true prompt electrons - return TRUE_PROMPT_ELECTRON; + // What remains is true non-prompt electrons + return TRUE_NON_PROMPT_ELECTRON; } // ------------ method called once each job just before starting event loop ------------ diff --git a/RecoEgamma/ElectronIdentification/plugins/SealModule.cc b/RecoEgamma/ElectronIdentification/plugins/SealModule.cc index 9dc394b1b889c..056ef8985e047 100644 --- a/RecoEgamma/ElectronIdentification/plugins/SealModule.cc +++ b/RecoEgamma/ElectronIdentification/plugins/SealModule.cc @@ -11,33 +11,24 @@ #include "RecoEgamma/ElectronIdentification/plugins/ElectronIDSelector.h" #include "RecoEgamma/ElectronIdentification/plugins/ElectronIDSelectorCutBased.h" -#include "RecoEgamma/ElectronIdentification/plugins/ElectronIDSelectorNeuralNet.h" #include "RecoEgamma/ElectronIdentification/plugins/ElectronIDSelectorLikelihood.h" typedef ElectronIDSelector EleIdCutBasedSel; -typedef ElectronIDSelector EleIdNeuralNetSel; typedef ElectronIDSelector EleIdLikelihoodSel; typedef ObjectSelector< EleIdCutBasedSel, edm::RefVector > EleIdCutBasedRef ; -typedef ObjectSelector< - EleIdNeuralNetSel, - edm::RefVector - > EleIdNeuralNetRef ; typedef ObjectSelector< EleIdLikelihoodSel, edm::RefVector > EleIdLikelihoodRef ; DEFINE_FWK_MODULE(EleIdCutBasedRef); -DEFINE_FWK_MODULE(EleIdNeuralNetRef); DEFINE_FWK_MODULE(EleIdLikelihoodRef); #include "RecoEgamma/ElectronIdentification/plugins/ElectronIDExternalProducer.h" typedef ElectronIDExternalProducer EleIdCutBasedExtProducer; -typedef ElectronIDExternalProducer EleIdNeuralNetExtProducer; typedef ElectronIDExternalProducer EleIdLikelihoodExtProducer; DEFINE_FWK_MODULE(EleIdCutBasedExtProducer); -DEFINE_FWK_MODULE(EleIdNeuralNetExtProducer); DEFINE_FWK_MODULE(EleIdLikelihoodExtProducer); #include "FWCore/Framework/interface/ModuleFactory.h" diff --git a/RecoEgamma/ElectronIdentification/src/ElectronMVAEstimator.cc b/RecoEgamma/ElectronIdentification/src/ElectronMVAEstimator.cc index 30727c9fa0490..797cc658d9fd6 100644 --- a/RecoEgamma/ElectronIdentification/src/ElectronMVAEstimator.cc +++ b/RecoEgamma/ElectronIdentification/src/ElectronMVAEstimator.cc @@ -3,15 +3,6 @@ #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/GsfTrackReco/interface/GsfTrack.h" #include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h" -#include "FWCore/ParameterSet/interface/FileInPath.h" - -#include "TMVA/Reader.h" -#include "TMVA/MethodBDT.h" -#include "TMVA/MethodCategory.h" - -namespace { - constexpr char ele_mva_name[] = "BDTSimpleCat"; -} ElectronMVAEstimator::ElectronMVAEstimator(): cfg_{} @@ -20,68 +11,16 @@ ElectronMVAEstimator::ElectronMVAEstimator(): ElectronMVAEstimator::ElectronMVAEstimator(std::string fileName): cfg_{} { - TMVA::Reader tmvaReader("!Color:Silent"); - tmvaReader.AddVariable("fbrem",&fbrem); - tmvaReader.AddVariable("detain", &detain); - tmvaReader.AddVariable("dphiin", &dphiin); - tmvaReader.AddVariable("sieie", &sieie); - tmvaReader.AddVariable("hoe", &hoe); - tmvaReader.AddVariable("eop", &eop); - tmvaReader.AddVariable("e1x5e5x5", &e1x5e5x5); - tmvaReader.AddVariable("eleopout", &eleopout); - tmvaReader.AddVariable("detaeleout", &detaeleout); - tmvaReader.AddVariable("kfchi2", &kfchi2); - tmvaReader.AddVariable("kfhits", &mykfhits); - tmvaReader.AddVariable("mishits",&mymishits); - tmvaReader.AddVariable("dist", &absdist); - tmvaReader.AddVariable("dcot", &absdcot); - tmvaReader.AddVariable("nvtx", &myNvtx); - - tmvaReader.AddSpectator("eta",&eta); - tmvaReader.AddSpectator("pt",&pt); - tmvaReader.AddSpectator("ecalseed",&ecalseed); - // Taken from Daniele (his mail from the 30/11) // tmvaReader.BookMVA("BDTSimpleCat","../Training/weights_Root527b_3Depth_DanVarConvRej_2PtBins_10Pt_800TPrune5_Min100Events_NoBjets_half/TMVA_BDTSimpleCat.weights.xm"); // training of the 7/12 with Nvtx added - tmvaReader.BookMVA(ele_mva_name,fileName.c_str()); - gbr.emplace_back(new GBRForest( dynamic_cast( tmvaReader.FindMVA(ele_mva_name) ) ) ); + gbr_.push_back( GBRForestTools::createGBRForest( fileName ) ); } -ElectronMVAEstimator::ElectronMVAEstimator(const Configuration & cfg):cfg_(cfg){ - std::vector weightsfiles; - std::string path_mvaWeightFileEleID; - for(unsigned ifile=0 ; ifile < cfg_.vweightsfiles.size() ; ++ifile) { - path_mvaWeightFileEleID = edm::FileInPath ( cfg_.vweightsfiles[ifile].c_str() ).fullPath(); - weightsfiles.push_back(path_mvaWeightFileEleID); - } - for( const auto& wgtfile : weightsfiles ) { - TMVA::Reader tmvaReader("!Color:Silent"); - tmvaReader.AddVariable("fbrem",&fbrem); - tmvaReader.AddVariable("detain", &detain); - tmvaReader.AddVariable("dphiin", &dphiin); - tmvaReader.AddVariable("sieie", &sieie); - tmvaReader.AddVariable("hoe", &hoe); - tmvaReader.AddVariable("eop", &eop); - tmvaReader.AddVariable("e1x5e5x5", &e1x5e5x5); - tmvaReader.AddVariable("eleopout", &eleopout); - tmvaReader.AddVariable("detaeleout", &detaeleout); - tmvaReader.AddVariable("kfchi2", &kfchi2); - tmvaReader.AddVariable("kfhits", &mykfhits); - tmvaReader.AddVariable("mishits",&mymishits); - tmvaReader.AddVariable("dist", &absdist); - tmvaReader.AddVariable("dcot", &absdcot); - tmvaReader.AddVariable("nvtx", &myNvtx); - - tmvaReader.AddSpectator("eta",&eta); - tmvaReader.AddSpectator("pt",&pt); - tmvaReader.AddSpectator("ecalseed",&ecalseed); - - // Taken from Daniele (his mail from the 30/11) - // tmvaReader.BookMVA("BDTSimpleCat","../Training/weights_Root527b_3Depth_DanVarConvRej_2PtBins_10Pt_800TPrune5_Min100Events_NoBjets_half/TMVA_BDTSimpleCat.weights.xm"); - // training of the 7/12 with Nvtx added - tmvaReader.BookMVA(ele_mva_name,wgtfile); - gbr.emplace_back(new GBRForest( dynamic_cast( tmvaReader.FindMVA(ele_mva_name) ) ) ); +ElectronMVAEstimator::ElectronMVAEstimator(const Configuration & cfg):cfg_(cfg) +{ + for(auto& weightsfile : cfg_.vweightsfiles) { + gbr_.push_back( GBRForestTools::createGBRForest( weightsfile )); } } @@ -122,7 +61,7 @@ double ElectronMVAEstimator::mva(const reco::GsfElectron& myElectron, int nverti const unsigned index = (unsigned)(myElectron.pt() >= 10) + 2*(unsigned)(std::abs(myElectron.eta()) > 1.485); - double result = gbr[index]->GetAdaBoostClassifier(vars); + double result = gbr_[index]->GetAdaBoostClassifier(vars); // // std::cout << "fbrem" << vars[0] << std::endl; // std::cout << "detain"<< vars[1] << std::endl; diff --git a/RecoEgamma/ElectronIdentification/src/ElectronNeuralNet.cc b/RecoEgamma/ElectronIdentification/src/ElectronNeuralNet.cc deleted file mode 100644 index 77247ae33a5dc..0000000000000 --- a/RecoEgamma/ElectronIdentification/src/ElectronNeuralNet.cc +++ /dev/null @@ -1,6 +0,0 @@ -#include "RecoEgamma/ElectronIdentification/interface/ElectronNeuralNet.h" - -double ElectronNeuralNet::result(const reco::GsfElectron* electron, - const edm::Event& e) { - return 1.; -} diff --git a/RecoEgamma/ElectronIdentification/src/SoftElectronMVAEstimator.cc b/RecoEgamma/ElectronIdentification/src/SoftElectronMVAEstimator.cc index fc765ec3a1c9f..8a906ca8acf87 100644 --- a/RecoEgamma/ElectronIdentification/src/SoftElectronMVAEstimator.cc +++ b/RecoEgamma/ElectronIdentification/src/SoftElectronMVAEstimator.cc @@ -3,66 +3,21 @@ #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/GsfTrackReco/interface/GsfTrack.h" #include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h" -#include "FWCore/ParameterSet/interface/FileInPath.h" -#include "TMVA/Reader.h" -#include "TMVA/MethodBDT.h" - -SoftElectronMVAEstimator::SoftElectronMVAEstimator(const Configuration & cfg):cfg_(cfg){ - std::vector weightsfiles; - std::string path_mvaWeightFileEleID; - for(unsigned ifile=0 ; ifile < cfg_.vweightsfiles.size() ; ++ifile) { - path_mvaWeightFileEleID = edm::FileInPath ( cfg_.vweightsfiles[ifile].c_str() ).fullPath(); - weightsfiles.push_back(path_mvaWeightFileEleID); - } - - //initialize - //Define expected number of bins +SoftElectronMVAEstimator::SoftElectronMVAEstimator(const Configuration & cfg):cfg_(cfg) +{ //Check number of weight files given if (ExpectedNBins != cfg_.vweightsfiles.size() ) { - std::cout << "Error: Expected Number of bins = " << ExpectedNBins << " does not equal to weightsfiles.size() = " - << cfg_.vweightsfiles.size() << std::endl; - - assert(ExpectedNBins == cfg_.vweightsfiles.size()); + edm::LogError ("Soft Electron MVA Error") << + "Expected Number of bins = " << ExpectedNBins << + " does not equal to weightsfiles.size() = " << + cfg_.vweightsfiles.size() << std::endl; } - - for (unsigned int i=0;i( tmvaReader.FindMVA("BDT") ) ) ); + gbr_.push_back( GBRForestTools::createGBRForest( weightsfile )); } } @@ -70,34 +25,6 @@ SoftElectronMVAEstimator::SoftElectronMVAEstimator(const Configuration & cfg):cf SoftElectronMVAEstimator::~SoftElectronMVAEstimator() { } - -UInt_t SoftElectronMVAEstimator::GetMVABin(int pu, double eta, double pt) const { - - //Default is to return the first bin - unsigned int bin = 0; - - bool ptrange[3],etarange[3],purange[2]; - ptrange[0]=pt > 2 && pt < 5; - ptrange[1]=pt > 5 && pt < 10; - ptrange[2]=pt > 10; - etarange[0]=fabs(eta) < 0.8; - etarange[1]=fabs(eta) > 0.8 && fabs(eta) <1.4; - etarange[2]=fabs(eta) > 1.4; - purange[0]=nPV<=20; - purange[1]=nPV>20; - - int index=0; - for(int kPU=0;kPU<2;kPU++) - for(int kETA=0;kETA<3;kETA++) - for(int kPT=0;kPT<3;kPT++){ - if (purange[kPU] && ptrange[kPT] && etarange[kETA]) bin=index; - index++; - } - return bin; -} - - - double SoftElectronMVAEstimator::mva(const reco::GsfElectron& myElectron, const reco::VertexCollection& pvc) const { float vars[25]; @@ -163,7 +90,7 @@ double SoftElectronMVAEstimator::mva(const reco::GsfElectron& myElectron, */ bindVariables(vars); - double result= gbr[0]->GetClassifier(vars); + double result= gbr_[0]->GetClassifier(vars); return result; } diff --git a/RecoEgamma/Examples/plugins/DQMAnalyzer.h b/RecoEgamma/Examples/plugins/DQMAnalyzer.h index e25cb37f49493..804ca2334ab15 100644 --- a/RecoEgamma/Examples/plugins/DQMAnalyzer.h +++ b/RecoEgamma/Examples/plugins/DQMAnalyzer.h @@ -19,7 +19,7 @@ #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h" #include "DataFormats/Common/interface/Handle.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -34,7 +34,7 @@ class TH1I; class TProfile; class TTree; -class DQMAnalyzer : public edm::EDAnalyzer +class DQMAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/Examples/plugins/ElectronIDAnalyzer.h b/RecoEgamma/Examples/plugins/ElectronIDAnalyzer.h index 66667bd8f7412..f0f45fdd97d04 100644 --- a/RecoEgamma/Examples/plugins/ElectronIDAnalyzer.h +++ b/RecoEgamma/Examples/plugins/ElectronIDAnalyzer.h @@ -1,13 +1,13 @@ #ifndef ElectronIDAnalyzer_h #define ElectronIDAnalyzer_h -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -class ElectronIDAnalyzer : public edm::EDAnalyzer +class ElectronIDAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.h b/RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.h index e5c303ac829d8..928bcf598b182 100644 --- a/RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.h +++ b/RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.h @@ -13,7 +13,7 @@ // -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -31,7 +31,7 @@ class TH1F; class TH1I; class TTree; -class ElectronSeedAnalyzer : public edm::EDAnalyzer +class ElectronSeedAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/Examples/plugins/GsfElectronDataAnalyzer.h b/RecoEgamma/Examples/plugins/GsfElectronDataAnalyzer.h index 5755afabc6c25..41b2c676c4028 100644 --- a/RecoEgamma/Examples/plugins/GsfElectronDataAnalyzer.h +++ b/RecoEgamma/Examples/plugins/GsfElectronDataAnalyzer.h @@ -13,7 +13,7 @@ // -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -33,7 +33,7 @@ class TH1I; class TProfile; class TTree; -class GsfElectronDataAnalyzer : public edm::EDAnalyzer +class GsfElectronDataAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/Examples/plugins/GsfElectronFakeAnalyzer.h b/RecoEgamma/Examples/plugins/GsfElectronFakeAnalyzer.h index 1a9dd2480e17b..71bbf01f44a9a 100644 --- a/RecoEgamma/Examples/plugins/GsfElectronFakeAnalyzer.h +++ b/RecoEgamma/Examples/plugins/GsfElectronFakeAnalyzer.h @@ -13,7 +13,7 @@ // -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -34,7 +34,7 @@ class TH1I; class TProfile; class TTree; -class GsfElectronFakeAnalyzer : public edm::EDAnalyzer +class GsfElectronFakeAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/Examples/plugins/GsfElectronMCAnalyzer.h b/RecoEgamma/Examples/plugins/GsfElectronMCAnalyzer.h index bd0a2bd264a3b..bfc290b853f23 100644 --- a/RecoEgamma/Examples/plugins/GsfElectronMCAnalyzer.h +++ b/RecoEgamma/Examples/plugins/GsfElectronMCAnalyzer.h @@ -13,7 +13,7 @@ // -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -35,7 +35,7 @@ class TH1I; class TProfile; class TTree; -class GsfElectronMCAnalyzer : public edm::EDAnalyzer +class GsfElectronMCAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/Examples/plugins/GsfElectronMCFakeAnalyzer.h b/RecoEgamma/Examples/plugins/GsfElectronMCFakeAnalyzer.h index 7b3276ec453e6..cce09eb023046 100644 --- a/RecoEgamma/Examples/plugins/GsfElectronMCFakeAnalyzer.h +++ b/RecoEgamma/Examples/plugins/GsfElectronMCFakeAnalyzer.h @@ -13,7 +13,7 @@ // -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -33,7 +33,7 @@ class TH1I; class TProfile; class TTree; -class GsfElectronMCFakeAnalyzer : public edm::EDAnalyzer +class GsfElectronMCFakeAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/Examples/plugins/MCElectronAnalyzer.h b/RecoEgamma/Examples/plugins/MCElectronAnalyzer.h index ef76fd06e8699..3a235fccbebc8 100755 --- a/RecoEgamma/Examples/plugins/MCElectronAnalyzer.h +++ b/RecoEgamma/Examples/plugins/MCElectronAnalyzer.h @@ -3,7 +3,7 @@ #include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruthFinder.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include #include @@ -19,7 +19,7 @@ class SimVertex; class SimTrack; -class MCElectronAnalyzer : public edm::EDAnalyzer +class MCElectronAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/Examples/plugins/MCPhotonAnalyzer.h b/RecoEgamma/Examples/plugins/MCPhotonAnalyzer.h index 8bea049aff42a..e7339d4465621 100755 --- a/RecoEgamma/Examples/plugins/MCPhotonAnalyzer.h +++ b/RecoEgamma/Examples/plugins/MCPhotonAnalyzer.h @@ -3,7 +3,7 @@ #include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include #include @@ -19,7 +19,7 @@ class SimVertex; class SimTrack; -class MCPhotonAnalyzer : public edm::EDAnalyzer +class MCPhotonAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/Examples/plugins/MCPizeroAnalyzer.h b/RecoEgamma/Examples/plugins/MCPizeroAnalyzer.h index 8b489ff7f084f..8381915b2261d 100755 --- a/RecoEgamma/Examples/plugins/MCPizeroAnalyzer.h +++ b/RecoEgamma/Examples/plugins/MCPizeroAnalyzer.h @@ -3,7 +3,7 @@ #include "RecoEgamma/EgammaMCTools/interface/PizeroMCTruthFinder.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include #include @@ -19,7 +19,7 @@ class SimVertex; class SimTrack; -class MCPizeroAnalyzer : public edm::EDAnalyzer +class MCPizeroAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/Examples/plugins/PatPhotonSimpleAnalyzer.h b/RecoEgamma/Examples/plugins/PatPhotonSimpleAnalyzer.h index 893fff94b2ad0..e88dc3a2cb5d5 100644 --- a/RecoEgamma/Examples/plugins/PatPhotonSimpleAnalyzer.h +++ b/RecoEgamma/Examples/plugins/PatPhotonSimpleAnalyzer.h @@ -17,7 +17,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -34,7 +34,7 @@ class TFile; // // class declaration // -class PatPhotonSimpleAnalyzer : public edm::EDAnalyzer { +class PatPhotonSimpleAnalyzer : public edm::one::EDAnalyzer<> { public: explicit PatPhotonSimpleAnalyzer( const edm::ParameterSet& ); ~PatPhotonSimpleAnalyzer() override; diff --git a/RecoEgamma/Examples/plugins/PhotonsWithConversionsAnalyzer.h b/RecoEgamma/Examples/plugins/PhotonsWithConversionsAnalyzer.h index 37f94dcfa249a..ad691bffce5a1 100755 --- a/RecoEgamma/Examples/plugins/PhotonsWithConversionsAnalyzer.h +++ b/RecoEgamma/Examples/plugins/PhotonsWithConversionsAnalyzer.h @@ -3,7 +3,7 @@ #include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include #include @@ -19,7 +19,7 @@ class SimVertex; class SimTrack; -class PhotonsWithConversionsAnalyzer : public edm::EDAnalyzer +class PhotonsWithConversionsAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.h b/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.h index ffa1b1dae8fb3..06b8d3e916ab1 100644 --- a/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.h +++ b/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.h @@ -26,7 +26,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "TFile.h" #include "TH1F.h" @@ -43,7 +43,7 @@ // class decleration // -class SiStripElectronAnalyzer : public edm::EDAnalyzer { +class SiStripElectronAnalyzer : public edm::one::EDAnalyzer<> { public: explicit SiStripElectronAnalyzer(const edm::ParameterSet&); ~SiStripElectronAnalyzer() override; diff --git a/RecoEgamma/Examples/plugins/SimpleConvertedPhotonAnalyzer.h b/RecoEgamma/Examples/plugins/SimpleConvertedPhotonAnalyzer.h index 6ce43a7d3cc81..2c2bf03ea84dc 100755 --- a/RecoEgamma/Examples/plugins/SimpleConvertedPhotonAnalyzer.h +++ b/RecoEgamma/Examples/plugins/SimpleConvertedPhotonAnalyzer.h @@ -3,7 +3,7 @@ #include "RecoEgamma/EgammaMCTools/interface/PhotonMCTruthFinder.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include #include @@ -19,7 +19,7 @@ class SimVertex; class SimTrack; -class SimpleConvertedPhotonAnalyzer : public edm::EDAnalyzer +class SimpleConvertedPhotonAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/Examples/plugins/SimplePhotonAnalyzer.h b/RecoEgamma/Examples/plugins/SimplePhotonAnalyzer.h index b306d10748ba9..5578090f5595d 100644 --- a/RecoEgamma/Examples/plugins/SimplePhotonAnalyzer.h +++ b/RecoEgamma/Examples/plugins/SimplePhotonAnalyzer.h @@ -18,7 +18,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -35,7 +35,7 @@ class TFile; -class SimplePhotonAnalyzer : public edm::EDAnalyzer { +class SimplePhotonAnalyzer : public edm::one::EDAnalyzer<> { public: explicit SimplePhotonAnalyzer( const edm::ParameterSet& ); ~SimplePhotonAnalyzer() override; diff --git a/RecoEgamma/Examples/plugins/SimplePi0DiscAnalyzer.h b/RecoEgamma/Examples/plugins/SimplePi0DiscAnalyzer.h index bac59a5bed54b..fd56d89aac6ba 100644 --- a/RecoEgamma/Examples/plugins/SimplePi0DiscAnalyzer.h +++ b/RecoEgamma/Examples/plugins/SimplePi0DiscAnalyzer.h @@ -17,7 +17,7 @@ #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -39,7 +39,7 @@ class TH1I; class TProfile; class TTree; -class SimplePi0DiscAnalyzer : public edm::EDAnalyzer +class SimplePi0DiscAnalyzer : public edm::one::EDAnalyzer<> { public: diff --git a/RecoEgamma/PhotonIdentification/plugins/PhotonIDSimpleAnalyzer.h b/RecoEgamma/PhotonIdentification/plugins/PhotonIDSimpleAnalyzer.h index b59d3fe5ee8a6..90954e451f3f5 100644 --- a/RecoEgamma/PhotonIdentification/plugins/PhotonIDSimpleAnalyzer.h +++ b/RecoEgamma/PhotonIdentification/plugins/PhotonIDSimpleAnalyzer.h @@ -17,7 +17,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -34,7 +34,7 @@ class TFile; // // class declaration // -class PhotonIDSimpleAnalyzer : public edm::EDAnalyzer { +class PhotonIDSimpleAnalyzer : public edm::one::EDAnalyzer<> { public: explicit PhotonIDSimpleAnalyzer( const edm::ParameterSet& ); ~PhotonIDSimpleAnalyzer() override;