From fbf3ab15063645e80de966b95364644459fdadc9 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 21 Dec 2016 05:43:19 +0100
Subject: [PATCH] 'Const fix.' (TrigBphysHypo-00-05-19)
* Tagging TrigBphysHypo-00-05-19.
* Const fix.
* Tagging TrigBphysHypo-00-05-18.
* ATH_MSG_DEBUG.
* Tagging TrigBphysHypo-00-05-17.
* Add missing std:: qualifiers.
* Tagging TrigBphysHypo-00-05-16.
* Fix some identifiers to comply with ATLAS conventions.
---
.../TrigBphysHypo/src/TrigEFBMuMuXFex.cxx | 2 +-
.../TrigBphysHypo/src/TrigMultiTrkFex.cxx | 74 +++++++++----------
.../TrigBphysHypo/src/TrigMultiTrkFex.h | 26 +++----
3 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXFex.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXFex.cxx
index 547946e8d92..57211883a08 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXFex.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXFex.cxx
@@ -2999,7 +2999,7 @@ HLT::ErrorCode TrigEFBMuMuXFex::hltExecute(HLT::TEConstVec& inputTE, HLT::Trigge
}
}
// Sergey S.: reset the secondary decay links to persistified container
- for( xAOD::TrigBphysContainer::const_iterator BPobj = m_TrigBphysColl_b->begin(); BPobj != m_TrigBphysColl_b->end(); ++BPobj) {
+ for( xAOD::TrigBphysContainer::iterator BPobj = m_TrigBphysColl_b->begin(); BPobj != m_TrigBphysColl_b->end(); ++BPobj) {
if ((*BPobj)->secondaryDecayLink().isValid() ) {
ElementLink<xAOD::TrigBphysContainer> secEL;
// secEL.resetWithKeyAndIndex(KEY,(*BPobj)->secondaryDecayLink().index());
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkFex.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkFex.cxx
index 19eb55c02c1..767e40adf7b 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkFex.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkFex.cxx
@@ -90,17 +90,17 @@ TrigMultiTrkFex::TrigMultiTrkFex(const std::string & name, ISvcLocator* pSvcLoca
declareProperty("ptMuonMin" , m_ptMuonMin );
declareProperty("overlapdR" , m_mindR = 0.01 );
- declareMonitoredStdContainer("Errors" , mon_Errors , AutoClear);
- declareMonitoredStdContainer("Acceptance" , mon_Acceptance , AutoClear);
- declareMonitoredStdContainer("NTrkMass", mon_NTrkMass , AutoClear );
- declareMonitoredStdContainer("NTrkFitMass", mon_NTrkFitMass , AutoClear );
- declareMonitoredStdContainer("NTrkChi2", mon_NTrkChi2 , AutoClear );
- declareMonitoredStdContainer("PairMass", mon_pairMass , AutoClear );
- declareMonitoredVariable("NTrk_all", mon_NTrk);
- declareMonitoredVariable("NTrk_highpt", mon_highptNTrk);
- declareMonitoredVariable("NTrkHighPt_accepted", mon_accepted_highptNTrk);
- declareMonitoredVariable("NPair_all", mon_NPair);
- declareMonitoredVariable("NPair_accepted", mon_acceptedNPair);
+ declareMonitoredStdContainer("Errors" , m_mon_Errors , AutoClear);
+ declareMonitoredStdContainer("Acceptance" , m_mon_Acceptance , AutoClear);
+ declareMonitoredStdContainer("NTrkMass", m_mon_NTrkMass , AutoClear );
+ declareMonitoredStdContainer("NTrkFitMass", m_mon_NTrkFitMass , AutoClear );
+ declareMonitoredStdContainer("NTrkChi2", m_mon_NTrkChi2 , AutoClear );
+ declareMonitoredStdContainer("PairMass", m_mon_pairMass , AutoClear );
+ declareMonitoredVariable("NTrk_all", m_mon_NTrk);
+ declareMonitoredVariable("NTrk_highpt", m_mon_highptNTrk);
+ declareMonitoredVariable("NTrkHighPt_accepted", m_mon_accepted_highptNTrk);
+ declareMonitoredVariable("NPair_all", m_mon_NPair);
+ declareMonitoredVariable("NPair_accepted", m_mon_acceptedNPair);
}
TrigMultiTrkFex::~TrigMultiTrkFex()
@@ -308,13 +308,13 @@ HLT::ErrorCode TrigMultiTrkFex::hltFinalize()
// HLT::ErrorCode TrigMultiTrkFex::acceptInputs(HLT::TEConstVec& inputTE, bool& pass) {
// //OI: we do not care from which RoI tracks come from as long as they give good vertex and mass
-// mon_Acceptance.push_back( ACCEPT_Input );
+// m_mon_Acceptance.push_back( ACCEPT_Input );
// // event info
// uint32_t runNumber(0), evtNumber(0), lbBlock(0);
// if (m_bphysHelperTool->getRunEvtLb( runNumber, evtNumber, lbBlock).isFailure()) {
// msg() << MSG::WARNING << "Error retriving EventInfo" << endmsg;
-// mon_Errors.push_back( ERROR_No_EventInfo );
+// m_mon_Errors.push_back( ERROR_No_EventInfo );
// }
@@ -334,7 +334,7 @@ HLT::ErrorCode TrigMultiTrkFex::hltFinalize()
HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerElement*> >& inputTE, unsigned int output)
{
- mon_Acceptance.push_back( ACCEPT_hltExecute );
+ m_mon_Acceptance.push_back( ACCEPT_hltExecute );
if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << " In TrigMultiTrk hltExecute" << endmsg;
@@ -359,7 +359,7 @@ HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerE
if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Passed L2SA cut"<< endmsg;
}
- mon_Acceptance.push_back( ACCEPT_PassNL2SAMuons );
+ m_mon_Acceptance.push_back( ACCEPT_PassNL2SAMuons );
//======== check if we have enough L2 Combined muons : =====================
std::vector<ElementLink<xAOD::L2CombinedMuonContainer> > l2combmuons;
// passMuon = passNObjects<std::vector<const xAOD::L2CombinedMuonContainer*>,
@@ -374,7 +374,7 @@ HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerE
if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed L2Comb muon cut"<< endmsg;
return HLT::OK;
}
- mon_Acceptance.push_back( ACCEPT_PassNL2CombMuons );
+ m_mon_Acceptance.push_back( ACCEPT_PassNL2CombMuons );
//======== check if we have enough EF muons : =====================
//std::vector<const xAOD::Muon*> efmuons; // do not own vectors
@@ -391,7 +391,7 @@ HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerE
if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed EF muon cut"<< endmsg;
return HLT::OK;
}
- mon_Acceptance.push_back( ACCEPT_PassNEFMuons );
+ m_mon_Acceptance.push_back( ACCEPT_PassNEFMuons );
//======== now make track container : =======================
@@ -411,8 +411,8 @@ HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerE
if(msgLvl() <= MSG::ERROR) msg() << MSG::ERROR << "You should never get to this point - check code"<< endmsg;
return HLT::OK;
}
- mon_Acceptance.push_back( ACCEPT_PassNTracks );
- mon_NTrk = tracks.size() ;
+ m_mon_Acceptance.push_back( ACCEPT_PassNTracks );
+ m_mon_NTrk = tracks.size() ;
//============= limit list to Ntrack leading tracks ===========
bool passHighPtTrack = false;
bool passNTrkCharge = false;
@@ -438,7 +438,7 @@ HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerE
<< endmsg;
}
- mon_highptNTrk = highptTracks.size() ;
+ m_mon_highptNTrk = highptTracks.size() ;
passHighPtTrack = true;
// now all preselection cuts passed, make output collection now
@@ -473,9 +473,9 @@ HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerE
}
//=== now check if combination is OK
- if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Combination "<< combi.str()
- << ", Ntrk="<< thisIterationTracks.size()
- << " pts=["<< hpts.str() << " ]"<< endmsg;
+ ATH_MSG_DEBUG( " Combination "<< combi.str()
+ << ", Ntrk="<< thisIterationTracks.size()
+ << " pts=["<< hpts.str() << " ]" );
//==== re-check pts
@@ -530,7 +530,7 @@ HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerE
}
double m2 = E*E - px*px - py*py -pz*pz;
totalMass = (m2 < 0) ? 0 : sqrt(m2);
- mon_NTrkMass.push_back(totalMass*0.001);
+ m_mon_NTrkMass.push_back(totalMass*0.001);
if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "combination mass = "<< totalMass << endmsg;
// check mass window now
bool foundMass = false;
@@ -581,7 +581,7 @@ HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerE
// simple mass
double dimass = m_bphysHelperTool->invariantMass(*trk0,*trk1,masses[0], masses[1]);
- mon_pairMass.push_back(dimass);
+ m_mon_pairMass.push_back(dimass);
if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "pair pt1=" << (*trk0)->pt() << ", pt2="<< (*trk1)->pt()
<<", mass = "<< dimass << endmsg;
@@ -609,8 +609,8 @@ HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerE
}
- mon_NPair += npair;
- mon_acceptedNPair += npairAcc;
+ m_mon_NPair += npair;
+ m_mon_acceptedNPair += npairAcc;
// first add big object and then di-masses
xAOD::TrigBphys* xaodobj = new xAOD::TrigBphys;
@@ -622,8 +622,8 @@ HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerE
if (m_bphysHelperTool->vertexFit(xaodobj,thisIterationTracks,masses1).isFailure()) {
if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "Problems with vertex fit in TrigMultiTrkFex" << endmsg;
}
- mon_NTrkFitMass.push_back(xaodobj->mass()*0.001 );
- mon_NTrkChi2.push_back(xaodobj->fitchi2() );
+ m_mon_NTrkFitMass.push_back(xaodobj->mass()*0.001 );
+ m_mon_NTrkChi2.push_back(xaodobj->fitchi2() );
//m_bphysHelperTool->fillTrigObjectKinematics(xaodobj,{mutrk,trk});
// OI : need to check the size of these, may be we can skip them
@@ -643,16 +643,16 @@ HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerE
//std::cout << std::endl;
- mon_accepted_highptNTrk = highptTracks.size() ;
+ m_mon_accepted_highptNTrk = highptTracks.size() ;
} while (std::prev_permutation(bitmask.begin(), bitmask.end()));
//------------- end of combination loop
- if( passHighPtTrack ) mon_Acceptance.push_back( ACCEPT_HighPtTrack );
- if( passNTrkCharge ) mon_Acceptance.push_back( ACCEPT_NTrkCharge );
- if( passNTrkMass ) mon_Acceptance.push_back( ACCEPT_NTrkMass );
- if( passPairCharge ) mon_Acceptance.push_back( ACCEPT_PairCharge );
- if( passPairMass ) mon_Acceptance.push_back( ACCEPT_PairMass );
+ if( passHighPtTrack ) m_mon_Acceptance.push_back( ACCEPT_HighPtTrack );
+ if( passNTrkCharge ) m_mon_Acceptance.push_back( ACCEPT_NTrkCharge );
+ if( passNTrkMass ) m_mon_Acceptance.push_back( ACCEPT_NTrkMass );
+ if( passPairCharge ) m_mon_Acceptance.push_back( ACCEPT_PairCharge );
+ if( passPairMass ) m_mon_Acceptance.push_back( ACCEPT_PairMass );
// record collection now
@@ -669,11 +669,11 @@ HLT::ErrorCode TrigMultiTrkFex::hltExecute(std::vector<std::vector<HLT::TriggerE
HLT::ErrorCode sc = attachFeature(outputTE, xAODTrigBphysColl, m_bphysCollectionKey );
if(sc != HLT::OK) {
msg() << MSG::WARNING << "Failed to store trigBphys Collection" << endmsg;
- mon_Errors.push_back( ERROR_BphysColl_Fails );
+ m_mon_Errors.push_back( ERROR_BphysColl_Fails );
delete xAODTrigBphysColl; xAODTrigBphysColl = nullptr; // assume deletion responsibility
return HLT::ERROR;
}
- mon_Acceptance.push_back( ACCEPT_RecordedCollection );
+ m_mon_Acceptance.push_back( ACCEPT_RecordedCollection );
m_countPassedCombination += xAODTrigBphysColl->size();
} else {
if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "REGTEST: no bphys collection to store " << endmsg;
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkFex.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkFex.h
index 7281614522b..b87b7b252c8 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkFex.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkFex.h
@@ -77,8 +77,8 @@ class TrigMultiTrkFex: public HLT::AllTEAlgo {
TrigTimer* m_BmmHypTot;
- string m_trackCollectionKey;
- string m_bphysCollectionKey;
+ std::string m_trackCollectionKey;
+ std::string m_bphysCollectionKey;
int m_nTrk ;
int m_nTrkQ; // if negative - no cut
std::vector<float> m_ptTrkMin;
@@ -104,17 +104,17 @@ class TrigMultiTrkFex: public HLT::AllTEAlgo {
//Monitored variables
- std::vector<int> mon_Errors;
- std::vector<int> mon_Acceptance;
- float mon_NTrk;
- float mon_highptNTrk;
- float mon_accepted_highptNTrk;
- std::vector<float> mon_NTrkMass;
- std::vector<float> mon_NTrkFitMass;
- std::vector<float> mon_NTrkChi2;
- float mon_NPair;
- float mon_acceptedNPair;
- std::vector<float> mon_pairMass;
+ std::vector<int> m_mon_Errors;
+ std::vector<int> m_mon_Acceptance;
+ float m_mon_NTrk;
+ float m_mon_highptNTrk;
+ float m_mon_accepted_highptNTrk;
+ std::vector<float> m_mon_NTrkMass;
+ std::vector<float> m_mon_NTrkFitMass;
+ std::vector<float> m_mon_NTrkChi2;
+ float m_mon_NPair;
+ float m_mon_acceptedNPair;
+ std::vector<float> m_mon_pairMass;
};
--
GitLab