Reduce non necessary sqrt computations in RecoTauTag/HLTProducers #41100
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ The module stores j1, j2 of any (j1, j2, t1, t2) that satisfies the conditions a | |
| #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" | ||
| #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" | ||
| #include "FWCore/Framework/interface/Event.h" | ||
| #include "FWCore/Framework/interface/EventSetup.h" | ||
| #include "FWCore/ParameterSet/interface/ParameterSet.h" | ||
| #include "FWCore/Utilities/interface/InputTag.h" | ||
| #include "FWCore/Utilities/interface/Exception.h" | ||
|
|
@@ -37,7 +38,7 @@ class HLTPFDiJetCorrCheckerWithDiTau : public edm::global::EDProducer<> { | |
| const edm::EDGetTokenT<trigger::TriggerFilterObjectWithRefs> tauSrc_; | ||
| const edm::EDGetTokenT<reco::PFJetCollection> pfJetSrc_; | ||
| const double extraTauPtCut_; | ||
| const double m2jjMin_; | ||
| const double dRmin_, dRmin2_; | ||
| // pt comparator | ||
| GreaterByPt<reco::PFJet> pTComparator_; | ||
|
|
@@ -50,7 +51,7 @@ HLTPFDiJetCorrCheckerWithDiTau::HLTPFDiJetCorrCheckerWithDiTau(const edm::Parame | |
| : tauSrc_(consumes(iConfig.getParameter<edm::InputTag>("tauSrc"))), | ||
| pfJetSrc_(consumes(iConfig.getParameter<edm::InputTag>("pfJetSrc"))), | ||
| extraTauPtCut_(iConfig.getParameter<double>("extraTauPtCut")), | ||
| m2jjMin_(iConfig.getParameter<double>("mjjMin") * iConfig.getParameter<double>("mjjMin")), | ||
|
There was a problem hiding this comment. I think this needs to be improved. A user might put One way to improve this is The same argument probably applies to other plugins touched by this PR. There was a problem hiding this comment. You are correct @missirol |
||
| dRmin_(iConfig.getParameter<double>("dRmin")), | ||
| dRmin2_(dRmin_ * dRmin_) { | ||
| if (dRmin_ <= 0.) { | ||
|
|
@@ -77,7 +78,7 @@ void HLTPFDiJetCorrCheckerWithDiTau::produce(edm::StreamID iSId, edm::Event& iEv | |
| const reco::PFJet& myPFJet1 = pfJets[iJet1]; | ||
| const reco::PFJet& myPFJet2 = pfJets[iJet2]; | ||
|
|
||
| if ((myPFJet1.p4() + myPFJet2.p4()).M2() < m2jjMin_) | ||
| continue; | ||
|
|
||
| for (unsigned int iTau1 = 0; iTau1 < taus.size(); iTau1++) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -31,8 +31,8 @@ void L1HLTTauMatching::produce(edm::StreamID iSId, edm::Event& iEvent, const edm | |||||||||
|
|
||||||||||
| unique_ptr<PFTauCollection> tauL2jets(new PFTauCollection); | ||||||||||
|
|
||||||||||
| constexpr double matchingR = 0.5; | ||||||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. Here there was another mistake of mine:
Suggested change
|
||||||||||
|
|
||||||||||
| //Getting HLT jets to be matched | ||||||||||
| edm::Handle<PFTauCollection> tauJets; | ||||||||||
| iEvent.getByToken(jetSrc, tauJets); | ||||||||||
|
|
@@ -53,8 +53,8 @@ void L1HLTTauMatching::produce(edm::StreamID iSId, edm::Event& iEvent, const edm | |||||||||
| for (unsigned int iJet = 0; iJet < tauJets->size(); iJet++) { | ||||||||||
| //Find the relative L2TauJets, to see if it has been reconstructed | ||||||||||
| const PFTau& myJet = (*tauJets)[iJet]; | ||||||||||
| double deltaR2 = ROOT::Math::VectorUtil::DeltaR2(myJet.p4().Vect(), (tauCandRefVec[iL1Tau]->p4()).Vect()); | ||||||||||
| if (deltaR2 < matchingR) { | ||||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||||
| // LeafCandidate myLC(myJet); | ||||||||||
| if (myJet.leadChargedHadrCand().isNonnull()) { | ||||||||||
| a = myJet.leadChargedHadrCand()->vertex(); | ||||||||||
|
|
@@ -73,8 +73,8 @@ void L1HLTTauMatching::produce(edm::StreamID iSId, edm::Event& iEvent, const edm | |||||||||
| for (unsigned int iJet = 0; iJet < tauJets->size(); iJet++) { | ||||||||||
| const PFTau& myJet = (*tauJets)[iJet]; | ||||||||||
| //Find the relative L2TauJets, to see if it has been reconstructed | ||||||||||
| double deltaR2 = ROOT::Math::VectorUtil::DeltaR2(myJet.p4().Vect(), (jetCandRefVec[iL1Tau]->p4()).Vect()); | ||||||||||
| if (deltaR2 < matchingR) { | ||||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||||
| // LeafCandidate myLC(myJet); | ||||||||||
| if (myJet.leadChargedHadrCand().isNonnull()) { | ||||||||||
| a = myJet.leadChargedHadrCand()->vertex(); | ||||||||||
|
|
||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -26,8 +26,7 @@ L1THLTTauMatching::~L1THLTTauMatching() {} | |||||
| void L1THLTTauMatching::produce(edm::StreamID iSId, edm::Event& iEvent, const edm::EventSetup& iES) const { | ||||||
| unique_ptr<PFTauCollection> tauL2jets(new PFTauCollection); | ||||||
|
|
||||||
| constexpr double matchingR = 0.5 * 0.5; | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
|
|
||||||
| // Getting HLT jets to be matched | ||||||
| edm::Handle<PFTauCollection> tauJets; | ||||||
|
|
@@ -45,8 +44,8 @@ void L1THLTTauMatching::produce(edm::StreamID iSId, edm::Event& iEvent, const ed | |||||
| for (unsigned int iJet = 0; iJet < tauJets->size(); iJet++) { | ||||||
| // Find the relative L2TauJets, to see if it has been reconstructed | ||||||
| const PFTau& myJet = (*tauJets)[iJet]; | ||||||
| double deltaR2 = ROOT::Math::VectorUtil::DeltaR2(myJet.p4().Vect(), (tauCandRefVec[iL1Tau]->p4()).Vect()); | ||||||
| if (deltaR2 < matchingR) { | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| if (myJet.leadChargedHadrCand().isNonnull()) { | ||||||
| a = myJet.leadChargedHadrCand()->vertex(); | ||||||
| } | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -58,8 +58,8 @@ void L2TauJetsMerger::produce(edm::StreamID iSId, edm::Event& iEvent, const edm: | |||||
| tauL2jets->push_back(myTmpJets[0]); | ||||||
| CaloJetCollection tmp; | ||||||
| for (unsigned int i = 1; i < myTmpJets.size(); ++i) { | ||||||
| double DR2 = ROOT::Math::VectorUtil::DeltaR2(myTmpJets[0].p4(), myTmpJets[i].p4()); | ||||||
| if (DR2 > 0.1 * 0.1) | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. No, I prefer the cleaner expression of mine. For the compiler they'll be the same anyhow |
||||||
| tmp.push_back(myTmpJets[i]); | ||||||
| } | ||||||
| myTmpJets.swap(tmp); | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| #include "RecoTauTag/HLTProducers/interface/PFJetsMaxInvMassModule.h" | ||
| #include "Math/GenVector/VectorUtil.h" | ||
| #include "CommonTools/Utils/interface/PtComparator.h" | ||
| #include "FWCore/ParameterSet/interface/ParameterSet.h" | ||
| #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" | ||
| #include "FWCore/Utilities/interface/InputTag.h" | ||
| #include "DataFormats/Common/interface/Handle.h" | ||
|
|
||
| // | ||
| // class declaration | ||
|
|
@@ -13,7 +15,6 @@ PFJetsMaxInvMassModule::PFJetsMaxInvMassModule(const edm::ParameterSet& iConfig) | |
| removeMaxInvMassPair_(iConfig.getParameter<bool>("removeMaxInvMassPair")) { | ||
| produces<reco::PFJetCollection>(); | ||
| } | ||
|
|
||
| void PFJetsMaxInvMassModule::produce(edm::StreamID iSId, edm::Event& iEvent, const edm::EventSetup& iES) const { | ||
| std::unique_ptr<reco::PFJetCollection> addPFJets(new reco::PFJetCollection); | ||
|
|
@@ -23,14 +24,14 @@ void PFJetsMaxInvMassModule::produce(edm::StreamID iSId, edm::Event& iEvent, con | |
|
|
||
| unsigned iCan = 0; | ||
| unsigned jCan = 0; | ||
| double m2jj_max = 0; | ||
|
|
||
| if (jets->size() > 1) { | ||
| for (unsigned i = 0; i < jets->size(); i++) { | ||
| for (unsigned j = i + 1; j < jets->size(); j++) { | ||
| double test = ((*jets)[i].p4() + (*jets)[j].p4()).M2(); | ||
| if (test > m2jj_max) { | ||
| m2jj_max = test; | ||
| iCan = i; | ||
| jCan = j; | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mCone * mConecould be computed outside the loop. (or in the ctor)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Compiler should be able to optimize it anyhow... But ok, why not? I will update