Skip to content

Commit ff127e7

Browse files
committed
1 parent 1011a4a commit ff127e7

File tree

2 files changed

+212
-101
lines changed

2 files changed

+212
-101
lines changed

PhysicsTools/NanoAOD/plugins/JetConstituentTableProducer.cc

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ using namespace btagbtvdeep;
3232

3333
namespace {
3434

35-
std::string toupper(std::string s) {
36-
std::transform(s.begin(), s.end(), s.begin(), ::toupper);
37-
return s;
38-
}
35+
std::string toupper(std::string s) {
36+
std::transform(s.begin(), s.end(), s.begin(), ::toupper);
37+
return s;
38+
}
3939

4040
} // namespace
4141

@@ -95,10 +95,10 @@ JetConstituentTableProducer<T>::JetConstituentTableProducer(const edm::Parameter
9595
vtx_token_(consumes<VertexCollection>(iConfig.getParameter<edm::InputTag>("vertices"))),
9696
cand_token_(consumes<reco::CandidateView>(iConfig.getParameter<edm::InputTag>("candidates"))),
9797
sv_token_(consumes<SVCollection>(iConfig.getParameter<edm::InputTag>("secondary_vertices"))),
98-
track_builder_token_(esConsumes<TransientTrackBuilder, TransientTrackRecord>(edm::ESInputTag("", "TransientTrackBuilder"))),
98+
track_builder_token_(
99+
esConsumes<TransientTrackBuilder, TransientTrackRecord>(edm::ESInputTag("", "TransientTrackBuilder"))),
99100
sv_sort_(iConfig.getUntrackedParameter<std::string>("sv_sort")),
100-
pf_sort_(iConfig.getUntrackedParameter<std::string>("pf_sort"))
101-
{
101+
pf_sort_(iConfig.getUntrackedParameter<std::string>("pf_sort")) {
102102
produces<nanoaod::FlatTable>(name_);
103103
produces<nanoaod::FlatTable>(nameSV_);
104104
produces<std::vector<reco::CandidatePtr>>();
@@ -155,19 +155,22 @@ void JetConstituentTableProducer<T>::produce(edm::Event &iEvent, const edm::Even
155155
jetSVs.push_back(&sv);
156156
}
157157
}
158-
if(toupper(sv_sort_) == "IP") {
158+
if (toupper(sv_sort_) == "IP") {
159159
// sort by dxy significance
160-
std::sort(jetSVs.begin(), jetSVs.end(),
161-
[this](const reco::VertexCompositePtrCandidate *sva, const reco::VertexCompositePtrCandidate *svb) {
162-
return sv_vertex_comparator(*sva, *svb, *pv_);
163-
});
164-
} else if(toupper(sv_sort_) == "PT") {
165-
std::sort(jetSVs.begin(), jetSVs.end(),
166-
[](const reco::VertexCompositePtrCandidate *sva, const reco::VertexCompositePtrCandidate *svb) {
167-
return sva->pt() > svb->pt();
168-
});
169-
} else if(!sv_sort_.empty()) {
170-
throw cms::Exception("Configuration") << "Unknown sorting option for secondary vertices: " << sv_sort_ << std::endl;
160+
std::sort(jetSVs.begin(),
161+
jetSVs.end(),
162+
[this](const reco::VertexCompositePtrCandidate *sva, const reco::VertexCompositePtrCandidate *svb) {
163+
return sv_vertex_comparator(*sva, *svb, *pv_);
164+
});
165+
} else if (toupper(sv_sort_) == "PT") {
166+
std::sort(jetSVs.begin(),
167+
jetSVs.end(),
168+
[](const reco::VertexCompositePtrCandidate *sva, const reco::VertexCompositePtrCandidate *svb) {
169+
return sva->pt() > svb->pt();
170+
});
171+
} else if (!sv_sort_.empty()) {
172+
throw cms::Exception("Configuration")
173+
<< "Unknown sorting option for secondary vertices: " << sv_sort_ << std::endl;
171174
}
172175

173176
for (const auto &sv : jetSVs) {
@@ -206,17 +209,20 @@ void JetConstituentTableProducer<T>::produce(edm::Event &iEvent, const edm::Even
206209

207210
// PF Cands
208211
std::vector<reco::CandidatePtr> const &daughters = jet.daughterPtrVector();
209-
std::vector<size_t> dauidx; dauidx.reserve(daughters.size());
210-
for(size_t i = 0; i < daughters.size(); ++i) dauidx.push_back(i);
211-
if(toupper(pf_sort_) == "PT") {
212+
std::vector<size_t> dauidx;
213+
dauidx.reserve(daughters.size());
214+
for (size_t i = 0; i < daughters.size(); ++i)
215+
dauidx.push_back(i);
216+
if (toupper(pf_sort_) == "PT") {
212217
std::sort(dauidx.begin(), dauidx.end(), [&daughters](size_t i, size_t j) {
213218
return daughters[i]->pt() > daughters[j]->pt();
214219
});
215-
} else if(!pf_sort_.empty()) {
216-
throw cms::Exception("Configuration") << "Unknown sorting option for particle flow candidates: " << pf_sort_ << std::endl;
220+
} else if (!pf_sort_.empty()) {
221+
throw cms::Exception("Configuration")
222+
<< "Unknown sorting option for particle flow candidates: " << pf_sort_ << std::endl;
217223
}
218224

219-
for(size_t di : dauidx) {
225+
for (size_t di : dauidx) {
220226
const auto &cand = daughters[di];
221227
auto candPtrs = cands_->ptrs();
222228
auto candInNewList = std::find(candPtrs.begin(), candPtrs.end(), cand);

0 commit comments

Comments
 (0)