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

Run3-alca171 Add a new study of isolated particles with evenet generator o/p #31219

Merged
merged 3 commits into from Sep 1, 2020
Merged

Run3-alca171 Add a new study of isolated particles with evenet generator o/p #31219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cff0e2
Add a new study of isolated particles with evenet generator o/p
Aug 24, 2020
991c45b
Code check
Aug 24, 2020
65feb4a
Small change
Aug 24, 2020
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
3 changes: 3 additions & 0 deletions Calibration/IsolatedParticles/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -49,6 +49,9 @@
<library name="CalibrationElectronStudy" file="ElectronStudy.cc">
</library>

<library name="CalibrationStudyCaloGen" file="StudyCaloGen.cc">
</library>

<library name="CalibrationStudyCaloResponse" file="StudyCaloResponse.cc">
</library>

Expand Down
28 changes: 2 additions & 26 deletions Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc
View file
Open in desktop
Expand Up @@ -44,6 +44,7 @@
#include "DataFormats/L1Trigger/interface/L1MuonParticle.h"
#include "DataFormats/L1Trigger/interface/L1MuonParticleFwd.h"

#include "DataFormats/Math/interface/deltaPhi.h"
#include "DataFormats/Math/interface/LorentzVector.h"

#include "FWCore/Framework/interface/Frameworkfwd.h"
Expand Down Expand Up @@ -119,10 +120,6 @@ class IsolatedGenParticles : public edm::one::EDAnalyzer<edm::one::SharedResourc
void analyze(const edm::Event &, const edm::EventSetup &) override;
void endJob() override {}

double deltaPhi(double v1, double v2);
double deltaR(double eta1, double phi1, double eta2, double phi2);
double deltaR2(double eta1, double phi1, double eta2, double phi2);

void fillTrack(
GlobalPoint &posVec, math::XYZTLorentzVector &momVec, GlobalPoint &posECAL, int pdgId, bool okECAL, bool accpet);
void fillIsolatedTrack(math::XYZTLorentzVector &momVec, GlobalPoint &posECAL, int pdgId);
Expand Down Expand Up @@ -809,27 +806,6 @@ void IsolatedGenParticles::beginJob() {
bookHistograms();
}

double IsolatedGenParticles::deltaPhi(double v1, double v2) {
// Computes the correctly normalized phi difference
// v1, v2 = phi of object 1 and 2

double diff = std::abs(v2 - v1);
double corr = 2 * M_PI - diff;
return ((diff < M_PI) ? diff : corr);
}

double IsolatedGenParticles::deltaR(double eta1, double phi1, double eta2, double phi2) {
double deta = eta1 - eta2;
double dphi = deltaPhi(phi1, phi2);
return std::sqrt(deta * deta + dphi * dphi);
}

double IsolatedGenParticles::deltaR2(double eta1, double phi1, double eta2, double phi2) {
double deta = eta1 - eta2;
double dphi = deltaPhi(phi1, phi2);
return deta * deta + dphi * dphi;
}

