Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove redundant unique_ptr constructor calls from Reco #27194

Merged
merged 14 commits into from Jun 27, 2019
Merged

Remove redundant unique_ptr constructor calls from Reco #27194

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f92a9db
Remove redundant unique_ptr constructor calls from RecoEcal
makortel Jun 5, 2019
94d207d
Remove redundant unique_ptr constructor calls from RecoEgamma
makortel Jun 5, 2019
731eefa
Remove redundant unique_ptr constructor calls from RecoHGCal
makortel Jun 5, 2019
6392cb7
Remove redundant unique_ptr constructor calls from RecoHI
makortel Jun 5, 2019
4a8a7a1
Remove redundant unique_ptr constructor calls from RecoLocalCalo
makortel Jun 5, 2019
b1ca071
Remove redundant unique_ptr constructor calls from RecoLocalFastTime
makortel Jun 5, 2019
19fa5d1
Remove redundant unique_ptr constructor calls from RecoLocalMuon
makortel Jun 5, 2019
d15c240
Remove redundant unique_ptr constructor calls from RecoMuon
makortel Jun 11, 2019
4fd510f
Remove redundant unique_ptr constructor calls from RecoParticleFlow
makortel Jun 11, 2019
795712e
Remove redundant unique_ptr constructor calls from RecoPixelVertexing
makortel Jun 11, 2019
67c9759
Remove redundant unique_ptr constructor calls from RecoTauTag
makortel Jun 11, 2019
c44598e
Remove redundant unique_ptr constructor calls from RecoTracker
makortel Jun 11, 2019
3f04b29
Remove redundant unique_ptr constructor calls from TrackingTools
makortel Jun 11, 2019
1e8945a
Code format
makortel Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
217 changes: 109 additions & 108 deletions RecoEgamma/EgammaElectronProducers/plugins/GEDGsfElectronFinalizer.cc
View file
Open in desktop
Expand Up @@ -14,115 +14,116 @@

using namespace reco;

