From 65582211de8db178ab9d80da778ac8d466104317 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Mon, 2 Nov 2020 16:49:10 +0100 Subject: [PATCH] fix tests and code modernization --- .../plugins/CalibratedElectronProducers.cc | 18 +++--- .../plugins/CalibratedPhotonProducers.cc | 16 ++---- .../plugins/EG9X105XObjectUpdateModifier.cc | 2 +- .../EgammaTools/plugins/EGEnergyAnalyzer.cc | 4 +- .../plugins/EGEtScaleSysModifier.cc | 4 +- .../plugins/EGFull5x5ShowerShapeModifier.cc | 12 ++-- .../plugins/EGRegressionModifierV1.cc | 57 +++++++------------ .../plugins/EGRegressionModifierV2.cc | 20 +++---- .../plugins/EGRegressionModifierV3.cc | 22 +++---- .../plugins/HGCalElectronFilter.cc | 5 +- .../HGCalElectronIDValueMapProducer.cc | 5 +- .../plugins/HGCalPhotonIDValueMapProducer.cc | 5 +- .../python/regressionModifier_cfi.py | 4 +- .../src/EgammaRegressionContainer.cc | 8 +-- 14 files changed, 75 insertions(+), 107 deletions(-) diff --git a/RecoEgamma/EgammaTools/plugins/CalibratedElectronProducers.cc b/RecoEgamma/EgammaTools/plugins/CalibratedElectronProducers.cc index 72160c50af80d..cbba887dbf76f 100644 --- a/RecoEgamma/EgammaTools/plugins/CalibratedElectronProducers.cc +++ b/RecoEgamma/EgammaTools/plugins/CalibratedElectronProducers.cc @@ -86,11 +86,11 @@ namespace { template CalibratedElectronProducerT::CalibratedElectronProducerT(const edm::ParameterSet& conf) - : electronToken_(consumes>(conf.getParameter("src"))), - epCombinationTool_{conf.getParameter("epCombConfig"), consumesCollector()}, + : electronToken_(consumes(conf.getParameter("src"))), + epCombinationTool_{conf.getParameterSet("epCombConfig"), consumesCollector()}, energyCorrector_(epCombinationTool_, conf.getParameter("correctionFile")), - recHitCollectionEBToken_(consumes(conf.getParameter("recHitCollectionEB"))), - recHitCollectionEEToken_(consumes(conf.getParameter("recHitCollectionEE"))), + recHitCollectionEBToken_(consumes(conf.getParameter("recHitCollectionEB"))), + recHitCollectionEEToken_(consumes(conf.getParameter("recHitCollectionEE"))), produceCalibratedObjs_(conf.getParameter("produceCalibratedObjs")) { energyCorrector_.setMinEt(conf.getParameter("minEtToCalibrate")); @@ -132,14 +132,10 @@ template void CalibratedElectronProducerT::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { epCombinationTool_.setEventContent(iSetup); - edm::Handle> inHandle; - iEvent.getByToken(electronToken_, inHandle); + auto inHandle = iEvent.getHandle(electronToken_); - edm::Handle recHitCollectionEBHandle; - edm::Handle recHitCollectionEEHandle; - - iEvent.getByToken(recHitCollectionEBToken_, recHitCollectionEBHandle); - iEvent.getByToken(recHitCollectionEEToken_, recHitCollectionEEHandle); + auto recHitCollectionEBHandle = iEvent.getHandle(recHitCollectionEBToken_); + auto recHitCollectionEEHandle = iEvent.getHandle(recHitCollectionEEToken_); std::unique_ptr> out = std::make_unique>(); diff --git a/RecoEgamma/EgammaTools/plugins/CalibratedPhotonProducers.cc b/RecoEgamma/EgammaTools/plugins/CalibratedPhotonProducers.cc index e5b8598f1589e..128678552755f 100644 --- a/RecoEgamma/EgammaTools/plugins/CalibratedPhotonProducers.cc +++ b/RecoEgamma/EgammaTools/plugins/CalibratedPhotonProducers.cc @@ -77,10 +77,10 @@ namespace { template CalibratedPhotonProducerT::CalibratedPhotonProducerT(const edm::ParameterSet& conf) - : photonToken_(consumes>(conf.getParameter("src"))), + : photonToken_(consumes(conf.getParameter("src"))), energyCorrector_(conf.getParameter("correctionFile")), - recHitCollectionEBToken_(consumes(conf.getParameter("recHitCollectionEB"))), - recHitCollectionEEToken_(consumes(conf.getParameter("recHitCollectionEE"))), + recHitCollectionEBToken_(consumes(conf.getParameter("recHitCollectionEB"))), + recHitCollectionEEToken_(consumes(conf.getParameter("recHitCollectionEE"))), produceCalibratedObjs_(conf.getParameter("produceCalibratedObjs")) { energyCorrector_.setMinEt(conf.getParameter("minEtToCalibrate")); @@ -119,14 +119,10 @@ void CalibratedPhotonProducerT::fillDescriptions(edm::ConfigurationDescriptio template void CalibratedPhotonProducerT::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { - edm::Handle> inHandle; - iEvent.getByToken(photonToken_, inHandle); + auto inHandle = iEvent.getHandle(photonToken_); - edm::Handle recHitCollectionEBHandle; - edm::Handle recHitCollectionEEHandle; - - iEvent.getByToken(recHitCollectionEBToken_, recHitCollectionEBHandle); - iEvent.getByToken(recHitCollectionEEToken_, recHitCollectionEEHandle); + auto recHitCollectionEBHandle = iEvent.getHandle(recHitCollectionEBToken_); + auto recHitCollectionEEHandle = iEvent.getHandle(recHitCollectionEEToken_); std::unique_ptr> out = std::make_unique>(); diff --git a/RecoEgamma/EgammaTools/plugins/EG9X105XObjectUpdateModifier.cc b/RecoEgamma/EgammaTools/plugins/EG9X105XObjectUpdateModifier.cc index d03dc704390aa..ecf677b6135a6 100644 --- a/RecoEgamma/EgammaTools/plugins/EG9X105XObjectUpdateModifier.cc +++ b/RecoEgamma/EgammaTools/plugins/EG9X105XObjectUpdateModifier.cc @@ -26,7 +26,7 @@ class EG9X105XObjectUpdateModifier : public ModifyObjectValueBase { class TokenHandlePair { public: TokenHandlePair(const edm::ParameterSet& conf, const std::string& name, edm::ConsumesCollector& cc) - : token_(cc.consumes(conf.getParameter(name))) {} + : token_(cc.consumes(conf.getParameter(name))) {} void setHandle(const edm::Event& iEvent) { iEvent.getByToken(token_, handle_); } const edm::Handle& handle() const { return handle_; } diff --git a/RecoEgamma/EgammaTools/plugins/EGEnergyAnalyzer.cc b/RecoEgamma/EgammaTools/plugins/EGEnergyAnalyzer.cc index 5ea8c90e089ae..6cbcac625b005 100644 --- a/RecoEgamma/EgammaTools/plugins/EGEnergyAnalyzer.cc +++ b/RecoEgamma/EgammaTools/plugins/EGEnergyAnalyzer.cc @@ -62,8 +62,8 @@ class EGEnergyAnalyzer : public edm::one::EDAnalyzer<> { EGEnergyAnalyzer::EGEnergyAnalyzer(const edm::ParameterSet& iConfig) : ecalClusterToolsESGetTokens_{consumesCollector()} { - ebRHToken_ = consumes(edm::InputTag("reducedEcalRecHitsEB")); - eeRHToken_ = consumes(edm::InputTag("reducedEcalRecHitsEE")); + ebRHToken_ = consumes(edm::InputTag("reducedEcalRecHitsEB")); + eeRHToken_ = consumes(edm::InputTag("reducedEcalRecHitsEE")); } EGEnergyAnalyzer::~EGEnergyAnalyzer() { diff --git a/RecoEgamma/EgammaTools/plugins/EGEtScaleSysModifier.cc b/RecoEgamma/EgammaTools/plugins/EGEtScaleSysModifier.cc index 7acf59a8751b5..1b412065e5c2c 100644 --- a/RecoEgamma/EgammaTools/plugins/EGEtScaleSysModifier.cc +++ b/RecoEgamma/EgammaTools/plugins/EGEtScaleSysModifier.cc @@ -87,8 +87,8 @@ class EGEtScaleSysModifier : public ModifyObjectValueBase { }; EGEtScaleSysModifier::EGEtScaleSysModifier(const edm::ParameterSet& conf, edm::ConsumesCollector& cc) - : ModifyObjectValueBase(conf), epCombTool_{conf.getParameter("epCombConfig"), std::move(cc)} { - const edm::ParameterSet funcPSet = conf.getParameter("uncertFunc"); + : ModifyObjectValueBase(conf), epCombTool_{conf.getParameterSet("epCombConfig"), std::move(cc)} { + const edm::ParameterSet& funcPSet = conf.getParameterSet("uncertFunc"); const std::string& funcName = funcPSet.getParameter("name"); if (funcName == "UncertFuncV1") { uncertFunc_ = std::make_unique(funcPSet); diff --git a/RecoEgamma/EgammaTools/plugins/EGFull5x5ShowerShapeModifier.cc b/RecoEgamma/EgammaTools/plugins/EGFull5x5ShowerShapeModifier.cc index 2bda92161a427..ce32a9a734682 100644 --- a/RecoEgamma/EgammaTools/plugins/EGFull5x5ShowerShapeModifier.cc +++ b/RecoEgamma/EgammaTools/plugins/EGFull5x5ShowerShapeModifier.cc @@ -12,7 +12,7 @@ namespace { template inline void make_consumes(const T& tag, edm::EDGetTokenT& tok, V& sume) { if (!(empty_tag == tag)) - tok = sume.template consumes(tag); + tok = sume.template consumes(tag); } } // namespace @@ -76,7 +76,7 @@ EGFull5x5ShowerShapeModifierFromValueMaps::EGFull5x5ShowerShapeModifierFromValue edm::ConsumesCollector& cc) : ModifyObjectValueBase(conf) { if (conf.exists("electron_config")) { - const edm::ParameterSet& electrons = conf.getParameter("electron_config"); + auto const& electrons = conf.getParameterSet("electron_config"); if (electrons.exists("electronSrc")) make_consumes(electrons.getParameter("electronSrc"), e_conf.tok_electron_src, cc); if (electrons.exists("sigmaEtaEta")) @@ -103,7 +103,7 @@ EGFull5x5ShowerShapeModifierFromValueMaps::EGFull5x5ShowerShapeModifierFromValue make_consumes(electrons.getParameter("hcalDepth2OverEcalBc"), e_conf.tok_hcalDepth2OverEcalBc, cc); } if (conf.exists("photon_config")) { - const edm::ParameterSet& photons = conf.getParameter("photon_config"); + auto const& photons = conf.getParameterSet("photon_config"); if (photons.exists("photonSrc")) make_consumes(photons.getParameter("photonSrc"), ph_conf.tok_photon_src, cc); if (photons.exists("sigmaEtaEta")) @@ -151,8 +151,7 @@ void EGFull5x5ShowerShapeModifierFromValueMaps::setEvent(const edm::Event& evt) ele_idx = pho_idx = 0; if (!e_conf.tok_electron_src.isUninitialized()) { - edm::Handle> eles; - evt.getByToken(e_conf.tok_electron_src, eles); + auto eles = evt.getHandle(e_conf.tok_electron_src); eles_by_oop.resize(eles->size()); std::copy(eles->ptrs().begin(), eles->ptrs().end(), eles_by_oop.begin()); @@ -171,8 +170,7 @@ void EGFull5x5ShowerShapeModifierFromValueMaps::setEvent(const edm::Event& evt) get_product(evt, e_conf.tok_hcalDepth2OverEcalBc, ele_vmaps); if (!ph_conf.tok_photon_src.isUninitialized()) { - edm::Handle> phos; - evt.getByToken(ph_conf.tok_photon_src, phos); + auto phos = evt.getHandle(ph_conf.tok_photon_src); phos_by_oop.resize(phos->size()); std::copy(phos->ptrs().begin(), phos->ptrs().end(), phos_by_oop.begin()); diff --git a/RecoEgamma/EgammaTools/plugins/EGRegressionModifierV1.cc b/RecoEgamma/EgammaTools/plugins/EGRegressionModifierV1.cc index e474d3b0df893..078afbf8a85f1 100644 --- a/RecoEgamma/EgammaTools/plugins/EGRegressionModifierV1.cc +++ b/RecoEgamma/EgammaTools/plugins/EGRegressionModifierV1.cc @@ -35,8 +35,8 @@ class EGRegressionModifierV1 : public ModifyObjectValueBase { EGRegressionModifierCondTokens eleCond25nsTokens_; EGRegressionModifierCondTokens phoCond25nsTokens_; - std::string condNamesWeight50ns_; - std::string condNamesWeight25ns_; + edm::ESGetToken condNamesWeight50nsToken_; + edm::ESGetToken condNamesWeight25nsToken_; const bool autoDetectBunchSpacing_; int bunchspacing_; @@ -45,8 +45,8 @@ class EGRegressionModifierV1 : public ModifyObjectValueBase { edm::EDGetTokenT rhoToken_; int nVtx_; edm::EDGetTokenT vtxToken_; - edm::Handle vtxH_; - edm::ESHandle caloGeomH_; + edm::ESGetToken caloGeomToken_; + CaloGeometry const* caloGeom_; const bool applyExtraHighEnergyProtection_; std::vector phoForestsMean_; @@ -60,44 +60,34 @@ DEFINE_EDM_PLUGIN(ModifyObjectValueFactory, EGRegressionModifierV1, "EGRegressio EGRegressionModifierV1::EGRegressionModifierV1(const edm::ParameterSet& conf, edm::ConsumesCollector& cc) : ModifyObjectValueBase(conf), - eleCond50nsTokens_{ - conf.getParameter("electron_config"), "regressionKey_50ns", "uncertaintyKey_50ns", cc}, - phoCond50nsTokens_{ - conf.getParameter("photon_config"), "regressionKey_50ns", "uncertaintyKey_50ns", cc}, - eleCond25nsTokens_{ - conf.getParameter("electron_config"), "regressionKey_25ns", "uncertaintyKey_25ns", cc}, - phoCond25nsTokens_{ - conf.getParameter("photon_config"), "regressionKey_25ns", "uncertaintyKey_25ns", cc}, + eleCond50nsTokens_{conf.getParameterSet("electron_config"), "regressionKey_50ns", "uncertaintyKey_50ns", cc}, + phoCond50nsTokens_{conf.getParameterSet("photon_config"), "regressionKey_50ns", "uncertaintyKey_50ns", cc}, + eleCond25nsTokens_{conf.getParameterSet("electron_config"), "regressionKey_25ns", "uncertaintyKey_25ns", cc}, + phoCond25nsTokens_{conf.getParameterSet("photon_config"), "regressionKey_25ns", "uncertaintyKey_25ns", cc}, autoDetectBunchSpacing_(conf.getParameter("autoDetectBunchSpacing")), bunchspacing_(autoDetectBunchSpacing_ ? 450 : conf.getParameter("manualBunchSpacing")), - rhoToken_(cc.consumes(conf.getParameter("rhoCollection"))), - vtxToken_(cc.consumes(conf.getParameter("vertexCollection"))), + rhoToken_(cc.consumes(conf.getParameter("rhoCollection"))), + vtxToken_(cc.consumes(conf.getParameter("vertexCollection"))), + caloGeomToken_{cc.esConsumes()}, applyExtraHighEnergyProtection_(conf.getParameter("applyExtraHighEnergyProtection")) { if (autoDetectBunchSpacing_) - bunchSpacingToken_ = cc.consumes(conf.getParameter("bunchSpacingTag")); + bunchSpacingToken_ = cc.consumes(conf.getParameter("bunchSpacingTag")); - auto const& electrons = conf.getParameter("electron_config"); - condNamesWeight50ns_ = electrons.getParameter("combinationKey_50ns"); - condNamesWeight25ns_ = electrons.getParameter("combinationKey_25ns"); + auto const& electrons = conf.getParameterSet("electron_config"); + condNamesWeight50nsToken_ = cc.esConsumes(electrons.getParameter("combinationKey_50ns")); + condNamesWeight25nsToken_ = cc.esConsumes(electrons.getParameter("combinationKey_25ns")); } void EGRegressionModifierV1::setEvent(const edm::Event& evt) { if (autoDetectBunchSpacing_) { - edm::Handle bunchSpacingH; - evt.getByToken(bunchSpacingToken_, bunchSpacingH); - bunchspacing_ = *bunchSpacingH; + bunchspacing_ = evt.get(bunchSpacingToken_); } - - edm::Handle rhoH; - evt.getByToken(rhoToken_, rhoH); - rhoValue_ = *rhoH; - - evt.getByToken(vtxToken_, vtxH_); - nVtx_ = vtxH_->size(); + rhoValue_ = evt.get(rhoToken_); + nVtx_ = evt.get(vtxToken_).size(); } void EGRegressionModifierV1::setEventContent(const edm::EventSetup& evs) { - evs.get().get(caloGeomH_); + caloGeom_ = &evs.getData(caloGeomToken_); phoForestsMean_ = retrieveGBRForests(evs, (bunchspacing_ == 25) ? phoCond25nsTokens_.mean : phoCond50nsTokens_.mean); phoForestsSigma_ = @@ -107,10 +97,7 @@ void EGRegressionModifierV1::setEventContent(const edm::EventSetup& evs) { eleForestsSigma_ = retrieveGBRForests(evs, (bunchspacing_ == 25) ? eleCond25nsTokens_.sigma : eleCond50nsTokens_.sigma); - edm::ESHandle forestEH; - const std::string ep_condnames_weight = (bunchspacing_ == 25) ? condNamesWeight25ns_ : condNamesWeight50ns_; - evs.get().get(ep_condnames_weight, forestEH); - epForest_ = forestEH.product(); + epForest_ = &evs.getData((bunchspacing_ == 25) ? condNamesWeight25nsToken_ : condNamesWeight50nsToken_); } void EGRegressionModifierV1::modifyObject(reco::GsfElectron& ele) const { @@ -202,9 +189,9 @@ void EGRegressionModifierV1::modifyObject(reco::GsfElectron& ele) const { float cryPhi; float cryEta; if (ele.isEB()) - egammaTools::localEcalClusterCoordsEB(*theseed, *caloGeomH_, cryEta, cryPhi, iEta, iPhi, dummy, dummy); + egammaTools::localEcalClusterCoordsEB(*theseed, *caloGeom_, cryEta, cryPhi, iEta, iPhi, dummy, dummy); else - egammaTools::localEcalClusterCoordsEE(*theseed, *caloGeomH_, cryEta, cryPhi, iEta, iPhi, dummy, dummy); + egammaTools::localEcalClusterCoordsEE(*theseed, *caloGeom_, cryEta, cryPhi, iEta, iPhi, dummy, dummy); if (isEB) { eval[29] = cryEta; diff --git a/RecoEgamma/EgammaTools/plugins/EGRegressionModifierV2.cc b/RecoEgamma/EgammaTools/plugins/EGRegressionModifierV2.cc index 175c84cbab4e0..907b3835c872f 100644 --- a/RecoEgamma/EgammaTools/plugins/EGRegressionModifierV2.cc +++ b/RecoEgamma/EgammaTools/plugins/EGRegressionModifierV2.cc @@ -32,8 +32,9 @@ class EGRegressionModifierV2 : public ModifyObjectValueBase { EGRegressionModifierCondTokens phoCondTokens_; float rhoValue_; - edm::EDGetTokenT rhoToken_; - edm::ESHandle caloGeometry_; + const edm::EDGetTokenT rhoToken_; + const edm::ESGetToken caloGeometryToken_; + CaloGeometry const* caloGeometry_ = nullptr; std::vector phoForestsMean_; std::vector phoForestsSigma_; @@ -53,10 +54,11 @@ DEFINE_EDM_PLUGIN(ModifyObjectValueFactory, EGRegressionModifierV2, "EGRegressio EGRegressionModifierV2::EGRegressionModifierV2(const edm::ParameterSet& conf, edm::ConsumesCollector& cc) : ModifyObjectValueBase(conf), - eleCondTokens_{conf.getParameter("electron_config"), "regressionKey", "uncertaintyKey", cc}, - phoCondTokens_{conf.getParameter("photon_config"), "regressionKey", "uncertaintyKey", cc}, + eleCondTokens_{conf.getParameterSet("electron_config"), "regressionKey", "uncertaintyKey", cc}, + phoCondTokens_{conf.getParameterSet("photon_config"), "regressionKey", "uncertaintyKey", cc}, - rhoToken_(cc.consumes(conf.getParameter("rhoCollection"))), + rhoToken_(cc.consumes(conf.getParameter("rhoCollection"))), + caloGeometryToken_(cc.esConsumes()), lowEnergyEcalOnlyThr_(conf.getParameter("lowEnergy_ECALonlyThr")), lowEnergyEcalTrackThr_(conf.getParameter("lowEnergy_ECALTRKThr")), highEnergyEcalTrackThr_(conf.getParameter("highEnergy_ECALTRKThr")), @@ -73,11 +75,7 @@ EGRegressionModifierV2::EGRegressionModifierV2(const edm::ParameterSet& conf, ed phoForestsSigma_.reserve(ncor); } -void EGRegressionModifierV2::setEvent(const edm::Event& evt) { - edm::Handle rhoH; - evt.getByToken(rhoToken_, rhoH); - rhoValue_ = *rhoH; -} +void EGRegressionModifierV2::setEvent(const edm::Event& evt) { rhoValue_ = evt.get(rhoToken_); } void EGRegressionModifierV2::setEventContent(const edm::EventSetup& evs) { phoForestsMean_ = retrieveGBRForests(evs, phoCondTokens_.mean); @@ -86,7 +84,7 @@ void EGRegressionModifierV2::setEventContent(const edm::EventSetup& evs) { eleForestsMean_ = retrieveGBRForests(evs, eleCondTokens_.mean); eleForestsSigma_ = retrieveGBRForests(evs, eleCondTokens_.sigma); - evs.get().get(caloGeometry_); + caloGeometry_ = &evs.getData(caloGeometryToken_); } void EGRegressionModifierV2::modifyObject(reco::GsfElectron& ele) const { diff --git a/RecoEgamma/EgammaTools/plugins/EGRegressionModifierV3.cc b/RecoEgamma/EgammaTools/plugins/EGRegressionModifierV3.cc index d0cd1f96edf3f..a7d4f91fec372 100644 --- a/RecoEgamma/EgammaTools/plugins/EGRegressionModifierV3.cc +++ b/RecoEgamma/EgammaTools/plugins/EGRegressionModifierV3.cc @@ -71,25 +71,21 @@ DEFINE_EDM_PLUGIN(ModifyObjectValueFactory, EGRegressionModifierV3, "EGRegressio EGRegressionModifierV3::EGRegressionModifierV3(const edm::ParameterSet& conf, edm::ConsumesCollector& cc) : ModifyObjectValueBase(conf), rhoValue_(0.), - rhoToken_(cc.consumes(conf.getParameter("rhoTag"))), + rhoToken_(cc.consumes(conf.getParameter("rhoTag"))), useClosestToCentreSeedCrysDef_(conf.getParameter("useClosestToCentreSeedCrysDef")), maxRawEnergyForLowPtEBSigma_(conf.getParameter("maxRawEnergyForLowPtEBSigma")), maxRawEnergyForLowPtEESigma_(conf.getParameter("maxRawEnergyForLowPtEESigma")) { if (conf.exists("eleRegs")) { - eleRegs_ = std::make_unique(conf.getParameter("eleRegs"), cc); + eleRegs_ = std::make_unique(conf.getParameterSet("eleRegs"), cc); } if (conf.exists("phoRegs")) { - phoRegs_ = std::make_unique(conf.getParameter("phoRegs"), cc); + phoRegs_ = std::make_unique(conf.getParameterSet("phoRegs"), cc); } } EGRegressionModifierV3::~EGRegressionModifierV3() {} -void EGRegressionModifierV3::setEvent(const edm::Event& evt) { - edm::Handle rhoHandle; - evt.getByToken(rhoToken_, rhoHandle); - rhoValue_ = *rhoHandle; -} +void EGRegressionModifierV3::setEvent(const edm::Event& evt) { rhoValue_ = evt.get(rhoToken_); } void EGRegressionModifierV3::setEventContent(const edm::EventSetup& iSetup) { if (eleRegs_) @@ -359,9 +355,9 @@ void EGRegressionModifierV3::getSeedCrysCoord(const reco::CaloCluster& clus, int } EGRegressionModifierV3::EleRegs::EleRegs(const edm::ParameterSet& iConfig, edm::ConsumesCollector& cc) - : ecalOnlyMean(iConfig.getParameter("ecalOnlyMean"), cc), - ecalOnlySigma(iConfig.getParameter("ecalOnlySigma"), cc), - epComb(iConfig.getParameter("epComb"), std::move(cc)) {} + : ecalOnlyMean(iConfig.getParameterSet("ecalOnlyMean"), cc), + ecalOnlySigma(iConfig.getParameterSet("ecalOnlySigma"), cc), + epComb(iConfig.getParameterSet("epComb"), std::move(cc)) {} void EGRegressionModifierV3::EleRegs::setEventContent(const edm::EventSetup& iSetup) { ecalOnlyMean.setEventContent(iSetup); @@ -370,8 +366,8 @@ void EGRegressionModifierV3::EleRegs::setEventContent(const edm::EventSetup& iSe } EGRegressionModifierV3::PhoRegs::PhoRegs(const edm::ParameterSet& iConfig, edm::ConsumesCollector& cc) - : ecalOnlyMean(iConfig.getParameter("ecalOnlyMean"), cc), - ecalOnlySigma(iConfig.getParameter("ecalOnlySigma"), cc) {} + : ecalOnlyMean(iConfig.getParameterSet("ecalOnlyMean"), cc), + ecalOnlySigma(iConfig.getParameterSet("ecalOnlySigma"), cc) {} void EGRegressionModifierV3::PhoRegs::setEventContent(const edm::EventSetup& iSetup) { ecalOnlyMean.setEventContent(iSetup); diff --git a/RecoEgamma/EgammaTools/plugins/HGCalElectronFilter.cc b/RecoEgamma/EgammaTools/plugins/HGCalElectronFilter.cc index f993e2ff8b405..9951f4d14f361 100644 --- a/RecoEgamma/EgammaTools/plugins/HGCalElectronFilter.cc +++ b/RecoEgamma/EgammaTools/plugins/HGCalElectronFilter.cc @@ -56,7 +56,7 @@ class HGCalElectronFilter : public edm::stream::EDProducer<> { }; HGCalElectronFilter::HGCalElectronFilter(const edm::ParameterSet& iConfig) - : electronsToken_(consumes>(iConfig.getParameter("inputGsfElectrons"))), + : electronsToken_(consumes(iConfig.getParameter("inputGsfElectrons"))), outputCollection_(iConfig.getParameter("outputCollection")), cleanBarrel_(iConfig.getParameter("cleanBarrel")) { produces(outputCollection_); @@ -72,8 +72,7 @@ HGCalElectronFilter::~HGCalElectronFilter() {} void HGCalElectronFilter::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { auto gsfElectrons_p = std::make_unique(); - edm::Handle> electronsH; - iEvent.getByToken(electronsToken_, electronsH); + auto electronsH = iEvent.getHandle(electronsToken_); for (const auto& electron1 : *electronsH) { bool isBest = true; diff --git a/RecoEgamma/EgammaTools/plugins/HGCalElectronIDValueMapProducer.cc b/RecoEgamma/EgammaTools/plugins/HGCalElectronIDValueMapProducer.cc index f1efd31887544..0d7f8fe9aa6a8 100644 --- a/RecoEgamma/EgammaTools/plugins/HGCalElectronIDValueMapProducer.cc +++ b/RecoEgamma/EgammaTools/plugins/HGCalElectronIDValueMapProducer.cc @@ -80,7 +80,7 @@ const std::vector HGCalElectronIDValueMapProducer::valuesProduced_ }; HGCalElectronIDValueMapProducer::HGCalElectronIDValueMapProducer(const edm::ParameterSet& iConfig) - : electronsToken_(consumes>(iConfig.getParameter("electrons"))), + : electronsToken_(consumes(iConfig.getParameter("electrons"))), radius_(iConfig.getParameter("pcaRadius")) { for (const auto& key : valuesProduced_) { maps_[key] = {}; @@ -96,8 +96,7 @@ HGCalElectronIDValueMapProducer::~HGCalElectronIDValueMapProducer() {} void HGCalElectronIDValueMapProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; - Handle> electronsH; - iEvent.getByToken(electronsToken_, electronsH); + auto electronsH = iEvent.getHandle(electronsToken_); // Clear previous map for (auto&& kv : maps_) { diff --git a/RecoEgamma/EgammaTools/plugins/HGCalPhotonIDValueMapProducer.cc b/RecoEgamma/EgammaTools/plugins/HGCalPhotonIDValueMapProducer.cc index 650beaab9dca7..f82e76ef29ee6 100644 --- a/RecoEgamma/EgammaTools/plugins/HGCalPhotonIDValueMapProducer.cc +++ b/RecoEgamma/EgammaTools/plugins/HGCalPhotonIDValueMapProducer.cc @@ -72,7 +72,7 @@ const std::vector HGCalPhotonIDValueMapProducer::valuesProduced_ = }; HGCalPhotonIDValueMapProducer::HGCalPhotonIDValueMapProducer(const edm::ParameterSet& iConfig) - : photonsToken_(consumes>(iConfig.getParameter("photons"))), + : photonsToken_(consumes(iConfig.getParameter("photons"))), radius_(iConfig.getParameter("pcaRadius")) { for (const auto& key : valuesProduced_) { maps_[key] = {}; @@ -88,8 +88,7 @@ HGCalPhotonIDValueMapProducer::~HGCalPhotonIDValueMapProducer() {} void HGCalPhotonIDValueMapProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; - Handle> photonsH; - iEvent.getByToken(photonsToken_, photonsH); + auto photonsH = iEvent.getHandle(photonsToken_); // Clear previous map for (auto&& kv : maps_) { diff --git a/RecoEgamma/EgammaTools/python/regressionModifier_cfi.py b/RecoEgamma/EgammaTools/python/regressionModifier_cfi.py index ebeafeacd0f41..9bc826569b391 100644 --- a/RecoEgamma/EgammaTools/python/regressionModifier_cfi.py +++ b/RecoEgamma/EgammaTools/python/regressionModifier_cfi.py @@ -219,11 +219,11 @@ electron_config = cms.PSet( # EB, EE regressionKey_25ns = cms.vstring('gedelectron_EBCorrection_25ns', 'gedelectron_EECorrection_25ns'), uncertaintyKey_25ns = cms.vstring('gedelectron_EBUncertainty_25ns', 'gedelectron_EEUncertainty_25ns'), - combinationKey_25ns = cms.string('gedelectron_p4combination_25ns'), + combinationKey_25ns = cms.ESInputTag("", 'gedelectron_p4combination_25ns'), regressionKey_50ns = cms.vstring('gedelectron_EBCorrection_50ns', 'gedelectron_EECorrection_50ns'), uncertaintyKey_50ns = cms.vstring('gedelectron_EBUncertainty_50ns', 'gedelectron_EEUncertainty_50ns'), - combinationKey_50ns = cms.string('gedelectron_p4combination_50ns'), + combinationKey_50ns = cms.ESInputTag("", 'gedelectron_p4combination_50ns'), ), photon_config = cms.PSet( # EB, EE diff --git a/RecoEgamma/EgammaTools/src/EgammaRegressionContainer.cc b/RecoEgamma/EgammaTools/src/EgammaRegressionContainer.cc index 23f74b63004d0..c93b3bc3ba4c6 100644 --- a/RecoEgamma/EgammaTools/src/EgammaRegressionContainer.cc +++ b/RecoEgamma/EgammaTools/src/EgammaRegressionContainer.cc @@ -26,10 +26,10 @@ edm::ParameterSetDescription EgammaRegressionContainer::makePSetDescription() { desc.add("rangeMaxHighEt", 3.0); desc.add("lowEtHighEtBoundary", 50.); desc.add("forceHighEnergyTrainingIfSaturated", false); - desc.add("ebLowEtForestName", "electron_eb_ECALTRK_lowpt"); - desc.add("ebHighEtForestName", "electron_eb_ECALTRK"); - desc.add("eeLowEtForestName", "electron_ee_ECALTRK_lowpt"); - desc.add("eeHighEtForestName", "electron_ee_ECALTRK"); + desc.add("ebLowEtForestName", edm::ESInputTag{"", "electron_eb_ECALTRK_lowpt"}); + desc.add("ebHighEtForestName", edm::ESInputTag{"", "electron_eb_ECALTRK"}); + desc.add("eeLowEtForestName", edm::ESInputTag{"", "electron_ee_ECALTRK_lowpt"}); + desc.add("eeHighEtForestName", edm::ESInputTag{"", "electron_ee_ECALTRK"}); return desc; }