Skip to content

Commit

Permalink
fix tests and code modernization
Browse files Browse the repository at this point in the history
  • Loading branch information
@guitargeek
guitargeek committed Nov 2, 2020
1 parent e600e2f commit 6558221
Show file tree
Hide file tree
Showing 14 changed files with 75 additions and 107 deletions.
18 changes: 7 additions & 11 deletions RecoEgamma/EgammaTools/plugins/CalibratedElectronProducers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ namespace {

template <typename T>
CalibratedElectronProducerT<T>::CalibratedElectronProducerT(const edm::ParameterSet& conf)
: electronToken_(consumes<edm::View<T>>(conf.getParameter<edm::InputTag>("src"))),
epCombinationTool_{conf.getParameter<edm::ParameterSet>("epCombConfig"), consumesCollector()},
: electronToken_(consumes(conf.getParameter<edm::InputTag>("src"))),
epCombinationTool_{conf.getParameterSet("epCombConfig"), consumesCollector()},
energyCorrector_(epCombinationTool_, conf.getParameter<std::string>("correctionFile")),
recHitCollectionEBToken_(consumes<EcalRecHitCollection>(conf.getParameter<edm::InputTag>("recHitCollectionEB"))),
recHitCollectionEEToken_(consumes<EcalRecHitCollection>(conf.getParameter<edm::InputTag>("recHitCollectionEE"))),
recHitCollectionEBToken_(consumes(conf.getParameter<edm::InputTag>("recHitCollectionEB"))),
recHitCollectionEEToken_(consumes(conf.getParameter<edm::InputTag>("recHitCollectionEE"))),
produceCalibratedObjs_(conf.getParameter<bool>("produceCalibratedObjs")) {
energyCorrector_.setMinEt(conf.getParameter<double>("minEtToCalibrate"));

Expand Down Expand Up @@ -132,14 +132,10 @@ template <typename T>
void CalibratedElectronProducerT<T>::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
epCombinationTool_.setEventContent(iSetup);

edm::Handle<edm::View<T>> inHandle;
iEvent.getByToken(electronToken_, inHandle);
auto inHandle = iEvent.getHandle(electronToken_);

edm::Handle<EcalRecHitCollection> recHitCollectionEBHandle;
edm::Handle<EcalRecHitCollection> recHitCollectionEEHandle;

iEvent.getByToken(recHitCollectionEBToken_, recHitCollectionEBHandle);
iEvent.getByToken(recHitCollectionEEToken_, recHitCollectionEEHandle);
auto recHitCollectionEBHandle = iEvent.getHandle(recHitCollectionEBToken_);
auto recHitCollectionEEHandle = iEvent.getHandle(recHitCollectionEEToken_);

std::unique_ptr<std::vector<T>> out = std::make_unique<std::vector<T>>();

Expand Down
16 changes: 6 additions & 10 deletions RecoEgamma/EgammaTools/plugins/CalibratedPhotonProducers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ namespace {

template <typename T>
CalibratedPhotonProducerT<T>::CalibratedPhotonProducerT(const edm::ParameterSet& conf)
: photonToken_(consumes<edm::View<T>>(conf.getParameter<edm::InputTag>("src"))),
: photonToken_(consumes(conf.getParameter<edm::InputTag>("src"))),
energyCorrector_(conf.getParameter<std::string>("correctionFile")),
recHitCollectionEBToken_(consumes<EcalRecHitCollection>(conf.getParameter<edm::InputTag>("recHitCollectionEB"))),
recHitCollectionEEToken_(consumes<EcalRecHitCollection>(conf.getParameter<edm::InputTag>("recHitCollectionEE"))),
recHitCollectionEBToken_(consumes(conf.getParameter<edm::InputTag>("recHitCollectionEB"))),
recHitCollectionEEToken_(consumes(conf.getParameter<edm::InputTag>("recHitCollectionEE"))),
produceCalibratedObjs_(conf.getParameter<bool>("produceCalibratedObjs")) {
energyCorrector_.setMinEt(conf.getParameter<double>("minEtToCalibrate"));

Expand Down Expand Up @@ -119,14 +119,10 @@ void CalibratedPhotonProducerT<T>::fillDescriptions(edm::ConfigurationDescriptio

template <typename T>
void CalibratedPhotonProducerT<T>::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
edm::Handle<edm::View<T>> inHandle;
iEvent.getByToken(photonToken_, inHandle);
auto inHandle = iEvent.getHandle(photonToken_);

edm::Handle<EcalRecHitCollection> recHitCollectionEBHandle;
edm::Handle<EcalRecHitCollection> recHitCollectionEEHandle;

iEvent.getByToken(recHitCollectionEBToken_, recHitCollectionEBHandle);
iEvent.getByToken(recHitCollectionEEToken_, recHitCollectionEEHandle);
auto recHitCollectionEBHandle = iEvent.getHandle(recHitCollectionEBToken_);
auto recHitCollectionEEHandle = iEvent.getHandle(recHitCollectionEEToken_);

std::unique_ptr<std::vector<T>> out = std::make_unique<std::vector<T>>();

Expand Down
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaTools/plugins/EG9X105XObjectUpdateModifier.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<T>(conf.getParameter<edm::InputTag>(name))) {}
: token_(cc.consumes(conf.getParameter<edm::InputTag>(name))) {}
void setHandle(const edm::Event& iEvent) { iEvent.getByToken(token_, handle_); }
const edm::Handle<T>& handle() const { return handle_; }

Expand Down
4 changes: 2 additions & 2 deletions RecoEgamma/EgammaTools/plugins/EGEnergyAnalyzer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ class EGEnergyAnalyzer : public edm::one::EDAnalyzer<> {

EGEnergyAnalyzer::EGEnergyAnalyzer(const edm::ParameterSet& iConfig)
: ecalClusterToolsESGetTokens_{consumesCollector()} {
ebRHToken_ = consumes<EcalRecHitCollection>(edm::InputTag("reducedEcalRecHitsEB"));
eeRHToken_ = consumes<EcalRecHitCollection>(edm::InputTag("reducedEcalRecHitsEE"));
ebRHToken_ = consumes(edm::InputTag("reducedEcalRecHitsEB"));
eeRHToken_ = consumes(edm::InputTag("reducedEcalRecHitsEE"));
}

EGEnergyAnalyzer::~EGEnergyAnalyzer() {
Expand Down
4 changes: 2 additions & 2 deletions RecoEgamma/EgammaTools/plugins/EGEtScaleSysModifier.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ class EGEtScaleSysModifier : public ModifyObjectValueBase {
};

EGEtScaleSysModifier::EGEtScaleSysModifier(const edm::ParameterSet& conf, edm::ConsumesCollector& cc)
: ModifyObjectValueBase(conf), epCombTool_{conf.getParameter<edm::ParameterSet>("epCombConfig"), std::move(cc)} {
const edm::ParameterSet funcPSet = conf.getParameter<edm::ParameterSet>("uncertFunc");
: ModifyObjectValueBase(conf), epCombTool_{conf.getParameterSet("epCombConfig"), std::move(cc)} {
const edm::ParameterSet& funcPSet = conf.getParameterSet("uncertFunc");
const std::string& funcName = funcPSet.getParameter<std::string>("name");
if (funcName == "UncertFuncV1") {
uncertFunc_ = std::make_unique<UncertFuncV1>(funcPSet);
Expand Down
12 changes: 5 additions & 7 deletions RecoEgamma/EgammaTools/plugins/EGFull5x5ShowerShapeModifier.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace {
template <typename T, typename U, typename V>
inline void make_consumes(const T& tag, edm::EDGetTokenT<U>& tok, V& sume) {
if (!(empty_tag == tag))
tok = sume.template consumes<U>(tag);
tok = sume.template consumes(tag);
}
} // namespace

Expand Down Expand Up @@ -76,7 +76,7 @@ EGFull5x5ShowerShapeModifierFromValueMaps::EGFull5x5ShowerShapeModifierFromValue
edm::ConsumesCollector& cc)
: ModifyObjectValueBase(conf) {
if (conf.exists("electron_config")) {
const edm::ParameterSet& electrons = conf.getParameter<edm::ParameterSet>("electron_config");
auto const& electrons = conf.getParameterSet("electron_config");
if (electrons.exists("electronSrc"))
make_consumes(electrons.getParameter<edm::InputTag>("electronSrc"), e_conf.tok_electron_src, cc);
if (electrons.exists("sigmaEtaEta"))
Expand All @@ -103,7 +103,7 @@ EGFull5x5ShowerShapeModifierFromValueMaps::EGFull5x5ShowerShapeModifierFromValue
make_consumes(electrons.getParameter<edm::InputTag>("hcalDepth2OverEcalBc"), e_conf.tok_hcalDepth2OverEcalBc, cc);
}
if (conf.exists("photon_config")) {
const edm::ParameterSet& photons = conf.getParameter<edm::ParameterSet>("photon_config");
auto const& photons = conf.getParameterSet("photon_config");
if (photons.exists("photonSrc"))
make_consumes(photons.getParameter<edm::InputTag>("photonSrc"), ph_conf.tok_photon_src, cc);
if (photons.exists("sigmaEtaEta"))
Expand Down Expand Up @@ -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<edm::View<pat::Electron>> 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());
Expand All @@ -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<edm::View<pat::Photon>> 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());
Expand Down
57 changes: 22 additions & 35 deletions RecoEgamma/EgammaTools/plugins/EGRegressionModifierV1.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ class EGRegressionModifierV1 : public ModifyObjectValueBase {
EGRegressionModifierCondTokens eleCond25nsTokens_;
EGRegressionModifierCondTokens phoCond25nsTokens_;

std::string condNamesWeight50ns_;
std::string condNamesWeight25ns_;
edm::ESGetToken<GBRForest, GBRWrapperRcd> condNamesWeight50nsToken_;
edm::ESGetToken<GBRForest, GBRWrapperRcd> condNamesWeight25nsToken_;

const bool autoDetectBunchSpacing_;
int bunchspacing_;
Expand All @@ -45,8 +45,8 @@ class EGRegressionModifierV1 : public ModifyObjectValueBase {
edm::EDGetTokenT<double> rhoToken_;
int nVtx_;
edm::EDGetTokenT<reco::VertexCollection> vtxToken_;
edm::Handle<reco::VertexCollection> vtxH_;
edm::ESHandle<CaloGeometry> caloGeomH_;
edm::ESGetToken<CaloGeometry, CaloGeometryRecord> caloGeomToken_;
CaloGeometry const* caloGeom_;
const bool applyExtraHighEnergyProtection_;

std::vector<const GBRForestD*> phoForestsMean_;
Expand All @@ -60,44 +60,34 @@ DEFINE_EDM_PLUGIN(ModifyObjectValueFactory, EGRegressionModifierV1, "EGRegressio

EGRegressionModifierV1::EGRegressionModifierV1(const edm::ParameterSet& conf, edm::ConsumesCollector& cc)
: ModifyObjectValueBase(conf),
eleCond50nsTokens_{
conf.getParameter<edm::ParameterSet>("electron_config"), "regressionKey_50ns", "uncertaintyKey_50ns", cc},
phoCond50nsTokens_{
conf.getParameter<edm::ParameterSet>("photon_config"), "regressionKey_50ns", "uncertaintyKey_50ns", cc},
eleCond25nsTokens_{
conf.getParameter<edm::ParameterSet>("electron_config"), "regressionKey_25ns", "uncertaintyKey_25ns", cc},
phoCond25nsTokens_{
conf.getParameter<edm::ParameterSet>("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<bool>("autoDetectBunchSpacing")),
bunchspacing_(autoDetectBunchSpacing_ ? 450 : conf.getParameter<int>("manualBunchSpacing")),
rhoToken_(cc.consumes<double>(conf.getParameter<edm::InputTag>("rhoCollection"))),
vtxToken_(cc.consumes<reco::VertexCollection>(conf.getParameter<edm::InputTag>("vertexCollection"))),
rhoToken_(cc.consumes(conf.getParameter<edm::InputTag>("rhoCollection"))),
vtxToken_(cc.consumes(conf.getParameter<edm::InputTag>("vertexCollection"))),
caloGeomToken_{cc.esConsumes()},
applyExtraHighEnergyProtection_(conf.getParameter<bool>("applyExtraHighEnergyProtection")) {
if (autoDetectBunchSpacing_)
bunchSpacingToken_ = cc.consumes<unsigned int>(conf.getParameter<edm::InputTag>("bunchSpacingTag"));
bunchSpacingToken_ = cc.consumes(conf.getParameter<edm::InputTag>("bunchSpacingTag"));

auto const& electrons = conf.getParameter<edm::ParameterSet>("electron_config");
condNamesWeight50ns_ = electrons.getParameter<std::string>("combinationKey_50ns");
condNamesWeight25ns_ = electrons.getParameter<std::string>("combinationKey_25ns");
auto const& electrons = conf.getParameterSet("electron_config");
condNamesWeight50nsToken_ = cc.esConsumes(electrons.getParameter<edm::ESInputTag>("combinationKey_50ns"));
condNamesWeight25nsToken_ = cc.esConsumes(electrons.getParameter<edm::ESInputTag>("combinationKey_25ns"));
}

void EGRegressionModifierV1::setEvent(const edm::Event& evt) {
if (autoDetectBunchSpacing_) {
edm::Handle<unsigned int> bunchSpacingH;
evt.getByToken(bunchSpacingToken_, bunchSpacingH);
bunchspacing_ = *bunchSpacingH;
bunchspacing_ = evt.get(bunchSpacingToken_);
}

edm::Handle<double> 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<CaloGeometryRecord>().get(caloGeomH_);
caloGeom_ = &evs.getData(caloGeomToken_);

phoForestsMean_ = retrieveGBRForests(evs, (bunchspacing_ == 25) ? phoCond25nsTokens_.mean : phoCond50nsTokens_.mean);
phoForestsSigma_ =
Expand All @@ -107,10 +97,7 @@ void EGRegressionModifierV1::setEventContent(const edm::EventSetup& evs) {
eleForestsSigma_ =
retrieveGBRForests(evs, (bunchspacing_ == 25) ? eleCond25nsTokens_.sigma : eleCond50nsTokens_.sigma);

edm::ESHandle<GBRForest> forestEH;
const std::string ep_condnames_weight = (bunchspacing_ == 25) ? condNamesWeight25ns_ : condNamesWeight50ns_;
evs.get<GBRWrapperRcd>().get(ep_condnames_weight, forestEH);
epForest_ = forestEH.product();
epForest_ = &evs.getData((bunchspacing_ == 25) ? condNamesWeight25nsToken_ : condNamesWeight50nsToken_);
}

void EGRegressionModifierV1::modifyObject(reco::GsfElectron& ele) const {
Expand Down Expand Up @@ -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;
Expand Down
20 changes: 9 additions & 11 deletions RecoEgamma/EgammaTools/plugins/EGRegressionModifierV2.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ class EGRegressionModifierV2 : public ModifyObjectValueBase {
EGRegressionModifierCondTokens phoCondTokens_;

float rhoValue_;
edm::EDGetTokenT<double> rhoToken_;
edm::ESHandle<CaloGeometry> caloGeometry_;
const edm::EDGetTokenT<double> rhoToken_;
const edm::ESGetToken<CaloGeometry, CaloGeometryRecord> caloGeometryToken_;
CaloGeometry const* caloGeometry_ = nullptr;

std::vector<const GBRForestD*> phoForestsMean_;
std::vector<const GBRForestD*> phoForestsSigma_;
Expand All @@ -53,10 +54,11 @@ DEFINE_EDM_PLUGIN(ModifyObjectValueFactory, EGRegressionModifierV2, "EGRegressio

EGRegressionModifierV2::EGRegressionModifierV2(const edm::ParameterSet& conf, edm::ConsumesCollector& cc)
: ModifyObjectValueBase(conf),
eleCondTokens_{conf.getParameter<edm::ParameterSet>("electron_config"), "regressionKey", "uncertaintyKey", cc},
phoCondTokens_{conf.getParameter<edm::ParameterSet>("photon_config"), "regressionKey", "uncertaintyKey", cc},
eleCondTokens_{conf.getParameterSet("electron_config"), "regressionKey", "uncertaintyKey", cc},
phoCondTokens_{conf.getParameterSet("photon_config"), "regressionKey", "uncertaintyKey", cc},

rhoToken_(cc.consumes<double>(conf.getParameter<edm::InputTag>("rhoCollection"))),
rhoToken_(cc.consumes(conf.getParameter<edm::InputTag>("rhoCollection"))),
caloGeometryToken_(cc.esConsumes()),
lowEnergyEcalOnlyThr_(conf.getParameter<double>("lowEnergy_ECALonlyThr")),
lowEnergyEcalTrackThr_(conf.getParameter<double>("lowEnergy_ECALTRKThr")),
highEnergyEcalTrackThr_(conf.getParameter<double>("highEnergy_ECALTRKThr")),
Expand All @@ -73,11 +75,7 @@ EGRegressionModifierV2::EGRegressionModifierV2(const edm::ParameterSet& conf, ed
phoForestsSigma_.reserve(ncor);
}

void EGRegressionModifierV2::setEvent(const edm::Event& evt) {
edm::Handle<double> 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);
Expand All @@ -86,7 +84,7 @@ void EGRegressionModifierV2::setEventContent(const edm::EventSetup& evs) {
eleForestsMean_ = retrieveGBRForests(evs, eleCondTokens_.mean);
eleForestsSigma_ = retrieveGBRForests(evs, eleCondTokens_.sigma);

evs.get<CaloGeometryRecord>().get(caloGeometry_);
caloGeometry_ = &evs.getData(caloGeometryToken_);
}

void EGRegressionModifierV2::modifyObject(reco::GsfElectron& ele) const {
Expand Down
22 changes: 9 additions & 13 deletions RecoEgamma/EgammaTools/plugins/EGRegressionModifierV3.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<double>(conf.getParameter<edm::InputTag>("rhoTag"))),
rhoToken_(cc.consumes(conf.getParameter<edm::InputTag>("rhoTag"))),
useClosestToCentreSeedCrysDef_(conf.getParameter<bool>("useClosestToCentreSeedCrysDef")),
maxRawEnergyForLowPtEBSigma_(conf.getParameter<double>("maxRawEnergyForLowPtEBSigma")),
maxRawEnergyForLowPtEESigma_(conf.getParameter<double>("maxRawEnergyForLowPtEESigma")) {
if (conf.exists("eleRegs")) {
eleRegs_ = std::make_unique<EleRegs>(conf.getParameter<edm::ParameterSet>("eleRegs"), cc);
eleRegs_ = std::make_unique<EleRegs>(conf.getParameterSet("eleRegs"), cc);
}
if (conf.exists("phoRegs")) {
phoRegs_ = std::make_unique<PhoRegs>(conf.getParameter<edm::ParameterSet>("phoRegs"), cc);
phoRegs_ = std::make_unique<PhoRegs>(conf.getParameterSet("phoRegs"), cc);
}
}

EGRegressionModifierV3::~EGRegressionModifierV3() {}

void EGRegressionModifierV3::setEvent(const edm::Event& evt) {
edm::Handle<double> 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_)
Expand Down Expand Up @@ -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<edm::ParameterSet>("ecalOnlyMean"), cc),
ecalOnlySigma(iConfig.getParameter<edm::ParameterSet>("ecalOnlySigma"), cc),
epComb(iConfig.getParameter<edm::ParameterSet>("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);
Expand All @@ -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<edm::ParameterSet>("ecalOnlyMean"), cc),
ecalOnlySigma(iConfig.getParameter<edm::ParameterSet>("ecalOnlySigma"), cc) {}
: ecalOnlyMean(iConfig.getParameterSet("ecalOnlyMean"), cc),
ecalOnlySigma(iConfig.getParameterSet("ecalOnlySigma"), cc) {}

void EGRegressionModifierV3::PhoRegs::setEventContent(const edm::EventSetup& iSetup) {
ecalOnlyMean.setEventContent(iSetup);
Expand Down

0 comments on commit 6558221

Please sign in to comment.