GEDGsfElectronFinalizer::GEDGsfElectronFinalizer( const edm::ParameterSet & cfg )
{
previousGsfElectrons_ = consumes<reco::GsfElectronCollection>(cfg.getParameter<edm::InputTag>("previousGsfElectronsTag"));
pfCandidates_ = consumes<reco::PFCandidateCollection>(cfg.getParameter<edm::InputTag>("pfCandidatesTag"));
outputCollectionLabel_ = cfg.getParameter<std::string>("outputCollectionLabel");
edm::ParameterSet pfIsoVals(cfg.getParameter<edm::ParameterSet> ("pfIsolationValues"));

tokenElectronIsoVals_.push_back(consumes<edm::ValueMap<float> >(pfIsoVals.getParameter<edm::InputTag>("pfSumChargedHadronPt")));
tokenElectronIsoVals_.push_back(consumes<edm::ValueMap<float> >(pfIsoVals.getParameter<edm::InputTag>("pfSumPhotonEt")));
tokenElectronIsoVals_.push_back(consumes<edm::ValueMap<float> >(pfIsoVals.getParameter<edm::InputTag>("pfSumNeutralHadronEt")));
tokenElectronIsoVals_.push_back(consumes<edm::ValueMap<float> >(pfIsoVals.getParameter<edm::InputTag>("pfSumPUPt")));
tokenElectronIsoVals_.push_back(consumes<edm::ValueMap<float> >(pfIsoVals.getParameter<edm::InputTag>("pfSumEcalClusterEt")));
tokenElectronIsoVals_.push_back(consumes<edm::ValueMap<float> >(pfIsoVals.getParameter<edm::InputTag>("pfSumHcalClusterEt")));

nDeps_ = tokenElectronIsoVals_.size();

if( cfg.existsAs<edm::ParameterSet>("regressionConfig") ) {
const edm::ParameterSet& iconf = cfg.getParameterSet("regressionConfig");
const std::string& mname = iconf.getParameter<std::string>("modifierName");
auto cc = consumesCollector();
gedRegression_ = ModifyObjectValueFactory::get()->create(mname,iconf,cc);
}

produces<reco::GsfElectronCollection> (outputCollectionLabel_);
GEDGsfElectronFinalizer::GEDGsfElectronFinalizer(const edm::ParameterSet& cfg) {
previousGsfElectrons_ =
consumes<reco::GsfElectronCollection>(cfg.getParameter<edm::InputTag>("previousGsfElectronsTag"));
pfCandidates_ = consumes<reco::PFCandidateCollection>(cfg.getParameter<edm::InputTag>("pfCandidatesTag"));
outputCollectionLabel_ = cfg.getParameter<std::string>("outputCollectionLabel");
edm::ParameterSet pfIsoVals(cfg.getParameter<edm::ParameterSet>("pfIsolationValues"));

tokenElectronIsoVals_.push_back(
consumes<edm::ValueMap<float> >(pfIsoVals.getParameter<edm::InputTag>("pfSumChargedHadronPt")));
tokenElectronIsoVals_.push_back(
consumes<edm::ValueMap<float> >(pfIsoVals.getParameter<edm::InputTag>("pfSumPhotonEt")));
tokenElectronIsoVals_.push_back(
consumes<edm::ValueMap<float> >(pfIsoVals.getParameter<edm::InputTag>("pfSumNeutralHadronEt")));
tokenElectronIsoVals_.push_back(consumes<edm::ValueMap<float> >(pfIsoVals.getParameter<edm::InputTag>("pfSumPUPt")));
tokenElectronIsoVals_.push_back(
consumes<edm::ValueMap<float> >(pfIsoVals.getParameter<edm::InputTag>("pfSumEcalClusterEt")));
tokenElectronIsoVals_.push_back(
consumes<edm::ValueMap<float> >(pfIsoVals.getParameter<edm::InputTag>("pfSumHcalClusterEt")));

nDeps_ = tokenElectronIsoVals_.size();

if (cfg.existsAs<edm::ParameterSet>("regressionConfig")) {
const edm::ParameterSet& iconf = cfg.getParameterSet("regressionConfig");
const std::string& mname = iconf.getParameter<std::string>("modifierName");
auto cc = consumesCollector();
gedRegression_ = ModifyObjectValueFactory::get()->create(mname, iconf, cc);
}

produces<reco::GsfElectronCollection>(outputCollectionLabel_);
}

GEDGsfElectronFinalizer::~GEDGsfElectronFinalizer()
{}
GEDGsfElectronFinalizer::~GEDGsfElectronFinalizer() {}

// ------------ method called to produce the data ------------
void GEDGsfElectronFinalizer::produce( edm::Event & event, const edm::EventSetup & setup )
{

// Output collection
auto outputElectrons_p = std::make_unique<reco::GsfElectronCollection>();

if( gedRegression_ ) {
gedRegression_->setEvent(event);
gedRegression_->setEventContent(setup);
}

// read input collections
// electrons
edm::Handle<reco::GsfElectronCollection> gedElectronHandle;
event.getByToken(previousGsfElectrons_,gedElectronHandle);

// PFCandidates
edm::Handle<reco::PFCandidateCollection> pfCandidateHandle;
event.getByToken(pfCandidates_,pfCandidateHandle);
// value maps
std::vector< edm::Handle< edm::ValueMap<float> > > isolationValueMaps(nDeps_);

for(unsigned i=0; i < nDeps_ ; ++i) {
event.getByToken(tokenElectronIsoVals_[i],isolationValueMaps[i]);
}

// prepare a map of PFCandidates having a valid GsfTrackRef to save time
std::map<reco::GsfTrackRef, const reco::PFCandidate* > gsfPFMap;
reco::PFCandidateCollection::const_iterator it = pfCandidateHandle->begin();
reco::PFCandidateCollection::const_iterator itend = pfCandidateHandle->end() ;
for(;it!=itend;++it) {
// First check that the GsfTrack is non null
if( it->gsfTrackRef().isNonnull()) {
if(abs(it->pdgId())==11) // consider only the electrons
gsfPFMap[it->gsfTrackRef()]=&(*it);
}
}


// Now loop on the electrons
unsigned nele=gedElectronHandle->size();
for(unsigned iele=0; iele<nele;++iele) {
reco::GsfElectronRef myElectronRef(gedElectronHandle,iele);

reco::GsfElectron newElectron(*myElectronRef);
reco::GsfElectron::PflowIsolationVariables isoVariables;
isoVariables.sumChargedHadronPt = (*(isolationValueMaps)[0])[myElectronRef];
isoVariables.sumPhotonEt = (*(isolationValueMaps)[1])[myElectronRef];
isoVariables.sumNeutralHadronEt = (*(isolationValueMaps)[2])[myElectronRef];
isoVariables.sumPUPt = (*(isolationValueMaps)[3])[myElectronRef];
isoVariables.sumEcalClusterEt = (*(isolationValueMaps)[4])[myElectronRef];
isoVariables.sumHcalClusterEt = (*(isolationValueMaps)[5])[myElectronRef];

newElectron.setPfIsolationVariables(isoVariables);

// now set a status if not already done (in GEDGsfElectronProducer.cc)
// std::cout << " previous status " << newElectron.mvaOutput().status << std::endl;
if(newElectron.mvaOutput().status<=0) {
std::map<reco::GsfTrackRef, const reco::PFCandidate * >::const_iterator itcheck=gsfPFMap.find(newElectron.gsfTrack());
reco::GsfElectron::MvaOutput myMvaOutput(newElectron.mvaOutput());
if(itcheck!=gsfPFMap.end()) {
// it means that there is a PFCandidate with the same GsfTrack
myMvaOutput.status = 3; //as defined in PFCandidateEGammaExtra.h
newElectron.setPassPflowPreselection(true); //this is currently fully redundant with mvaOutput.stats so candidate for removal
}
else{
myMvaOutput.status = 4 ; //
newElectron.setPassPflowPreselection(false);//this is currently fully redundant with mvaOutput.stats so candidate for removal
}
newElectron.setMvaOutput(myMvaOutput);
}

if( gedRegression_ ) {
gedRegression_->modifyObject(newElectron);
}
outputElectrons_p->push_back(newElectron);
}

event.put(std::move(outputElectrons_p),outputCollectionLabel_);
}


void GEDGsfElectronFinalizer::produce(edm::Event& event, const edm::EventSetup& setup) {
// Output collection
auto outputElectrons_p = std::make_unique<reco::GsfElectronCollection>();

if (gedRegression_) {
gedRegression_->setEvent(event);
gedRegression_->setEventContent(setup);
}

// read input collections
// electrons
edm::Handle<reco::GsfElectronCollection> gedElectronHandle;
event.getByToken(previousGsfElectrons_, gedElectronHandle);

// PFCandidates
edm::Handle<reco::PFCandidateCollection> pfCandidateHandle;
event.getByToken(pfCandidates_, pfCandidateHandle);
// value maps
std::vector<edm::Handle<edm::ValueMap<float> > > isolationValueMaps(nDeps_);

for (unsigned i = 0; i < nDeps_; ++i) {
event.getByToken(tokenElectronIsoVals_[i], isolationValueMaps[i]);
}

// prepare a map of PFCandidates having a valid GsfTrackRef to save time
std::map<reco::GsfTrackRef, const reco::PFCandidate*> gsfPFMap;
reco::PFCandidateCollection::const_iterator it = pfCandidateHandle->begin();
reco::PFCandidateCollection::const_iterator itend = pfCandidateHandle->end();
for (; it != itend; ++it) {
// First check that the GsfTrack is non null
if (it->gsfTrackRef().isNonnull()) {
if (abs(it->pdgId()) == 11) // consider only the electrons
gsfPFMap[it->gsfTrackRef()] = &(*it);
}
}

// Now loop on the electrons
unsigned nele = gedElectronHandle->size();
for (unsigned iele = 0; iele < nele; ++iele) {
reco::GsfElectronRef myElectronRef(gedElectronHandle, iele);

reco::GsfElectron newElectron(*myElectronRef);
reco::GsfElectron::PflowIsolationVariables isoVariables;
isoVariables.sumChargedHadronPt = (*(isolationValueMaps)[0])[myElectronRef];
isoVariables.sumPhotonEt = (*(isolationValueMaps)[1])[myElectronRef];
isoVariables.sumNeutralHadronEt = (*(isolationValueMaps)[2])[myElectronRef];
isoVariables.sumPUPt = (*(isolationValueMaps)[3])[myElectronRef];
isoVariables.sumEcalClusterEt = (*(isolationValueMaps)[4])[myElectronRef];
isoVariables.sumHcalClusterEt = (*(isolationValueMaps)[5])[myElectronRef];

newElectron.setPfIsolationVariables(isoVariables);

// now set a status if not already done (in GEDGsfElectronProducer.cc)
// std::cout << " previous status " << newElectron.mvaOutput().status << std::endl;
if (newElectron.mvaOutput().status <= 0) {
std::map<reco::GsfTrackRef, const reco::PFCandidate*>::const_iterator itcheck =
gsfPFMap.find(newElectron.gsfTrack());
reco::GsfElectron::MvaOutput myMvaOutput(newElectron.mvaOutput());
if (itcheck != gsfPFMap.end()) {
// it means that there is a PFCandidate with the same GsfTrack
myMvaOutput.status = 3; //as defined in PFCandidateEGammaExtra.h
newElectron.setPassPflowPreselection(
true); //this is currently fully redundant with mvaOutput.stats so candidate for removal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line break issue (it can be solved in a follow-up patch, as usual)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fabiocos I can take care of these after this PR has been merged.

} else {
myMvaOutput.status = 4; //
newElectron.setPassPflowPreselection(
false); //this is currently fully redundant with mvaOutput.stats so candidate for removal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line break issue (it can be solved in a follow-up patch, as usual)

}
newElectron.setMvaOutput(myMvaOutput);
}

if (gedRegression_) {
gedRegression_->modifyObject(newElectron);
}
outputElectrons_p->push_back(newElectron);
}

event.put(std::move(outputElectrons_p), outputCollectionLabel_);
}