Skip to content

Commit

Permalink
renamed HPSPFTauBuilder and HPSPFTauQualityCut as original
Browse files Browse the repository at this point in the history
  • Loading branch information
@sandeepbhowmik1
sandeepbhowmik1 committed May 3, 2021
1 parent 21829a0 commit 391723c
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 66 deletions.
15 changes: 10 additions & 5 deletions DataFormats/L1TParticleFlow/src/HPSPFTau.cc
View file
@@ -1,4 +1,5 @@
#include "DataFormats/L1TParticleFlow/interface/HPSPFTau.h"
#include "FWCore/Utilities/interface/Exception.h"

// default constructor
l1t::HPSPFTau::HPSPFTau()
Expand Down Expand Up @@ -34,20 +35,24 @@ ostream& operator<<(ostream& os, const l1t::HPSPFTau& l1PFTau) {
os << " chargedPFCand";
} else if (l1PFTau.isJetSeeded()) {
os << " PFJet";
} else
assert(0);
} else {
cms::Exception ex("InconsistentTau");
ex.addContext("Calling HPSPFTau::operator <<");
ex.addAdditionalInfo("This tau is not seed by either a chargedPFCand or a PFJet!");
throw ex;
}
os << std::endl;
os << "signalPFCands:" << std::endl;
for (auto l1PFCand : l1PFTau.signalAllL1PFCandidates()) {
for (const auto& l1PFCand : l1PFTau.signalAllL1PFCandidates()) {
printPFCand(os, *l1PFCand, l1PFTau.primaryVertex());
}
os << "stripPFCands:" << std::endl;
for (auto l1PFCand : l1PFTau.stripAllL1PFCandidates()) {
for (const auto& l1PFCand : l1PFTau.stripAllL1PFCandidates()) {
printPFCand(os, *l1PFCand, l1PFTau.primaryVertex());
}
os << "strip pT = " << l1PFTau.stripP4().pt() << std::endl;
os << "isolationPFCands:" << std::endl;
for (auto l1PFCand : l1PFTau.isoAllL1PFCandidates()) {
for (const auto& l1PFCand : l1PFTau.isoAllL1PFCandidates()) {
printPFCand(os, *l1PFCand, l1PFTau.primaryVertex());
}
os << "isolation pT-sum: charged = " << l1PFTau.sumChargedIso() << ", neutral = " << l1PFTau.sumNeutralIso()
Expand Down
6 changes: 4 additions & 2 deletions DataFormats/L1TParticleFlow/src/classes_def.xml
View file
Expand Up @@ -45,12 +45,14 @@
<class name="std::vector<edm::Ref<l1t::PFTauCollection> >" />

<class name="l1t::HPSPFTau" ClassVersion="12">
<version ClassVersion="12" checksum="1127525942"/>
<version ClassVersion="11" checksum="98678086"/>
<version ClassVersion="12" checksum="1127525942"/>
</class>
<class name="l1t::HPSPFTauCollection"/>
<class name="edm::Wrapper<l1t::HPSPFTauCollection>"/>
<class name="edm::Ref<l1t::HPSPFTauCollection>" />
<class name="edm::RefVector<l1t::HPSPFTauCollection>" />
<class name="edm::RefVector<l1t::HPSPFTauCollection>" />
<class name="std::vector<edm::Ref<l1t::HPSPFTauCollection> >" />

</lcgdict>

22 changes: 11 additions & 11 deletions .../Phase2L1Taus/interface/HPSPFTauBuilder.h → ...hase2L1Taus/interface/L1HPSPFTauBuilder.h
View file
@@ -1,20 +1,20 @@
#ifndef L1Trigger_Phase2L1Taus_HPSPFTauBuilder_h
#define L1Trigger_Phase2L1Taus_HPSPFTauBuilder_h
#ifndef L1Trigger_Phase2L1Taus_L1HPSPFTauBuilder_h
#define L1Trigger_Phase2L1Taus_L1HPSPFTauBuilder_h

#include "FWCore/ParameterSet/interface/ParameterSet.h" // edm::ParameterSet
#include "DataFormats/Provenance/interface/ProductID.h" // edm::ProductID
#include "L1Trigger/Phase2L1Taus/interface/HPSPFTauQualityCut.h" // HPSPFTauQualityCut
#include "L1Trigger/Phase2L1Taus/interface/L1HPSPFTauQualityCut.h" // L1HPSPFTauQualityCut
#include "DataFormats/L1TParticleFlow/interface/HPSPFTau.h" // l1t::HPSPFTau
#include "DataFormats/L1TParticleFlow/interface/PFCandidate.h" // l1t::PFCandidate, l1t::PFCandidateCollection, l1t::PFCandidateRef
#include "DataFormats/JetReco/interface/CaloJet.h"
#include "DataFormats/L1TCorrelator/interface/TkPrimaryVertex.h"
#include "CommonTools/Utils/interface/FormulaEvaluator.h"
#include <vector>

class HPSPFTauBuilder {
class L1HPSPFTauBuilder {
public:
HPSPFTauBuilder(const edm::ParameterSet& cfg);
~HPSPFTauBuilder() = default;
L1HPSPFTauBuilder(const edm::ParameterSet& cfg);
~L1HPSPFTauBuilder() = default;

void reset();
void setL1PFCandProductID(const edm::ProductID& l1PFCandProductID);
Expand Down Expand Up @@ -48,11 +48,11 @@ class HPSPFTauBuilder {
double isolationConeSize_;
double isolationConeSize2_;

std::vector<HPSPFTauQualityCut> signalQualityCutsDzCutDisabled_;
std::vector<HPSPFTauQualityCut> signalQualityCutsDzCutEnabledPrimary_;
std::vector<HPSPFTauQualityCut> isolationQualityCutsDzCutDisabled_;
std::vector<HPSPFTauQualityCut> isolationQualityCutsDzCutEnabledPrimary_;
std::vector<HPSPFTauQualityCut> isolationQualityCutsDzCutEnabledPileup_;
std::vector<L1HPSPFTauQualityCut> signalQualityCutsDzCutDisabled_;
std::vector<L1HPSPFTauQualityCut> signalQualityCutsDzCutEnabledPrimary_;
std::vector<L1HPSPFTauQualityCut> isolationQualityCutsDzCutDisabled_;
std::vector<L1HPSPFTauQualityCut> isolationQualityCutsDzCutEnabledPrimary_;
std::vector<L1HPSPFTauQualityCut> isolationQualityCutsDzCutEnabledPileup_;
edm::ProductID l1PFCandProductID_;
bool isPFCandSeeded_;
l1t::PFCandidateRef l1PFCandSeed_;
Expand Down
14 changes: 7 additions & 7 deletions ...ase2L1Taus/interface/HPSPFTauQualityCut.h → ...e2L1Taus/interface/L1HPSPFTauQualityCut.h
View file
@@ -1,18 +1,18 @@
#ifndef L1Trigger_Phase2L1Taus_HPSPFTauQualityCut_h
#define L1Trigger_Phase2L1Taus_HPSPFTauQualityCut_h
#ifndef L1Trigger_Phase2L1Taus_L1HPSPFTauQualityCut_h
#define L1Trigger_Phase2L1Taus_L1HPSPFTauQualityCut_h

#include "FWCore/ParameterSet/interface/ParameterSet.h" // edm::ParameterSet
#include "DataFormats/L1TParticleFlow/interface/PFCandidate.h" // l1t::PFCandidate
#include <string> // std::string
#include <vector> // std::vector

class HPSPFTauQualityCut {
class L1HPSPFTauQualityCut {
public:
/// constructor
HPSPFTauQualityCut(const edm::ParameterSet& cfg);
L1HPSPFTauQualityCut(const edm::ParameterSet& cfg);

/// destructor
~HPSPFTauQualityCut() = default;
~L1HPSPFTauQualityCut() = default;

/// returns true (false) if PFCandidate passes (fails) quality cuts
bool operator()(const l1t::PFCandidate& pfCand, float_t primaryVertexZ) const;
Expand All @@ -35,11 +35,11 @@ class HPSPFTauQualityCut {
bool debug_;
};

std::vector<HPSPFTauQualityCut> readL1PFTauQualityCuts(const edm::ParameterSet& cfg,
std::vector<L1HPSPFTauQualityCut> readL1PFTauQualityCuts(const edm::ParameterSet& cfg,
const std::string& dzCut,
bool debug = false);

bool isSelected(const std::vector<HPSPFTauQualityCut>& qualityCuts,
bool isSelected(const std::vector<L1HPSPFTauQualityCut>& qualityCuts,
const l1t::PFCandidate& pfCand,
float_t primaryVertexZ);

Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.cc
View file
Expand Up @@ -133,7 +133,7 @@ void HPSPFTauProducer::produce(edm::Event& evt, const edm::EventSetup& es) {
tauBuilder_.addL1PFCandidates(selectedL1PFCandsSignalOrIsolationQualityCuts);
tauBuilder_.buildL1PFTau();
l1t::HPSPFTau l1PFTau = tauBuilder_.getL1PFTau();
if (l1PFTau.pt() > 1.)
if (l1PFTau.pt() > isPFTauPt_)
l1PFTauCollectionUncleaned.push_back(l1PFTau);
}
}
Expand All @@ -156,7 +156,7 @@ void HPSPFTauProducer::produce(edm::Event& evt, const edm::EventSetup& es) {
tauBuilder_.addL1PFCandidates(selectedL1PFCandsSignalOrIsolationQualityCuts);
tauBuilder_.buildL1PFTau();
l1t::HPSPFTau l1PFTau = tauBuilder_.getL1PFTau();
if (l1PFTau.pt() > 1.)
if (l1PFTau.pt() > isPFTauPt_)
l1PFTauCollectionUncleaned.push_back(l1PFTau);
}
}
Expand Down
11 changes: 6 additions & 5 deletions L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.h
View file
Expand Up @@ -8,8 +8,8 @@
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"

#include "L1Trigger/Phase2L1Taus/interface/HPSPFTauQualityCut.h" // HPSPFTauQualityCut
#include "L1Trigger/Phase2L1Taus/interface/HPSPFTauBuilder.h" // HPSPFTauBuilder
#include "L1Trigger/Phase2L1Taus/interface/L1HPSPFTauQualityCut.h" // L1HPSPFTauQualityCut
#include "L1Trigger/Phase2L1Taus/interface/L1HPSPFTauBuilder.h" // L1HPSPFTauBuilder
#include "DataFormats/L1TParticleFlow/interface/HPSPFTau.h" // l1t::HPSPFTau
#include "DataFormats/L1TParticleFlow/interface/HPSPFTauFwd.h" // l1t::HPSPFTauCollection
#include "DataFormats/L1TParticleFlow/interface/PFCandidate.h" // l1t::PFCandidate, l1t::PFCandidateCollection, l1t::PFCandidateRef
Expand All @@ -31,7 +31,7 @@ class HPSPFTauProducer : public edm::stream::EDProducer<> {

std::string moduleLabel_;

HPSPFTauBuilder tauBuilder_;
L1HPSPFTauBuilder tauBuilder_;

edm::InputTag srcL1PFCands_;
edm::EDGetTokenT<l1t::PFCandidateCollection> tokenL1PFCands_;
Expand All @@ -40,8 +40,8 @@ class HPSPFTauProducer : public edm::stream::EDProducer<> {
edm::InputTag srcL1Vertices_;
edm::EDGetTokenT<std::vector<l1t::TkPrimaryVertex>> tokenL1Vertices_;

std::vector<HPSPFTauQualityCut> signalQualityCutsDzCutDisabled_;
std::vector<HPSPFTauQualityCut> isolationQualityCutsDzCutDisabled_;
std::vector<L1HPSPFTauQualityCut> signalQualityCutsDzCutDisabled_;
std::vector<L1HPSPFTauQualityCut> isolationQualityCutsDzCutDisabled_;

bool useChargedPFCandSeeds_;
double minSeedChargedPFCandPt_;
Expand All @@ -66,6 +66,7 @@ class HPSPFTauProducer : public edm::stream::EDProducer<> {
bool applyPreselection_;

bool debug_;
const double isPFTauPt_ = 1.;
};

#endif
40 changes: 20 additions & 20 deletions ...igger/Phase2L1Taus/src/HPSPFTauBuilder.cc → ...ger/Phase2L1Taus/src/L1HPSPFTauBuilder.cc
View file
@@ -1,4 +1,4 @@
#include "L1Trigger/Phase2L1Taus/interface/HPSPFTauBuilder.h"
#include "L1Trigger/Phase2L1Taus/interface/L1HPSPFTauBuilder.h"
#include "FWCore/Utilities/interface/Exception.h" // cms::Exception
#include "DataFormats/Math/interface/deltaR.h" // reco::deltaR
#include <regex> // sd::regex_replace
Expand All @@ -7,7 +7,7 @@
#include <algorithm> // std::max(), std::sort()
#include <cmath> // std::fabs

HPSPFTauBuilder::HPSPFTauBuilder(const edm::ParameterSet& cfg)
L1HPSPFTauBuilder::L1HPSPFTauBuilder(const edm::ParameterSet& cfg)
: signalConeSizeFormula_(std::regex_replace(cfg.getParameter<std::string>("signalConeSize"), std::regex("pt"), "x")),
minSignalConeSize_(cfg.getParameter<double>("minSignalConeSize")),
maxSignalConeSize_(cfg.getParameter<double>("maxSignalConeSize")),
Expand Down Expand Up @@ -37,7 +37,7 @@ HPSPFTauBuilder::HPSPFTauBuilder(const edm::ParameterSet& cfg)
isolationQualityCutsDzCutEnabledPileup_ = readL1PFTauQualityCuts(cfg_isolationQualityCuts, "enabled_pileup", debug_);
}

void HPSPFTauBuilder::reset() {
void L1HPSPFTauBuilder::reset() {
signalConeSize_ = 0.;
signalConeSize2_ = 0.;

Expand Down Expand Up @@ -83,15 +83,15 @@ void HPSPFTauBuilder::reset() {
sumChargedIsoPileup_ = 0.;
}

void HPSPFTauBuilder::setL1PFCandProductID(const edm::ProductID& l1PFCandProductID) {
void L1HPSPFTauBuilder::setL1PFCandProductID(const edm::ProductID& l1PFCandProductID) {
l1PFCandProductID_ = l1PFCandProductID;
}

void HPSPFTauBuilder::setVertex(const l1t::TkPrimaryVertexRef& primaryVertex) { primaryVertex_ = primaryVertex; }
void L1HPSPFTauBuilder::setVertex(const l1t::TkPrimaryVertexRef& primaryVertex) { primaryVertex_ = primaryVertex; }

void HPSPFTauBuilder::setL1PFTauSeed(const l1t::PFCandidateRef& l1PFCandSeed) {
void L1HPSPFTauBuilder::setL1PFTauSeed(const l1t::PFCandidateRef& l1PFCandSeed) {
if (debug_) {
std::cout << "<HPSPFTauBuilder::setL1PFTauSeed>:" << std::endl;
std::cout << "<L1HPSPFTauBuilder::setL1PFTauSeed>:" << std::endl;
std::cout << "seeding HPSPFTau with ChargedPFCand:";
printPFCand(std::cout, *l1PFCandSeed, primaryVertex_);
}
Expand All @@ -107,9 +107,9 @@ void HPSPFTauBuilder::setL1PFTauSeed(const l1t::PFCandidateRef& l1PFCandSeed) {
// This is commented as l1JetSeed->numberOfDaughters() = 0
// Alternative way is used below for the moment
/*
void HPSPFTauBuilder::setL1PFTauSeed(const reco::CaloJetRef& l1JetSeed) {
void L1HPSPFTauBuilder::setL1PFTauSeed(const reco::CaloJetRef& l1JetSeed) {
if (debug_) {
std::cout << "<HPSPFTauBuilder::setL1PFTauSeed>:" << std::endl;
std::cout << "<L1HPSPFTauBuilder::setL1PFTauSeed>:" << std::endl;
std::cout << "seeding HPSPFTau with Jet:";
std::cout << " pT = " << l1JetSeed->pt() << ", eta = " << l1JetSeed->eta() << ", phi = " << l1JetSeed->phi()
<< std::endl;
Expand All @@ -124,7 +124,7 @@ void HPSPFTauBuilder::setL1PFTauSeed(const reco::CaloJetRef& l1JetSeed) {
for (size_t idxConstituent = 0; idxConstituent < numConstituents; ++idxConstituent) {
const l1t::PFCandidate* l1PFCand = dynamic_cast<const l1t::PFCandidate*>(l1JetSeed->daughter(idxConstituent));
if (!l1PFCand) {
throw cms::Exception("HPSPFTauBuilder") << "Jet was not built from l1t::PFCandidates !!\n";
throw cms::Exception("L1HPSPFTauBuilder") << "Jet was not built from l1t::PFCandidates !!\n";
}
if (l1PFCand->id() == l1t::PFCandidate::ChargedHadron || l1PFCand->id() == l1t::PFCandidate::Electron ||
l1PFCand->id() == l1t::PFCandidate::Photon || l1PFCand->id() == l1t::PFCandidate::Muon) {
Expand All @@ -144,10 +144,10 @@ void HPSPFTauBuilder::setL1PFTauSeed(const reco::CaloJetRef& l1JetSeed) {
}
}
*/
void HPSPFTauBuilder::setL1PFTauSeed(const reco::CaloJetRef& l1JetSeed,
void L1HPSPFTauBuilder::setL1PFTauSeed(const reco::CaloJetRef& l1JetSeed,
const std::vector<l1t::PFCandidateRef>& l1PFCands) {
if (debug_) {
std::cout << "<HPSPFTauBuilder::setL1PFTauSeed>:" << std::endl;
std::cout << "<L1HPSPFTauBuilder::setL1PFTauSeed>:" << std::endl;
std::cout << "seeding HPSPFTau with Jet:";
std::cout << " pT = " << l1JetSeed->pt() << ", eta = " << l1JetSeed->eta() << ", phi = " << l1JetSeed->phi()
<< std::endl;
Expand Down Expand Up @@ -180,9 +180,9 @@ void HPSPFTauBuilder::setL1PFTauSeed(const reco::CaloJetRef& l1JetSeed,
}
}

void HPSPFTauBuilder::addL1PFCandidates(const std::vector<l1t::PFCandidateRef>& l1PFCands) {
void L1HPSPFTauBuilder::addL1PFCandidates(const std::vector<l1t::PFCandidateRef>& l1PFCands) {
if (debug_) {
std::cout << "<HPSPFTauBuilder::addL1PFCandidates>:" << std::endl;
std::cout << "<L1HPSPFTauBuilder::addL1PFCandidates>:" << std::endl;
}

// do not build tau candidates for which no reference z-position exists,
Expand Down Expand Up @@ -305,9 +305,9 @@ void HPSPFTauBuilder::addL1PFCandidates(const std::vector<l1t::PFCandidateRef>&
}
}

//void HPSPFTauBuilder::setRho(double rho) { rho_ = rho; }
//void L1HPSPFTauBuilder::setRho(double rho) { rho_ = rho; }

bool HPSPFTauBuilder::isWithinSignalCone(const l1t::PFCandidate& l1PFCand) {
bool L1HPSPFTauBuilder::isWithinSignalCone(const l1t::PFCandidate& l1PFCand) {
if (isPFCandSeeded_ || isJetSeeded_) {
double deltaEta = l1PFCand.eta() - l1PFTauSeedEta_;
double deltaPhi = l1PFCand.phi() - l1PFTauSeedPhi_;
Expand All @@ -317,7 +317,7 @@ bool HPSPFTauBuilder::isWithinSignalCone(const l1t::PFCandidate& l1PFCand) {
return false;
}

bool HPSPFTauBuilder::isWithinStrip(const l1t::PFCandidate& l1PFCand) {
bool L1HPSPFTauBuilder::isWithinStrip(const l1t::PFCandidate& l1PFCand) {
if (isPFCandSeeded_ || isJetSeeded_) {
double deltaEta = l1PFCand.eta() - l1PFTauSeedEta_;
double deltaPhi = l1PFCand.phi() - l1PFTauSeedPhi_;
Expand All @@ -327,7 +327,7 @@ bool HPSPFTauBuilder::isWithinStrip(const l1t::PFCandidate& l1PFCand) {
return false;
}

bool HPSPFTauBuilder::isWithinIsolationCone(const l1t::PFCandidate& l1PFCand) {
bool L1HPSPFTauBuilder::isWithinIsolationCone(const l1t::PFCandidate& l1PFCand) {
double deltaEta = l1PFCand.eta() - l1PFTauSeedEta_;
double deltaPhi = l1PFCand.phi() - l1PFTauSeedPhi_;
if ((deltaEta * deltaEta + deltaPhi * deltaPhi) < isolationConeSize2_)
Expand All @@ -336,7 +336,7 @@ bool HPSPFTauBuilder::isWithinIsolationCone(const l1t::PFCandidate& l1PFCand) {
return false;
}

void HPSPFTauBuilder::buildL1PFTau() {
void L1HPSPFTauBuilder::buildL1PFTau() {
reco::Particle::LorentzVector l1PFTau_p4;
for (auto l1PFCand : signalAllL1PFCandidates_) {
if (l1PFCand->id() == l1t::PFCandidate::ChargedHadron || l1PFCand->id() == l1t::PFCandidate::Electron ||
Expand Down Expand Up @@ -428,7 +428,7 @@ void HPSPFTauBuilder::buildL1PFTau() {
}
}

l1t::PFCandidateRefVector HPSPFTauBuilder::convertToRefVector(const std::vector<l1t::PFCandidateRef>& l1PFCands) {
l1t::PFCandidateRefVector L1HPSPFTauBuilder::convertToRefVector(const std::vector<l1t::PFCandidateRef>& l1PFCands) {
l1t::PFCandidateRefVector l1PFCandsRefVector(l1PFCandProductID_);
for (auto l1PFCand : l1PFCands) {
l1PFCandsRefVector.push_back(l1PFCand);
Expand Down

0 comments on commit 391723c

Please sign in to comment.