From 35e3d348a803a5e11efeee14196c8a78cce319d2 Mon Sep 17 00:00:00 2001 From: Michal Bluj Date: Mon, 1 Jun 2020 12:09:34 +0200 Subject: [PATCH 1/2] Fix bug affecting indexing jet-constituent-map introduced in #17087; remove remnants of previous implementation --- RecoJets/JetProducers/plugins/BoostedTauSeedsProducer.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/RecoJets/JetProducers/plugins/BoostedTauSeedsProducer.cc b/RecoJets/JetProducers/plugins/BoostedTauSeedsProducer.cc index 69503a88ab451..03e7888fcb690 100644 --- a/RecoJets/JetProducers/plugins/BoostedTauSeedsProducer.cc +++ b/RecoJets/JetProducers/plugins/BoostedTauSeedsProducer.cc @@ -157,10 +157,7 @@ namespace { const reco::Jet& jet, const edm::Handle& pfCandidates, const JetToConstitMap::value_type& constitmap, - const reco::Jet::Constituents& jetConstituents, - double /*dRmatch*/, bool invert) { - //const double dRmatch2 = dRmatch*dRmatch; // comment out for now in case someone needs a dR-based search again auto const& collection_cand = (*pfCandidates); std::vector pfCandidates_exclJetConstituents; size_t numPFCandidates = pfCandidates->size(); @@ -257,9 +254,9 @@ void BoostedTauSeedsProducer::produce(edm::Event& evt, const edm::EventSetup& es // find all PFCandidates that are not constituents of the **other** subjet std::vector pfCandidatesNotInSubjet1 = getPFCandidates_exclJetConstituents( - *subjet1, pfCandidates, constitmap[2 * idx], subjetConstituents2, 1.e-4, false); + *subjet1, pfCandidates, constitmap[2 * idx + 1], false); std::vector pfCandidatesNotInSubjet2 = getPFCandidates_exclJetConstituents( - *subjet2, pfCandidates, constitmap[2 * idx + 1], subjetConstituents1, 1.e-4, false); + *subjet2, pfCandidates, constitmap[2 * idx], false); if (verbosity_ >= 1) { std::cout << "#pfCandidatesNotInSubjet1 = " << pfCandidatesNotInSubjet1.size() << std::endl; std::cout << "#pfCandidatesNotInSubjet2 = " << pfCandidatesNotInSubjet2.size() << std::endl; From 67ebc571374e88a820fb6de685cbc1efb7055c0d Mon Sep 17 00:00:00 2001 From: Michal Bluj Date: Mon, 1 Jun 2020 13:18:18 +0200 Subject: [PATCH 2/2] Fixes from code-format --- RecoJets/JetProducers/plugins/BoostedTauSeedsProducer.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RecoJets/JetProducers/plugins/BoostedTauSeedsProducer.cc b/RecoJets/JetProducers/plugins/BoostedTauSeedsProducer.cc index 03e7888fcb690..832c0ab5aac00 100644 --- a/RecoJets/JetProducers/plugins/BoostedTauSeedsProducer.cc +++ b/RecoJets/JetProducers/plugins/BoostedTauSeedsProducer.cc @@ -253,10 +253,10 @@ void BoostedTauSeedsProducer::produce(edm::Event& evt, const edm::EventSetup& es edm::Ref subjetRef2(selectedSubjetRefProd, selectedSubjets->size() - 1); // find all PFCandidates that are not constituents of the **other** subjet - std::vector pfCandidatesNotInSubjet1 = getPFCandidates_exclJetConstituents( - *subjet1, pfCandidates, constitmap[2 * idx + 1], false); - std::vector pfCandidatesNotInSubjet2 = getPFCandidates_exclJetConstituents( - *subjet2, pfCandidates, constitmap[2 * idx], false); + std::vector pfCandidatesNotInSubjet1 = + getPFCandidates_exclJetConstituents(*subjet1, pfCandidates, constitmap[2 * idx + 1], false); + std::vector pfCandidatesNotInSubjet2 = + getPFCandidates_exclJetConstituents(*subjet2, pfCandidates, constitmap[2 * idx], false); if (verbosity_ >= 1) { std::cout << "#pfCandidatesNotInSubjet1 = " << pfCandidatesNotInSubjet1.size() << std::endl; std::cout << "#pfCandidatesNotInSubjet2 = " << pfCandidatesNotInSubjet2.size() << std::endl;