void IsolatedGenParticles::fillTrack(
GlobalPoint &posVec, math::XYZTLorentzVector &momVec, GlobalPoint &posECAL, int pdgId, bool okECAL, bool accept) {
if (accept) {
Expand All @@ -841,7 +817,7 @@ void IsolatedGenParticles::fillTrack(
if (okECAL) {
double phi1 = momVec.phi();
double phi2 = (posECAL - posVec).phi();
double dphi = deltaPhi(phi1, phi2);
double dphi = reco::deltaPhi(phi1, phi2);
double deta = momVec.eta() - (posECAL - posVec).eta();
t_isoTrkDPhiAll->push_back(dphi);
t_isoTrkDEtaAll->push_back(deta);
Expand Down
20 changes: 2 additions & 18 deletions Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc
View file
Open in desktop
Expand Up @@ -61,6 +61,7 @@
#include "DataFormats/Common/interface/TriggerResults.h"
#include "DataFormats/HLTReco/interface/TriggerEvent.h"
#include "DataFormats/HLTReco/interface/TriggerTypeDefs.h"
#include "DataFormats/Math/interface/deltaPhi.h"

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
Expand Down Expand Up @@ -131,9 +132,6 @@ class IsolatedTracksCone : public edm::one::EDAnalyzer<edm::one::SharedResources
void buildTree();
void clearTrackVectors();

double deltaPhi(double v1, double v2);
double deltaR(double eta1, double phi1, double eta2, double phi2);

static constexpr int nEtaBins_ = 4;
static constexpr int nPBins_ = 21;
std::array<double, nPBins_ + 1> genPartPBins_;
Expand Down Expand Up @@ -724,7 +722,7 @@ void IsolatedTracksCone::analyze(const edm::Event& iEvent, const edm::EventSetup

double drFromLeadJet = 999.0;
if (useJetTrigger_) {
double dphi = deltaPhi(phi1, leadL1JetPhi);
double dphi = reco::deltaPhi(phi1, leadL1JetPhi);
double deta = eta1 - leadL1JetEta;
drFromLeadJet = sqrt(dphi * dphi + deta * deta);
}
Expand Down Expand Up @@ -1741,19 +1739,5 @@ void IsolatedTracksCone::printTrack(const reco::Track* pTrack) {
}
}

double IsolatedTracksCone::deltaPhi(double v1, double v2) {
// Computes the correctly normalized phi difference
// v1, v2 = phi of object 1 and 2
double diff = std::abs(v2 - v1);
double corr = 2.0 * M_PI - diff;
return ((diff < M_PI) ? diff : corr);
}

double IsolatedTracksCone::deltaR(double eta1, double phi1, double eta2, double phi2) {
double deta = eta1 - eta2;
double dphi = deltaPhi(phi1, phi2);
return std::sqrt(deta * deta + dphi * dphi);
}

//define this as a plug-in
DEFINE_FWK_MODULE(IsolatedTracksCone);
22 changes: 4 additions & 18 deletions Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc
View file
Open in desktop
Expand Up @@ -96,6 +96,9 @@
#include "DataFormats/JetReco/interface/CaloJetCollection.h"
#include "DataFormats/JetReco/interface/JetExtendedAssociation.h"

#include "DataFormats/Math/interface/deltaPhi.h"
#include "DataFormats/Math/interface/deltaR.h"

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
Expand Down Expand Up @@ -153,9 +156,6 @@ class IsolatedTracksNxN : public edm::one::EDAnalyzer<edm::one::SharedResources>

void bookHistograms();

double deltaPhi(double v1, double v2);
double deltaR(double eta1, double phi1, double eta2, double phi2);

void clearTreeVectors();

private:
Expand Down Expand Up @@ -1852,7 +1852,7 @@ void IsolatedTracksNxN::analyze(const edm::Event &iEvent, const edm::EventSetup
for (unsigned int ind = 0; ind < recVtxs->size(); ind++) {
if (!((*recVtxs)[ind].isFake())) {
reco::Vertex::trackRef_iterator vtxTrack = (*recVtxs)[ind].tracks_begin();
if (deltaR(eta1, phi1, (*vtxTrack)->eta(), (*vtxTrack)->phi()) < 0.01)
if (reco::deltaR(eta1, phi1, (*vtxTrack)->eta(), (*vtxTrack)->phi()) < 0.01)
t_trackPVIdx->push_back(ind);
else
t_trackPVIdx->push_back(-1);
Expand Down Expand Up @@ -2746,20 +2746,6 @@ void IsolatedTracksNxN::bookHistograms() {
tree_->Branch("t_nTracks", &t_nTracks, "t_nTracks/I");
}

double IsolatedTracksNxN::deltaPhi(double v1, double v2) {
// Computes the correctly normalized phi difference
// v1, v2 = phi of object 1 and 2
double diff = std::abs(v2 - v1);
double corr = 2 * M_PI - diff;
return ((diff < M_PI) ? diff : corr);
}

double IsolatedTracksNxN::deltaR(double eta1, double phi1, double eta2, double phi2) {
double deta = eta1 - eta2;
double dphi = deltaPhi(phi1, phi2);
return std::sqrt(deta * deta + dphi * dphi);
}

void IsolatedTracksNxN::printTrack(const reco::Track *pTrack) {
std::string theTrackQuality = "highPurity";
reco::TrackBase::TrackQuality trackQuality_ = reco::TrackBase::qualityByName(theTrackQuality);
Expand Down