From 569cecc600bfd6ed476289f92b037fa4fdb91993 Mon Sep 17 00:00:00 2001 From: Slava Krutelyov Date: Tue, 19 May 2020 23:03:35 +0200 Subject: [PATCH] code checks --- .../PatAlgos/plugins/PATIsolatedTrackProducer.cc | 9 +++++---- PhysicsTools/PatUtils/src/MiniIsolation.cc | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/PhysicsTools/PatAlgos/plugins/PATIsolatedTrackProducer.cc b/PhysicsTools/PatAlgos/plugins/PATIsolatedTrackProducer.cc index 2735f951badbd..5aaabbaa3ceb6 100644 --- a/PhysicsTools/PatAlgos/plugins/PATIsolatedTrackProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATIsolatedTrackProducer.cc @@ -300,7 +300,8 @@ void pat::PATIsolatedTrackProducer::produce(edm::Event& iEvent, const edm::Event // isolation cut if (polarP4.pt() < pT_cut_noIso_ && prescaled <= 1 && - !(isolationDR03.chargedHadronIso() < absIso_cut_ || isolationDR03.chargedHadronIso() / polarP4.pt() < relIso_cut_ || + !(isolationDR03.chargedHadronIso() < absIso_cut_ || + isolationDR03.chargedHadronIso() / polarP4.pt() < relIso_cut_ || miniIso.chargedHadronIso() / polarP4.pt() < miniRelIso_cut_)) continue; @@ -459,9 +460,9 @@ void pat::PATIsolatedTrackProducer::produce(edm::Event& iEvent, const edm::Event getIsolation(polarP4, pc, ipc, isolationDR03, miniIso); // isolation cut - if (polarP4.pt() < pT_cut_noIso_ && - !(isolationDR03.chargedHadronIso() < absIso_cut_ || isolationDR03.chargedHadronIso() / polarP4.pt() < relIso_cut_ || - miniIso.chargedHadronIso() / polarP4.pt() < miniRelIso_cut_)) + if (polarP4.pt() < pT_cut_noIso_ && !(isolationDR03.chargedHadronIso() < absIso_cut_ || + isolationDR03.chargedHadronIso() / polarP4.pt() < relIso_cut_ || + miniIso.chargedHadronIso() / polarP4.pt() < miniRelIso_cut_)) continue; pdgId = pfCand.pdgId(); diff --git a/PhysicsTools/PatUtils/src/MiniIsolation.cc b/PhysicsTools/PatUtils/src/MiniIsolation.cc index c0f43ea1c9936..532828e192999 100644 --- a/PhysicsTools/PatUtils/src/MiniIsolation.cc +++ b/PhysicsTools/PatUtils/src/MiniIsolation.cc @@ -31,25 +31,25 @@ namespace pat { float drcut = miniIsoDr(p4, mindr, maxdr, kt_scale); for (auto const &pc : *pfcands) { float dr2 = deltaR2(p4, pc); - if (dr2 > drcut*drcut) + if (dr2 > drcut * drcut) continue; float pt = pc.p4().pt(); int id = pc.pdgId(); if (std::abs(id) == 211) { bool fromPV = (pc.fromPV() > 1 || fabs(pc.dz()) < dZ_cut); - if (fromPV && dr2 > deadcone_ch*deadcone_ch) { + if (fromPV && dr2 > deadcone_ch * deadcone_ch) { // if charged hadron and from primary vertex, add to charged hadron isolation chiso += pt; - } else if (!fromPV && pt > ptthresh && dr2 > deadcone_pu*deadcone_pu) { + } else if (!fromPV && pt > ptthresh && dr2 > deadcone_pu * deadcone_pu) { // if charged hadron and NOT from primary vertex, add to pileup isolation puiso += pt; } } // if neutral hadron, add to neutral hadron isolation - if (std::abs(id) == 130 && pt > ptthresh && dr2 > deadcone_nh*deadcone_nh) + if (std::abs(id) == 130 && pt > ptthresh && dr2 > deadcone_nh * deadcone_nh) nhiso += pt; // if photon, add to photon isolation - if (std::abs(id) == 22 && pt > ptthresh && dr2 > deadcone_ph*deadcone_ph) + if (std::abs(id) == 22 && pt > ptthresh && dr2 > deadcone_ph * deadcone_ph) phiso += pt; }