Izisopou patch miniaod #29
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,11 +25,11 @@ JetResponseAnalyzer::JetResponseAnalyzer(const edm::ParameterSet& iConfig) | |
| , srcRhoHLT_ (consumes<double>(iConfig.getParameter<edm::InputTag> ("srcRhoHLT"))) | ||
| , srcVtx_ (consumes<reco::VertexCollection>(iConfig.getParameter<edm::InputTag> ("srcVtx"))) | ||
| , srcGenInfo_ (consumes<GenEventInfoProduct>(edm::InputTag("generator")) ) | ||
| , srcPileupInfo_ (consumes<vector<PileupSummaryInfo> >(edm::InputTag("slimmedAddPileupInfo")) ) | ||
| //, srcPFCandidates_ (consumes<vector<reco::PFCandidate> >(iConfig.getParameter<edm::InputTag>("srcPFCandidates"))) | ||
| , srcPFCandidates_ (consumes<PFCandidateView>(iConfig.getParameter<edm::InputTag>("srcPFCandidates"))) | ||
| , srcPFCandidatesAsFwdPtr_(consumes<std::vector<edm::FwdPtr<reco::PFCandidate> > >(iConfig.getParameter<edm::InputTag>("srcPFCandidates"))) | ||
| , srcGenParticles_ (consumes<vector<pat::PackedGenParticle> >(iConfig.getParameter<edm::InputTag>("srcGenParticles"))) | ||
| , jecLabel_ (iConfig.getParameter<std::string> ("jecLabel")) | ||
| , doComposition_ (iConfig.getParameter<bool> ("doComposition")) | ||
| , doFlavor_ (iConfig.getParameter<bool> ("doFlavor")) | ||
|
|
@@ -115,6 +115,50 @@ void JetResponseAnalyzer::beginJob() | |
| } | ||
|
|
||
|
|
||
|
|
||
|
||
|
|
||
|
|
||
|
|
||
| void getMult( vector<reco::CandidatePtr> const & particles, int* nMult, int* chMult ) { | ||
|
|
||
| vector<reco::CandidatePtr>::const_iterator itParticle; | ||
| for (itParticle=particles.begin();itParticle!=particles.end();++itParticle){ | ||
| const reco::Candidate* pfCand = itParticle->get(); | ||
|
|
||
| switch (std::abs(pfCand->pdgId())) { | ||
|
|
||
| case 211: //PFCandidate::h: // charged hadron | ||
|
Member
There was a problem hiding this comment. Don't use unnamed constants. Instead, you should define enums as in and use those as your cases.You also only really have two cases:
|
||
| (*chMult)++; | ||
| break; | ||
|
|
||
| case 130: //PFCandidate::h0 : // neutral hadron | ||
| (*nMult)++; | ||
| break; | ||
|
|
||
| case 22: //PFCandidate::gamma: // photon | ||
| (*nMult)++; | ||
| break; | ||
|
|
||
| case 11: // PFCandidate::e: // electron | ||
| (*chMult)++; | ||
| break; | ||
|
|
||
| case 13: //PFCandidate::mu: // muon | ||
| (*chMult)++; | ||
| break; | ||
|
|
||
| case 1: // PFCandidate::h_HF : // hadron in HF | ||
| (*nMult)++; | ||
| break; | ||
|
|
||
| case 2: //PFCandidate::egamma_HF : // electromagnetic in HF | ||
| (*nMult)++; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| //_______________ | ||
| //______________________________________________________________________________ | ||
| void JetResponseAnalyzer::analyze(const edm::Event& iEvent, | ||
| const edm::EventSetup& iSetup) | ||
|
|
@@ -134,7 +178,7 @@ void JetResponseAnalyzer::analyze(const edm::Event& iEvent, | |
| edm::Handle<reco::VertexCollection> vtx; | ||
| edm::Handle<PFCandidateView> pfCandidates; | ||
| edm::Handle<std::vector<edm::FwdPtr<reco::PFCandidate> > > pfCandidatesAsFwdPtr; | ||
| edm::Handle<vector<pat::PackedGenParticle> > genParticles; | ||
|
|
||
| // Jet CORRECTOR | ||
| jetCorrector_ = (jecLabel_.empty()) ? 0 : JetCorrector::getJetCorrector(jecLabel_,iSetup); | ||
|
|
@@ -189,8 +233,8 @@ void JetResponseAnalyzer::analyze(const edm::Event& iEvent, | |
| JRAEvt_->refpvz = -1000.0; | ||
| iEvent.getByToken(srcGenParticles_, genParticles); | ||
| for (size_t i = 0; i < genParticles->size(); ++i) { | ||
| const pat::PackedGenParticle & genIt = (*genParticles)[i]; | ||
| if ( genIt.fromHardProcessFinalState() ) { | ||
| JRAEvt_->refpvz = genIt.vz(); | ||
| break; | ||
| } | ||
|
|
@@ -257,18 +301,19 @@ void JetResponseAnalyzer::analyze(const edm::Event& iEvent, | |
| JRAEvt_->refdphijt->push_back(reco::deltaPhi(jet->phi(),ref->phi())); | ||
| else | ||
| JRAEvt_->refdrjt->push_back(reco::deltaR(jet->eta(),jet->phi(),ref->eta(),ref->phi())); | ||
|
|
||
| if ((!doBalancing_&&JRAEvt_->refdrjt->at(JRAEvt_->nref)>deltaRMax_)|| | ||
| (doBalancing_&&std::abs(JRAEvt_->refdphijt->at(JRAEvt_->nref))<deltaPhiMin_)) { | ||
| if(doBalancing_) JRAEvt_->refdphijt->pop_back(); | ||
| else JRAEvt_->refdrjt->pop_back(); | ||
| continue; | ||
| } | ||
| JRAEvt_->refpdgid->push_back(0); | ||
|
|
||
| if (getFlavorFromMap_) { | ||
| JRAEvt_->refpdgid_algorithmicDef->push_back(0); | ||
| JRAEvt_->refpdgid_physicsDef->push_back(0); | ||
|
|
||
| reco::JetMatchedPartonsCollection::const_iterator itPartonMatch; | ||
| itPartonMatch=refToPartonMap->begin(); | ||
| for (;itPartonMatch!=refToPartonMap->end();++itPartonMatch) { | ||
|
|
@@ -277,7 +322,7 @@ void JetResponseAnalyzer::analyze(const edm::Event& iEvent, | |
| const reco::Candidate* cand = &(*jetRef); | ||
| if (cand==&(*ref)) break; | ||
| } | ||
|
|
||
| if (itPartonMatch!=refToPartonMap->end()&& | ||
| itPartonMatch->second.algoDefinitionParton().get()!=0&& | ||
| itPartonMatch->second.physicsDefinitionParton().get()!=0) { | ||
|
|
@@ -315,10 +360,6 @@ void JetResponseAnalyzer::analyze(const edm::Event& iEvent, | |
| } | ||
| } | ||
| } | ||
| JRAEvt_->refpdgid->at(JRAEvt_->nref)=ref->pdgId(); | ||
|
|
||
| // Beta/Beta Star Calculation | ||
|
|
@@ -439,12 +480,21 @@ void JetResponseAnalyzer::analyze(const edm::Event& iEvent, | |
| JRAEvt_->jtmuf ->push_back(pfJetRef->muonEnergyFraction() *JRAEvt_->jtjec->at(JRAEvt_->nref)); | ||
| JRAEvt_->jthfhf->push_back(pfJetRef->HFHadronEnergyFraction() *JRAEvt_->jtjec->at(JRAEvt_->nref)); | ||
| JRAEvt_->jthfef->push_back(pfJetRef->HFEMEnergyFraction() *JRAEvt_->jtjec->at(JRAEvt_->nref)); | ||
| int chMult=0, nMult=0; | ||
|
||
| getMult( ref.castTo<reco::GenJetRef>()->getJetConstituents(), &nMult, &chMult ); | ||
| JRAEvt_->refnMult ->push_back( nMult ); | ||
| JRAEvt_->refchMult->push_back( chMult ); | ||
|
|
||
| //this method exists for pfjets (neutralMultiplicity()), but not for genjets | ||
| //original i thought since genjet didn't have it i should make this method | ||
| chMult=0; nMult=0; | ||
| getMult( jet.castTo<reco::PFJetRef>()->getJetConstituents(), &nMult, &chMult ); | ||
| JRAEvt_->jtnMult ->push_back( nMult ); | ||
| JRAEvt_->jtchMult->push_back( chMult ); | ||
| } | ||
| } | ||
| JRAEvt_->nref++; | ||
| } | ||
| // PFCANDIDATE INFORMATION | ||
| //Dual handle idea from https://github.com/aperloff/cmssw/blob/CMSSW_7_6_X/RecoJets/JetProducers/plugins/VirtualJetProducer.cc | ||
| //Random-Cone algo from https://github.com/cihar29/OffsetAnalysis/blob/master/run_offset.py | ||
|
|
@@ -483,10 +533,8 @@ void JetResponseAnalyzer::analyze(const edm::Event& iEvent, | |
| } | ||
| } | ||
| } | ||
| tree_->Fill(); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should remove code, specifically commented code, which is no longer needed. If you need to switch back an forth you should consider using an `edm::View``` and then casting to the correct base type.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, I removed the code that is no longer needed.