diff --git a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/TrigEgammaMuonCombHypo/TrigEFElectronMuonAngleFexAlgo.h b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/TrigEgammaMuonCombHypo/TrigEFElectronMuonAngleFexAlgo.h index 36e07630216ca9013483c660e0a55db3976b8559..bc3b5faf759791a5e199fa85a2bb95dec7697def 100755 --- a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/TrigEgammaMuonCombHypo/TrigEFElectronMuonAngleFexAlgo.h +++ b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/TrigEgammaMuonCombHypo/TrigEFElectronMuonAngleFexAlgo.h @@ -110,8 +110,8 @@ private: ElectronMuonTopoInfoContainer* m_egMuTopoColl; //!< Pointer to ElectronMuonTopoInfoCollection - std::vector<const Rec::TrackParticle*> electronCollection; //!< In case more electrons will be present in input collections which would pass the cuts, store them all - std::vector<const Trk::Track*> muonCollection; //!<In case more electrons will be present in input collections which would pass the cuts, store them all + std::vector<const Rec::TrackParticle*> m_electronCollection; //!< In case more electrons will be present in input collections which would pass the cuts, store them all + std::vector<const Trk::Track*> m_muonCollection; //!<In case more electrons will be present in input collections which would pass the cuts, store them all }; diff --git a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFElectronMuonAngleFexAlgo.cxx b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFElectronMuonAngleFexAlgo.cxx index 9f99a85fa7636e7f87bb73a867ee0ff8ebb30d2d..f42294fe9220b04606e24acef08de065bb75c33b 100755 --- a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFElectronMuonAngleFexAlgo.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFElectronMuonAngleFexAlgo.cxx @@ -83,21 +83,21 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::hltInitialize() { if (msgLvl() <= MSG::VERBOSE) { - msg() << MSG::DEBUG << "Initialization:" << endreq; + msg() << MSG::DEBUG << "Initialization:" << endmsg; } if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Initialization completed successfully:" << endreq; + msg() << MSG::DEBUG << "Initialization completed successfully:" << endmsg; msg() << MSG::DEBUG << "AcceptAll = " - << (m_acceptAll==true ? "True" : "False") << endreq; + << (m_acceptAll==true ? "True" : "False") << endmsg; msg() << MSG::DEBUG << "Using Egamma 2010 recommendations = " - << (m_useRecommended==true ? "True" : "False") << endreq; + << (m_useRecommended==true ? "True" : "False") << endmsg; - msg() << MSG::DEBUG << "DeltaPhiCut = " << m_MaxDPhi << endreq; - msg() << MSG::DEBUG << "MaxDeltaRCut = " << m_MaxDR << endreq; - msg() << MSG::DEBUG << "LowerMassCut = " << m_lowerMassCut << endreq; - msg() << MSG::DEBUG << "UpperMassCut = " << m_upperMassCut << endreq; + msg() << MSG::DEBUG << "DeltaPhiCut = " << m_MaxDPhi << endmsg; + msg() << MSG::DEBUG << "MaxDeltaRCut = " << m_MaxDR << endmsg; + msg() << MSG::DEBUG << "LowerMassCut = " << m_lowerMassCut << endmsg; + msg() << MSG::DEBUG << "UpperMassCut = " << m_upperMassCut << endmsg; } return HLT::OK; @@ -107,7 +107,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::hltInitialize() HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::hltFinalize() { if ( msgLvl() <= MSG::INFO ) - msg() << MSG::INFO << "in finalize()" << endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; return HLT::OK; } @@ -121,14 +121,14 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp m_egMuTopoColl=0; m_electron=0; m_muon=0; - electronCollection.clear(); - muonCollection.clear(); + m_electronCollection.clear(); + m_muonCollection.clear(); // sanity checks if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "Running TrigEFElectronMuonAngleFexAlgo::acceptInputs" << endreq; + msg() << MSG::DEBUG << "Running TrigEFElectronMuonAngleFexAlgo::acceptInputs" << endmsg; if ( inputTE.size() != 2 ) { - msg() << MSG::ERROR << "Got diferent than 2 number of input TEs: " << inputTE.size() << " job badly configured" << endreq; + msg() << MSG::ERROR << "Got diferent than 2 number of input TEs: " << inputTE.size() << " job badly configured" << endmsg; return HLT::BAD_JOB_SETUP; } @@ -138,7 +138,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if (m_acceptAll) { if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "AcceptAll property is set: taking all events" - << endreq; + << endmsg; pass = true; return HLT::OK; @@ -146,7 +146,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp else { if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "AcceptAll property not set: applying selection" - << endreq; + << endmsg; } // this are 2 TEs which we eventually will combine @@ -159,12 +159,12 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp const TrigRoiDescriptor* roiDescriptor2 = 0; if ( getFeature(te1, roiDescriptor1) != HLT::OK || getFeature(te2, roiDescriptor2) != HLT::OK || roiDescriptor1==0 || roiDescriptor2==0) { if ( msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "No RoIDescriptors for this Trigger Elements! " << endreq; + msg() << MSG::WARNING << "No RoIDescriptors for this Trigger Elements! " << endmsg; } return HLT::MISSING_FEATURE; } else { if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "Trying to combine 2 RoIs: " << *roiDescriptor1 << " & " << *roiDescriptor2 << endreq; + msg() << MSG::DEBUG << "Trying to combine 2 RoIs: " << *roiDescriptor1 << " & " << *roiDescriptor2 << endmsg; } } @@ -179,18 +179,18 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp { if ( msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "Failed to get EF egamma collection" << endreq; + msg() << MSG::WARNING << "Failed to get EF egamma collection" << endmsg; } return HLT::MISSING_FEATURE; } else{ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "EF egamma collection successfully retrieved" << endreq; + msg() << MSG::DEBUG << "EF egamma collection successfully retrieved" << endmsg; } }else{ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "EF egamma collection successfully retrieved" << endreq; + msg() << MSG::DEBUG << "EF egamma collection successfully retrieved" << endmsg; } @@ -200,18 +200,18 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp { if ( msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "Failed to get EF MuidTrackContainer" << endreq; + msg() << MSG::WARNING << "Failed to get EF MuidTrackContainer" << endmsg; } return HLT::MISSING_FEATURE; } else{ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "EF MuidTrackContainer successfully retrieved with size " << MuEFTracksEF->size() << endreq; + msg() << MSG::DEBUG << "EF MuidTrackContainer successfully retrieved with size " << MuEFTracksEF->size() << endmsg; } }else{ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "EF MuidTrackContainer successfully retrieved with size " << MuEFTracksEF->size() << endreq; + msg() << MSG::DEBUG << "EF MuidTrackContainer successfully retrieved with size " << MuEFTracksEF->size() << endmsg; } @@ -224,7 +224,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp egammaContainer::const_iterator electron1; MuidTrackContainer::const_iterator tr; if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Size of electron container: " << electronContainer1->size() << " size of muon container " << MuEFTracksEF->size() << endreq; + msg() << MSG::VERBOSE << "Size of electron container: " << electronContainer1->size() << " size of muon container " << MuEFTracksEF->size() << endmsg; } int mu_count,el_count; mu_count=el_count=0; @@ -237,14 +237,14 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if((*electron1)==0) { - msg() << MSG::WARNING << "Null pointer in egammaContainer. Skipping." << endreq; + msg() << MSG::WARNING << "Null pointer in egammaContainer. Skipping." << endmsg; continue; } if((*electron1)->trackParticle()==0) { if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "No trackParticle attached to electron. Skipping" << endreq; + msg() << MSG::DEBUG << "No trackParticle attached to electron. Skipping" << endmsg; } continue; } @@ -252,20 +252,20 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp for ( tr = MuEFTracksEF->begin(); tr != MuEFTracksEF->end(); ++tr ) { if((*tr)==0) { - msg() << MSG::WARNING << "Null pointer in MuidTrackContainer. Skipping." << endreq; + msg() << MSG::WARNING << "Null pointer in MuidTrackContainer. Skipping." << endmsg; continue; } if((*tr)->indetTrack()==0) { if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "No indetTrack attached to muon. Skipping" << endreq; + msg() << MSG::DEBUG << "No indetTrack attached to muon. Skipping" << endmsg; } continue; } if(msgLvl() <= MSG::VERBOSE) { mu_count++; - msg() << MSG::VERBOSE << "Processing electron no. " << el_count << " and muon no. " << mu_count << endreq; + msg() << MSG::VERBOSE << "Processing electron no. " << el_count << " and muon no. " << mu_count << endmsg; } const Trk::Perigee* muon1 = (*tr)->indetTrack()->perigeeParameters(); @@ -278,7 +278,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if(( (*electron1)->trackParticle()->trackSummary()->get( Trk::numberOfPixelHits )+ (*electron1)->trackParticle()->trackSummary()->get( Trk::numberOfSCTHits )) < 4 ) { - msg() << MSG::WARNING << " Electron has less then 4 Silicon hits! Skipping " << endreq; + msg() << MSG::WARNING << " Electron has less then 4 Silicon hits! Skipping " << endmsg; continue; } @@ -294,7 +294,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp float mu_phi = muon1->parameters()[Trk::phi]; if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "New combination:" << endreq; + msg() << MSG::VERBOSE << "New combination:" << endmsg; msg() << MSG::VERBOSE << "egammaElectron: addr=" << (*electron1) << " et=" << (*electron1)->cluster()->e()/cosh((*electron1)->trackParticle()->eta()) << "; eta=" << (*electron1)->trackParticle()->eta() @@ -302,13 +302,13 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp << "; charge=" << (*electron1)->trackParticle()->charge() << "; #Silicon hits=" << (*electron1)->trackParticle()->trackSummary()->get( Trk::numberOfPixelHits )+ (*electron1)->trackParticle()->trackSummary()->get( Trk::numberOfSCTHits ) - << endreq; + << endmsg; msg() << MSG::VERBOSE << "muon: addr=" << muon1 << " et=" << muon1->pT() << "; eta=" << muon1->eta() << "; phi=" << mu_phi << "; charge=" << muon1->charge() - << endreq; + << endmsg; } @@ -321,7 +321,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Delta Phi between muon and electron is " << m_DPhi << - " and radial distance delta R is " << m_DR << endreq; + " and radial distance delta R is " << m_DR << endmsg; } m_monDPhiAll=m_DPhi; @@ -330,13 +330,13 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if(m_DPhi > m_MaxDPhi) { if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Combination failed Delta Phi cut" << endreq; + msg() << MSG::VERBOSE << "Combination failed Delta Phi cut" << endmsg; } delete EgMuTopoInfo; continue; }else{ if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Combination passed Delta Phi cut of " << m_MaxDPhi << endreq; + msg() << MSG::VERBOSE << "Combination passed Delta Phi cut of " << m_MaxDPhi << endmsg; } } @@ -350,13 +350,13 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp { if(m_DR > m_MaxDR) { if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Combination failed Delta R cut" << endreq; + msg() << MSG::VERBOSE << "Combination failed Delta R cut" << endmsg; } delete EgMuTopoInfo; continue; }else{ if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Combination passed Delta R cut of " << m_MaxDR << endreq; + msg() << MSG::VERBOSE << "Combination passed Delta R cut of " << m_MaxDR << endmsg; } } } @@ -371,12 +371,12 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp EgMuTopoInfo->SetOppositeCharge(false); if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Combination failed did not have opposite charge" << endreq; + msg() << MSG::VERBOSE << "Combination failed did not have opposite charge" << endmsg; } } else { if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination had opposite charge" - << endreq; + << endmsg; } EgMuTopoInfo->SetOppositeCharge(true); @@ -396,7 +396,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination failed mass cut: " << m_mass << " not in [" << m_lowerMassCut << "," - << m_upperMassCut << "]" << endreq; + << m_upperMassCut << "]" << endmsg; } delete EgMuTopoInfo; continue; @@ -409,27 +409,27 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination passed mass cut: " << m_lowerMassCut << " < " << m_mass << " < " - << m_upperMassCut << endreq; + << m_upperMassCut << endmsg; msg() << MSG::DEBUG << "Good combination found! Memu=" - << m_mass << " CLHEP::MeV" << endreq; + << m_mass << " CLHEP::MeV" << endmsg; } m_electron = (*electron1)->trackParticle(); m_muon = (*tr)->indetTrack(); - msg() << MSG::VERBOSE << " emu created " << endreq; - electronCollection.push_back(m_electron); - msg() << MSG::VERBOSE << " electron saved " << endreq; + msg() << MSG::VERBOSE << " emu created " << endmsg; + m_electronCollection.push_back(m_electron); + msg() << MSG::VERBOSE << " electron saved " << endmsg; - muonCollection.push_back(m_muon); + m_muonCollection.push_back(m_muon); if(msgLvl() <= MSG::DEBUG){ msg() << MSG::DEBUG << "Created following object: " << (*EgMuTopoInfo) << " and recorded electron at " << m_electron << " and muon at " << m_muon - << endreq; + << endmsg; } if ( !m_egMuTopoColl ) m_egMuTopoColl = new ElectronMuonTopoInfoContainer(); @@ -440,7 +440,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp } // muons container loop end } // electrons1 container loop end // set output TriggerElement true if good combination - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "pass = " << pass << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "pass = " << pass << endmsg; return HLT::OK; } @@ -463,7 +463,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& /*inp if(getFeatures(outputTE, vecIDTrakCont) != HLT::OK || vecIDTrakCont.size() == 0) { if ( msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "Failed to get vector of TrkParticleContainer" << endreq; + msg() << MSG::WARNING << "Failed to get vector of TrkParticleContainer" << endmsg; } return ElectronMuonTopoInfo::Unapplicable; } @@ -471,37 +471,37 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& /*inp if( vecIDTrakCont.size() != 1) { if ( msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "TrkParticleContainer does not have size 1! It has size " << vecIDTrakCont.size() << endreq; + msg() << MSG::DEBUG << "TrkParticleContainer does not have size 1! It has size " << vecIDTrakCont.size() << endmsg; } } else { if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "Obtained vector of TrkParticleContainer with size 1" << endreq; + msg() << MSG::DEBUG << "Obtained vector of TrkParticleContainer with size 1" << endmsg; } } int nTrkPartCollection = vecIDTrakCont.size(); bool sizeMatch = false; - if(m_egMuTopoColl==0 || electronCollection.size()==0 || muonCollection.size()==0){delete EgMuTopoInfo2; return HLT::OK;} - if(m_egMuTopoColl->size()== electronCollection.size() && electronCollection.size()==muonCollection.size()) + if(m_egMuTopoColl==0 || m_electronCollection.size()==0 || m_muonCollection.size()==0){delete EgMuTopoInfo2; return HLT::OK;} + if(m_egMuTopoColl->size()== m_electronCollection.size() && m_electronCollection.size()==m_muonCollection.size()) { - if(msgLvl() <= MSG::VERBOSE) msg() << MSG::VERBOSE << "Container sizes match and are " << m_egMuTopoColl->size() << endreq; + if(msgLvl() <= MSG::VERBOSE) msg() << MSG::VERBOSE << "Container sizes match and are " << m_egMuTopoColl->size() << endmsg; sizeMatch = true; }else{ if(msgLvl() <= MSG::WARNING){ msg() << MSG::WARNING << "Container sizes do not match and are: EmuTopoInfo (" << m_egMuTopoColl->size() - << "); electronColl(" << electronCollection.size() << "); muonColl(" - << muonCollection.size() << ")." - << endreq; + << "); electronColl(" << m_electronCollection.size() << "); muonColl(" + << m_muonCollection.size() << ")." + << endmsg; } } - ElectronMuonTopoInfoContainer::const_iterator egMuTopoInfo; + ElectronMuonTopoInfoContainer::iterator egMuTopoInfo; for ( egMuTopoInfo = m_egMuTopoColl->begin(); egMuTopoInfo != m_egMuTopoColl->end(); ++egMuTopoInfo ) { if((*egMuTopoInfo)==0) continue; if(!sizeMatch){(*egMuTopoInfo)->SetVertexState(2); continue;} int it = egMuTopoInfo - m_egMuTopoColl->begin(); - m_electron = electronCollection.at(it); - m_muon = muonCollection.at(it); + m_electron = m_electronCollection.at(it); + m_muon = m_muonCollection.at(it); if(m_electron==0 || m_muon ==0) continue; const Rec::TrackParticle* muonTP = 0; @@ -525,7 +525,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& /*inp } if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "Muon track at " << m_muon << " was matched to TrkParticle from collection no. " << iColl << " at address " << muonTP << endreq; + msg() << MSG::DEBUG << "Muon track at " << m_muon << " was matched to TrkParticle from collection no. " << iColl << " at address " << muonTP << endmsg; const Trk::Perigee* perigeeEL = m_trackToVertexTool->perigeeAtBeamspot(*m_electron); @@ -535,18 +535,18 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& /*inp if (perigeeEL==0) { - if(msgLvl() <= MSG::WARNING) msg() << MSG::WARNING <<"No electron perigee using beam spot; no z0 calculation"<<endreq; + if(msgLvl() <= MSG::WARNING) msg() << MSG::WARNING <<"No electron perigee using beam spot; no z0 calculation"<<endmsg; perigeeEL = m_trackToVertexTool->perigeeAtVertex(*m_electron, m_primaryVertex); } if (perigeeMU==0) { - if(msgLvl() <= MSG::WARNING) msg() << MSG::WARNING <<"No muon perigee using beam spot; no z0 calculation"<<endreq; + if(msgLvl() <= MSG::WARNING) msg() << MSG::WARNING <<"No muon perigee using beam spot; no z0 calculation"<<endmsg; perigeeMU = m_trackToVertexTool->perigeeAtVertex(*muonTP, m_primaryVertex); } if ( msgLvl() <= MSG::DEBUG ){ msg() << MSG::DEBUG << "Found perigee for electron at " << m_electron << ": " << perigeeEL << "; and for muon at " << muonTP << ": " << perigeeMU - << endreq; + << endmsg; } bool doDebug = false; @@ -557,31 +557,31 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& /*inp if (msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination failed vertex cut" - << endreq; + << endmsg; } } else if ( vx == ElectronMuonTopoInfo::Common ) { if (msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE - << "Combination passed vertex cut" << endreq; + << "Combination passed vertex cut" << endmsg; } } else { if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE - << "Bad track vertex errors: not applying cut" << endreq; + << "Bad track vertex errors: not applying cut" << endmsg; } } VX_state = vx; if (msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE - << "Vertex state is " << VX_state << " and the pull (distance/error) is " << pull << endreq; + << "Vertex state is " << VX_state << " and the pull (distance/error) is " << pull << endmsg; } (*egMuTopoInfo)->SetVertexState(VX_state); if(msgLvl() <= MSG::DEBUG){ msg() << MSG::DEBUG << "Updated following object: " << *(*egMuTopoInfo) << " at address " << (*egMuTopoInfo) - << endreq; + << endmsg; } } @@ -594,7 +594,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& /*inp m_monVxState = VX_state; if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Attaching electronMuonTopoInfoCollection of the length " << m_egMuTopoColl->size() << endreq; + msg() << MSG::VERBOSE << "Attaching electronMuonTopoInfoCollection of the length " << m_egMuTopoColl->size() << endmsg; } if(m_egMuTopoColl!=0) attachFeature(outputTE, m_egMuTopoColl, "EF_EgMuTopoFEX"); diff --git a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFElectronMuonAngleHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFElectronMuonAngleHypo.cxx index cfa419108c02e315769eff48a0e0d8df041833d5..f305fe7e3f45891aa6d9192bf31832842a82cb0c 100755 --- a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFElectronMuonAngleHypo.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFElectronMuonAngleHypo.cxx @@ -60,23 +60,23 @@ HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltInitialize() { if (msgLvl() <= MSG::VERBOSE) { - msg() << MSG::DEBUG << "Initialization:" << endreq; + msg() << MSG::DEBUG << "Initialization:" << endmsg; } if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Initialization completed successfully:" << endreq; - msg() << MSG::DEBUG << "Input collection label = <" << m_inputLabel << endreq; + msg() << MSG::DEBUG << "Initialization completed successfully:" << endmsg; + msg() << MSG::DEBUG << "Input collection label = <" << m_inputLabel << endmsg; msg() << MSG::DEBUG << "AcceptAll = " - << (m_acceptAll==true ? "True" : "False") << endreq; + << (m_acceptAll==true ? "True" : "False") << endmsg; msg() << MSG::DEBUG << "OppositeCharge = " - << (m_oppositeCharge==true ? "True" : "False") << endreq; + << (m_oppositeCharge==true ? "True" : "False") << endmsg; msg() << MSG::DEBUG << "CommonVertex = " - << (m_commonVertex==true ? "True" : "False") << endreq; - msg() << MSG::DEBUG << "DeltaPhiCut = " << m_MaxDPhi << endreq; - msg() << MSG::DEBUG << "DeltaRRange = <" << m_MinDR << " - " << m_MaxDR << " >" << endreq; - msg() << MSG::DEBUG << "LowerMassCut = " << m_lowerMassCut << endreq; - msg() << MSG::DEBUG << "UpperMassCut = " << m_upperMassCut << endreq; + << (m_commonVertex==true ? "True" : "False") << endmsg; + msg() << MSG::DEBUG << "DeltaPhiCut = " << m_MaxDPhi << endmsg; + msg() << MSG::DEBUG << "DeltaRRange = <" << m_MinDR << " - " << m_MaxDR << " >" << endmsg; + msg() << MSG::DEBUG << "LowerMassCut = " << m_lowerMassCut << endmsg; + msg() << MSG::DEBUG << "UpperMassCut = " << m_upperMassCut << endmsg; } return HLT::OK; @@ -86,7 +86,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltInitialize() HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltFinalize() { if ( msgLvl() <= MSG::INFO ) - msg() << MSG::INFO << "in finalize()" << endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; return HLT::OK; } @@ -107,17 +107,17 @@ HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement if ( getFeature(outputTE, EgMuTopoInfoColl) != HLT::OK || EgMuTopoInfoColl==0) { if ( msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "No mass information found for this trigger element! " << endreq; + msg() << MSG::WARNING << "No mass information found for this trigger element! " << endmsg; } return HLT::MISSING_FEATURE; } else { if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "ElectronMuonTopoInfoContainer successfully retrieved" << endreq; + msg() << MSG::DEBUG << "ElectronMuonTopoInfoContainer successfully retrieved" << endmsg; } if(m_acceptAll){ pass = true; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Force accept! pass = " << pass << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Force accept! pass = " << pass << endmsg; return HLT::OK; } @@ -128,7 +128,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement m_monCut = 1; if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Got electronMuonTopoInfoCollection of the length " << EgMuTopoInfoColl->size() << endreq; + msg() << MSG::VERBOSE << "Got electronMuonTopoInfoCollection of the length " << EgMuTopoInfoColl->size() << endmsg; } ElectronMuonTopoInfoContainer::const_iterator egMuTopoInfo; @@ -141,7 +141,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement oppositeCharge = (*egMuTopoInfo)->OppositeCharge(); if ( msgLvl() <= MSG::DEBUG ){ - msg() << MSG::DEBUG << "Object no. " << egMuTopoInfo - EgMuTopoInfoColl->begin() << ": Reading in mass and distance information from address " << (*egMuTopoInfo) << "; " << *(*egMuTopoInfo) << endreq; + msg() << MSG::DEBUG << "Object no. " << egMuTopoInfo - EgMuTopoInfoColl->begin() << ": Reading in mass and distance information from address " << (*egMuTopoInfo) << "; " << *(*egMuTopoInfo) << endmsg; } m_monDPhiAll=dphi; @@ -153,13 +153,13 @@ HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement { if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination did not pass opposite charge cut" - << endreq; + << endmsg; } continue; }else{ if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination passed opposite charge cut" - << endreq; + << endmsg; } } @@ -171,13 +171,13 @@ HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement { if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination does not form common vertex." - << endreq; + << endmsg; } continue; }else{ if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::DEBUG << "Combination passed common vertex cut with state " << VX_state - << endreq; + << endmsg; } } @@ -190,13 +190,13 @@ HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement if(dphi > m_MaxDPhi) { if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination failed dPhi cut: " - << dphi << " larger than " << m_MaxDPhi << endreq; + << dphi << " larger than " << m_MaxDPhi << endmsg; } continue; }else{ if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::DEBUG << "Combination passed delta phi cut: " - << dphi << " less than or equal to " << m_MaxDPhi << endreq; + << dphi << " less than or equal to " << m_MaxDPhi << endmsg; } m_monDPhiAccepted=dphi; @@ -207,13 +207,13 @@ HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement if(dr > m_MaxDR || dr < m_MinDR) { if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination failed dR cut: " - << dr << " outside < " << m_MinDR << "," << m_MaxDR << ">" << endreq; + << dr << " outside < " << m_MinDR << "," << m_MaxDR << ">" << endmsg; } continue; }else{ if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::DEBUG << "Combination passed delta R cut: " - << dr << " inside < " << m_MinDR << "," << m_MaxDR << ">" << endreq; } + << dr << " inside < " << m_MinDR << "," << m_MaxDR << ">" << endmsg; } m_monDRAccepted=dr; } @@ -227,7 +227,7 @@ HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination failed mass cut: " << mass << " not in [" << m_lowerMassCut << "," - << m_upperMassCut << "]" << endreq; + << m_upperMassCut << "]" << endmsg; } } else { // good combination found @@ -237,9 +237,9 @@ HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination passed mass cut: " << m_lowerMassCut << " < " << mass << " < " - << m_upperMassCut << endreq; + << m_upperMassCut << endmsg; msg() << MSG::DEBUG << "Good combination found! Memu=" - << mass << " CLHEP::MeV" << endreq; + << mass << " CLHEP::MeV" << endmsg; } } @@ -248,6 +248,6 @@ HLT::ErrorCode TrigEFElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement }//end of loop over ElectronMuonInfo objects // set output TriggerElement true if good combination - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "pass = " << pass << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "pass = " << pass << endmsg; return HLT::OK; } diff --git a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFPhotonMuonAngleFexAlgo.cxx b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFPhotonMuonAngleFexAlgo.cxx index 3d0ba36d0d60b5fac0af8746c3b232259fb0b260..ceab1f82b20925e0d54ae80b14643716a58f16e1 100755 --- a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFPhotonMuonAngleFexAlgo.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFPhotonMuonAngleFexAlgo.cxx @@ -59,7 +59,7 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltInitialize() { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Initialization:" << endreq; + msg() << MSG::DEBUG << "Initialization:" << endmsg; } @@ -70,7 +70,7 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltInitialize() HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltFinalize() { if ( msgLvl() <= MSG::INFO ) - msg() << MSG::INFO << "in finalize()" << endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; return HLT::OK; } @@ -84,10 +84,10 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& inputTE bool debug = msgLvl() <= MSG::DEBUG; // sanity checks - if ( debug ) msg() << MSG::DEBUG << "Running TrigEFPhotonMuonAngleFexAlgo" << endreq; + if ( debug ) msg() << MSG::DEBUG << "Running TrigEFPhotonMuonAngleFexAlgo" << endmsg; if ( inputTE.size() != 2 ) { - msg() << MSG::ERROR << "Got diferent than 2 number of input TEs: " << inputTE.size() << " job badly configured" << endreq; + msg() << MSG::ERROR << "Got diferent than 2 number of input TEs: " << inputTE.size() << " job badly configured" << endmsg; return HLT::BAD_JOB_SETUP; } @@ -101,11 +101,11 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& inputTE const TrigRoiDescriptor* roiDescriptor2 = 0; if ( getFeature(te1, roiDescriptor1) != HLT::OK || getFeature(te2, roiDescriptor2) != HLT::OK || roiDescriptor1==0 || roiDescriptor2==0) { if ( msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "No RoIDescriptors for this Trigger Elements! " << endreq; + msg() << MSG::DEBUG << "No RoIDescriptors for this Trigger Elements! " << endmsg; } } else { if ( debug ) - msg() << MSG::DEBUG << "Trying to combine 2 RoIs: " << *roiDescriptor1 << " & " << *roiDescriptor2 << endreq; + msg() << MSG::DEBUG << "Trying to combine 2 RoIs: " << *roiDescriptor1 << " & " << *roiDescriptor2 << endmsg; } } @@ -119,21 +119,21 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& inputTE { if ( msgLvl() <= MSG::WARNING) - msg() << MSG::WARNING << "Failed to get xAOD::PhotonContainer collection" << endreq; + msg() << MSG::WARNING << "Failed to get xAOD::PhotonContainer collection" << endmsg; return HLT::MISSING_FEATURE; } else{ if ( debug ) - msg() << MSG::DEBUG << "xAOD::PhotonContainer collection successfully retrieved" << endreq; + msg() << MSG::DEBUG << "xAOD::PhotonContainer collection successfully retrieved" << endmsg; } }else{ if ( debug ) - msg() << MSG::DEBUG << "xAOD::PhotonContainer collection successfully retrieved" << endreq; + msg() << MSG::DEBUG << "xAOD::PhotonContainer collection successfully retrieved" << endmsg; } if (vectorEgammaContainers.size() < 1) { - msg() << MSG::DEBUG << " empty xAOD::PhotonContainer from the trigger element" << endreq; + msg() << MSG::DEBUG << " empty xAOD::PhotonContainer from the trigger element" << endmsg; return HLT::OK; } const xAOD::PhotonContainer* photonContainer1 = vectorEgammaContainers.back();; @@ -148,17 +148,17 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& inputTE if(getFeature(te2, MuEFTracksEF) != HLT::OK || MuEFTracksEF == 0) { if ( msgLvl() <= MSG::WARNING) - msg() << MSG::WARNING << "Failed to get EF MuidTrackContainer" << endreq; + msg() << MSG::WARNING << "Failed to get EF MuidTrackContainer" << endmsg; return HLT::MISSING_FEATURE; } else{ if ( debug ) - msg() << MSG::DEBUG << "EF MuidTrackContainer successfully retrieved with size " << MuEFTracksEF->size() << endreq; + msg() << MSG::DEBUG << "EF MuidTrackContainer successfully retrieved with size " << MuEFTracksEF->size() << endmsg; } }else{ if ( debug ) - msg() << MSG::DEBUG << "EF MuidTrackContainer successfully retrieved with size " << MuEFTracksEF->size() << endreq; + msg() << MSG::DEBUG << "EF MuidTrackContainer successfully retrieved with size " << MuEFTracksEF->size() << endmsg; } @@ -169,7 +169,7 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& inputTE xAOD::PhotonContainer::const_iterator photon1; xAOD::MuonContainer::const_iterator muon; if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Size of photon container: " << photonContainer1->size() << " size of muon container " << MuEFTracksEF->size() << endreq; + msg() << MSG::VERBOSE << "Size of photon container: " << photonContainer1->size() << " size of muon container " << MuEFTracksEF->size() << endmsg; } int mu_count,el_count; mu_count=el_count=0; @@ -184,13 +184,13 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& inputTE if((*photon1)==0) { - msg() << MSG::WARNING << "Null pointer in egammaContainer. Skipping." << endreq; + msg() << MSG::WARNING << "Null pointer in egammaContainer. Skipping." << endmsg; continue; } const xAOD::CaloCluster* clus = (*photon1)->caloCluster(); if(!clus) { if(debug) - msg() << MSG::DEBUG << "REGTEST no cluster pointer in egamma object " << endreq; + msg() << MSG::DEBUG << "REGTEST no cluster pointer in egamma object " << endmsg; continue; } @@ -198,17 +198,17 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& inputTE mu_count++; if((*muon)==0) { - msg() << MSG::WARNING << "Null pointer in MuonContainer. Skipping." << endreq; + msg() << MSG::WARNING << "Null pointer in MuonContainer. Skipping." << endmsg; continue; } const xAOD::TrackParticle* muon1 = (*muon)->trackParticle(xAOD::Muon::CombinedTrackParticle); if (!muon1) { - if (debug) msg() << MSG::DEBUG << "No CombinedTrackParticle found." << endreq; + if (debug) msg() << MSG::DEBUG << "No CombinedTrackParticle found." << endmsg; continue; } if(msgLvl() <= MSG::VERBOSE) { mu_count++; - msg() << MSG::VERBOSE << "Processing photon no. " << el_count << " and muon no. " << mu_count << endreq; + msg() << MSG::VERBOSE << "Processing photon no. " << el_count << " and muon no. " << mu_count << endmsg; } @@ -217,18 +217,18 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& inputTE float mu_phi = muon1->phi(); if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "New combination:" << endreq; + msg() << MSG::VERBOSE << "New combination:" << endmsg; msg() << MSG::VERBOSE << "egammaPhoton: addr=" << (*photon1) << " et=" << clus->e()/cosh(clus->eta()) << "; eta=" << clus->eta() << "; phi=" << clus->phi() - << endreq; + << endmsg; msg() << MSG::VERBOSE << "muon: addr=" << muon1 << " et=" << muon1->pt() << "; eta=" << muon1->eta() << "; phi=" << mu_phi << "; charge=" << muon1->charge() - << endreq; + << endmsg; } @@ -254,7 +254,7 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& inputTE if(debug){ msg() << MSG::DEBUG << "Created following object: " << (*EgMuTopoInfo) - << endreq; + << endmsg; } egMuTopoColl->push_back(EgMuTopoInfo); @@ -265,13 +265,13 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& inputTE HLT::ErrorCode hltStatus = attachFeature(outputTE, egMuTopoColl, "HLT_PhotonMuonTopoFEX"); if (hltStatus != HLT::OK ){ - msg() << MSG::WARNING << "Write of ElectronMuonTopoInfo container to outputTE failed" << endreq; + msg() << MSG::WARNING << "Write of ElectronMuonTopoInfo container to outputTE failed" << endmsg; for(ElectronMuonTopoInfoContainer::iterator itr = egMuTopoColl->begin(); itr!=egMuTopoColl->end() ; ++itr) delete *itr; delete egMuTopoColl; return hltStatus; }else{ - if(debug) msg() << MSG::DEBUG << "successfully recorded EF_PhotonMuonTopoFEX" << endreq; + if(debug) msg() << MSG::DEBUG << "successfully recorded EF_PhotonMuonTopoFEX" << endmsg; } return HLT::OK; diff --git a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigL2ElectronMuonAngleFexAlgo.cxx b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigL2ElectronMuonAngleFexAlgo.cxx index ae1e5b1a00ce891f0fb5f40182d88316e86fbd12..666ddb33de139950b03fcf2b43d39c73f49257b5 100755 --- a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigL2ElectronMuonAngleFexAlgo.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigL2ElectronMuonAngleFexAlgo.cxx @@ -66,21 +66,21 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::hltInitialize() { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Initialization:" << endreq; + msg() << MSG::DEBUG << "Initialization:" << endmsg; } if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Initialization completed successfully:" << endreq; + msg() << MSG::DEBUG << "Initialization completed successfully:" << endmsg; msg() << MSG::DEBUG << "AcceptAll = " - << (m_acceptAll==true ? "True" : "False") << endreq; + << (m_acceptAll==true ? "True" : "False") << endmsg; msg() << MSG::DEBUG << "ValidElectron = " - << (m_electronValid==true ? "True" : "False") << endreq; - msg() << MSG::DEBUG << "DeltaPhiCut = " << m_MaxDPhi << endreq; - msg() << MSG::DEBUG << "DeltaPhiCut = " << m_MaxDPhi << endreq; - msg() << MSG::DEBUG << "MaxDeltaRCut = " << m_MaxDR << endreq; - msg() << MSG::DEBUG << "LowerMassCut = " << m_lowerMassCut << endreq; - msg() << MSG::DEBUG << "UpperMassCut = " << m_upperMassCut << endreq; + << (m_electronValid==true ? "True" : "False") << endmsg; + msg() << MSG::DEBUG << "DeltaPhiCut = " << m_MaxDPhi << endmsg; + msg() << MSG::DEBUG << "DeltaPhiCut = " << m_MaxDPhi << endmsg; + msg() << MSG::DEBUG << "MaxDeltaRCut = " << m_MaxDR << endmsg; + msg() << MSG::DEBUG << "LowerMassCut = " << m_lowerMassCut << endmsg; + msg() << MSG::DEBUG << "UpperMassCut = " << m_upperMassCut << endmsg; } return HLT::OK; @@ -90,7 +90,7 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::hltInitialize() HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::hltFinalize() { if ( msgLvl() <= MSG::INFO ) - msg() << MSG::INFO << "in finalize()" << endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; return HLT::OK; } @@ -104,10 +104,10 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp // sanity checks if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "Running TrigL2ElectronMuonAngleFexAlgo::acceptInputs" << endreq; + msg() << MSG::DEBUG << "Running TrigL2ElectronMuonAngleFexAlgo::acceptInputs" << endmsg; if ( inputTE.size() != 2 ) { - msg() << MSG::ERROR << "Got diferent than 2 number of input TEs: " << inputTE.size() << " job badly configured" << endreq; + msg() << MSG::ERROR << "Got diferent than 2 number of input TEs: " << inputTE.size() << " job badly configured" << endmsg; return HLT::BAD_JOB_SETUP; } @@ -117,7 +117,7 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if (m_acceptAll) { if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "AcceptAll property is set: taking all events" - << endreq; + << endmsg; pass = true; return HLT::OK; @@ -125,7 +125,7 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp else { if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "AcceptAll property not set: applying selection" - << endreq; + << endmsg; } // this are 2 TEs which we eventually will combine @@ -138,12 +138,12 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp const TrigRoiDescriptor* roiDescriptor2 = 0; if ( getFeature(te1, roiDescriptor1) != HLT::OK || getFeature(te2, roiDescriptor2) != HLT::OK || roiDescriptor1==0 || roiDescriptor2==0) { if ( msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "No RoIDescriptors for this Trigger Elements! " << endreq; + msg() << MSG::WARNING << "No RoIDescriptors for this Trigger Elements! " << endmsg; } return HLT::MISSING_FEATURE; } else { if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "Trying to combine 2 RoIs: " << *roiDescriptor1 << " & " << *roiDescriptor2 << endreq; + msg() << MSG::DEBUG << "Trying to combine 2 RoIs: " << *roiDescriptor1 << " & " << *roiDescriptor2 << endmsg; } } @@ -158,18 +158,18 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp { if ( msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "Failed to get TrigElectron collection" << endreq; + msg() << MSG::WARNING << "Failed to get TrigElectron collection" << endmsg; } return HLT::MISSING_FEATURE; } else{ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "TrigElectron collection successfully retrieved" << endreq; + msg() << MSG::DEBUG << "TrigElectron collection successfully retrieved" << endmsg; } }else{ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "TrigElectron collection successfully retrieved" << endreq; + msg() << MSG::DEBUG << "TrigElectron collection successfully retrieved" << endmsg; } // retrieving muons if ( getFeatures(te1, muonContainer1) != HLT::OK || muonContainer1.size() == 0) @@ -178,23 +178,23 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp { if ( msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "Failed to get MuonCombinedFeature collection" << endreq; + msg() << MSG::WARNING << "Failed to get MuonCombinedFeature collection" << endmsg; } return HLT::MISSING_FEATURE; } else{ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "MuonCombinedFeature collection successfully retrieved" << endreq; + msg() << MSG::DEBUG << "MuonCombinedFeature collection successfully retrieved" << endmsg; } }else{ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "MuonCombinedFeature collection successfully retrieved" << endreq; + msg() << MSG::DEBUG << "MuonCombinedFeature collection successfully retrieved" << endmsg; } if(m_acceptAll){ pass = true; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Force accept! pass = " << pass << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Force accept! pass = " << pass << endmsg; return HLT::OK; } @@ -208,7 +208,7 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp for ( electron1 = electronContainer1->begin(); electron1 != electronContainer1->end(); ++electron1 ) { if((*electron1)==0) { - msg() << MSG::WARNING << "Null pointer in TrigElectronContainer. Skipping." << endreq; + msg() << MSG::WARNING << "Null pointer in TrigElectronContainer. Skipping." << endmsg; continue; } for ( muon1 = muonContainer1.begin(); muon1 != muonContainer1.end(); ++muon1 ) { @@ -216,14 +216,14 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if((*muon1)==0) { - msg() << MSG::WARNING << "Null pointer in CombinedMuonFeature vector. Skipping." << endreq; + msg() << MSG::WARNING << "Null pointer in CombinedMuonFeature vector. Skipping." << endmsg; continue; } if((*muon1)->IDTrack()==0) { if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Null pointer to IDTrack from muon. Skipping." << endreq; + msg() << MSG::DEBUG << "Null pointer to IDTrack from muon. Skipping." << endmsg; } continue; } @@ -235,7 +235,7 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "New combination:" << endreq; + msg() << MSG::VERBOSE << "New combination:" << endmsg; msg() << MSG::VERBOSE << "1st TrigElectron: addr=" << (*electron1) << ((*electron1)->isValid() ? "(valid" : "(not valid") << ") RoI id="<< (*electron1)->roiId() @@ -243,12 +243,12 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp << "; eta=" << (*electron1)->eta() <<"+-"<< (*electron1)->err_eta() << "; phi=" << (*electron1)->phi() <<"+-"<< (*electron1)->err_phi() << "; Zvtx=" << (*electron1)->Zvtx()<<"+-"<< (*electron1)->err_Zvtx() - << endreq; + << endmsg; msg() << MSG::VERBOSE << "1st CombinedMuonFeature: addr=" << (*muon1) << " pt=" << 1/(*muon1)->ptq() << " trkAddr=" << (*muon1)->IDTrack() << " " << *(*muon1) << "; Zvtx =" << (*muon1)->IDTrack()->param()->z0() << "+-" << (*muon1)->IDTrack()->param()->ez0() - << endreq; + << endmsg; } EgMuTopoInfo->SetRoiWord((*electron1)->roiId()); @@ -261,7 +261,7 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if ( !(*electron1)->isValid() ) { if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "TrigElectron not valid: rejecting combination" << endreq; + msg() << MSG::VERBOSE << "TrigElectron not valid: rejecting combination" << endmsg; } delete EgMuTopoInfo; continue; // reject non-valid TrigElectrons if cut is on @@ -277,7 +277,7 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Delta Phi between muon and electron is " << m_DPhi << - " and radial distance delta R is " << m_DR << endreq; + " and radial distance delta R is " << m_DR << endmsg; } m_monDPhiAll=m_DPhi; @@ -286,13 +286,13 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if(m_DPhi > m_MaxDPhi) { if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Combination failed Delta Phi cut" << endreq; + msg() << MSG::VERBOSE << "Combination failed Delta Phi cut" << endmsg; } delete EgMuTopoInfo; continue; }else{ if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Combination passed Delta Phi cut of " << m_MaxDPhi << endreq; + msg() << MSG::VERBOSE << "Combination passed Delta Phi cut of " << m_MaxDPhi << endmsg; } } @@ -306,13 +306,13 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp { if(m_DR > m_MaxDR) { if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Combination failed Delta R cut" << endreq; + msg() << MSG::VERBOSE << "Combination failed Delta R cut" << endmsg; } delete EgMuTopoInfo; continue; }else{ if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Combination passed Delta R cut of " << m_MaxDR << endreq; + msg() << MSG::VERBOSE << "Combination passed Delta R cut of " << m_MaxDR << endmsg; } } } @@ -329,14 +329,14 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp // note: track charge can be zero (unknown) so must use > and not >= if ( ! EgMuTopoInfo->opositeCharge(*electron1, *muon1) ) { if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Combination does not have opposite charge" << endreq; + msg() << MSG::VERBOSE << "Combination does not have opposite charge" << endmsg; EgMuTopoInfo->SetOppositeCharge(false); } } else { if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination has opposite charge" - << endreq; + << endmsg; EgMuTopoInfo->SetOppositeCharge(true); } } @@ -355,18 +355,18 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if (msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination failed vertex cut" - << endreq; + << endmsg; } } else if ( vx == ElectronMuonTopoInfo::Common ) { if (msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE - << "Combination passed vertex cut" << endreq; + << "Combination passed vertex cut" << endmsg; } } else { if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE - << "Bad track vertex errors: not applying cut" << endreq; + << "Bad track vertex errors: not applying cut" << endmsg; } } EgMuTopoInfo->SetVertexState(vx); @@ -381,7 +381,7 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination failed mass cut: " << m_mass << " not in [" << m_lowerMassCut << "," - << m_upperMassCut << "]" << endreq; + << m_upperMassCut << "]" << endmsg; } delete EgMuTopoInfo; continue; @@ -394,16 +394,16 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination passed mass cut: " << m_lowerMassCut << " < " << m_mass << " < " - << m_upperMassCut << endreq; + << m_upperMassCut << endmsg; msg() << MSG::DEBUG << "Good combination found! Memu=" - << m_mass << " CLHEP::MeV" << endreq; + << m_mass << " CLHEP::MeV" << endmsg; } } if(msgLvl() <= MSG::DEBUG){ msg() << MSG::DEBUG << "Created following object: " << (*EgMuTopoInfo) - << endreq; + << endmsg; } if ( !m_egMuTopoColl ) m_egMuTopoColl = new ElectronMuonTopoInfoContainer(); @@ -413,13 +413,13 @@ HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::acceptInputs(HLT::TEConstVec& inp } // electrons2 container loop end } // electrons1 container loop end // set output TriggerElement true if good combination - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "pass = " << pass << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "pass = " << pass << endmsg; return HLT::OK; } HLT::ErrorCode TrigL2ElectronMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& /*inputTE*/, HLT::TriggerElement* outputTE){ if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Attaching electronMuonTopoInfoCollection of the length " << m_egMuTopoColl->size() << endreq; + msg() << MSG::VERBOSE << "Attaching electronMuonTopoInfoCollection of the length " << m_egMuTopoColl->size() << endmsg; } if(m_egMuTopoColl!=0) attachFeature(outputTE, m_egMuTopoColl, "EgMuTopoFEX"); diff --git a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigL2ElectronMuonAngleHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigL2ElectronMuonAngleHypo.cxx index 92f5c1194b239a7ddbfa251c9597fea38d435a46..96999ed03f90090e789751a3a6f2ae8d013eca93 100755 --- a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigL2ElectronMuonAngleHypo.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigL2ElectronMuonAngleHypo.cxx @@ -78,23 +78,23 @@ HLT::ErrorCode TrigL2ElectronMuonAngleHypo::hltInitialize() { if (msgLvl() <= MSG::VERBOSE) { - msg() << MSG::DEBUG << "Initialization:" << endreq; + msg() << MSG::DEBUG << "Initialization:" << endmsg; } if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Initialization completed successfully:" << endreq; + msg() << MSG::DEBUG << "Initialization completed successfully:" << endmsg; msg() << MSG::DEBUG << "AcceptAll = " - << (m_acceptAll==true ? "True" : "False") << endreq; - msg() << MSG::DEBUG << "Input Collection has label " << m_inputLabel << endreq; - msg() << MSG::DEBUG << "DeltaPhiCut = " << m_MaxDPhi << endreq; - msg() << MSG::DEBUG << "DeltaRRange = <" << m_MinDR << " - " << m_MaxDR << " >" << endreq; - msg() << MSG::DEBUG << "LowerMassCut = " << m_lowerMassCut << endreq; - msg() << MSG::DEBUG << "UpperMassCut = " << m_upperMassCut << endreq; + << (m_acceptAll==true ? "True" : "False") << endmsg; + msg() << MSG::DEBUG << "Input Collection has label " << m_inputLabel << endmsg; + msg() << MSG::DEBUG << "DeltaPhiCut = " << m_MaxDPhi << endmsg; + msg() << MSG::DEBUG << "DeltaRRange = <" << m_MinDR << " - " << m_MaxDR << " >" << endmsg; + msg() << MSG::DEBUG << "LowerMassCut = " << m_lowerMassCut << endmsg; + msg() << MSG::DEBUG << "UpperMassCut = " << m_upperMassCut << endmsg; msg() << MSG::DEBUG << "OppositeCharge = " - << (m_oppositeCharge==true ? "True" : "False") << endreq; + << (m_oppositeCharge==true ? "True" : "False") << endmsg; msg() << MSG::DEBUG << "CommonVertex = " - << (m_commonVertex==true ? "True" : "False") << endreq; + << (m_commonVertex==true ? "True" : "False") << endmsg; } @@ -105,7 +105,7 @@ HLT::ErrorCode TrigL2ElectronMuonAngleHypo::hltInitialize() HLT::ErrorCode TrigL2ElectronMuonAngleHypo::hltFinalize() { if ( msgLvl() <= MSG::INFO ) - msg() << MSG::INFO << "in finalize()" << endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; return HLT::OK; } @@ -126,19 +126,19 @@ HLT::ErrorCode TrigL2ElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement if ( getFeature(outputTE, EgMuTopoInfoColl, m_inputLabel ) != HLT::OK || EgMuTopoInfoColl==0) { if ( msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "No mass information found for this trigger element woth label " << m_inputLabel << endreq; + msg() << MSG::WARNING << "No mass information found for this trigger element woth label " << m_inputLabel << endmsg; } return HLT::MISSING_FEATURE; } else { if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "ElectronMuonTopoInfoContainer successfully retrieved" << endreq; + msg() << MSG::DEBUG << "ElectronMuonTopoInfoContainer successfully retrieved" << endmsg; } if(m_acceptAll){ pass = true; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Force accept! pass = " << pass << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Force accept! pass = " << pass << endmsg; return HLT::OK; } @@ -147,7 +147,7 @@ HLT::ErrorCode TrigL2ElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement m_monCut = 1; if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "Got electronMuonTopoInfoCollection of the length " << EgMuTopoInfoColl->size() << endreq; + msg() << MSG::VERBOSE << "Got electronMuonTopoInfoCollection of the length " << EgMuTopoInfoColl->size() << endmsg; } ElectronMuonTopoInfoContainer::const_iterator egMuTopoInfo; @@ -159,7 +159,7 @@ HLT::ErrorCode TrigL2ElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement oppositeCharge = (*egMuTopoInfo)->OppositeCharge(); VX_state = (*egMuTopoInfo)->VertexState(); if ( msgLvl() <= MSG::DEBUG ){ - msg() << MSG::DEBUG << "Object no. " << egMuTopoInfo - EgMuTopoInfoColl->begin() << ": Reading in mass and distance information from address " << (*egMuTopoInfo) << "; " << *(*egMuTopoInfo) << endreq; + msg() << MSG::DEBUG << "Object no. " << egMuTopoInfo - EgMuTopoInfoColl->begin() << ": Reading in mass and distance information from address " << (*egMuTopoInfo) << "; " << *(*egMuTopoInfo) << endmsg; } @@ -174,13 +174,13 @@ HLT::ErrorCode TrigL2ElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement { if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination did not pass opposite charge cut" - << endreq; + << endmsg; } continue; }else{ if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination passed opposite charge cut" - << endreq; + << endmsg; } } @@ -194,13 +194,13 @@ HLT::ErrorCode TrigL2ElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement { if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination does not form common vertex." - << endreq; + << endmsg; } continue; }else{ if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::DEBUG << "Combination passed common vertex cut with state " << VX_state - << endreq; + << endmsg; } } @@ -210,13 +210,13 @@ HLT::ErrorCode TrigL2ElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement if(dphi > m_MaxDPhi) { if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination failed dPhi cut: " - << dphi << " larger than " << m_MaxDPhi << endreq; + << dphi << " larger than " << m_MaxDPhi << endmsg; } continue; }else{ if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::DEBUG << "Combination passed delta phi cut: " - << dphi << " less than or equal to " << m_MaxDPhi << endreq; + << dphi << " less than or equal to " << m_MaxDPhi << endmsg; } m_monDPhiAccepted=dphi; @@ -228,13 +228,13 @@ HLT::ErrorCode TrigL2ElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement if(dr > m_MaxDR || dr < m_MinDR) { if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination failed dR cut: " - << dr << " outside < " << m_MinDR << "," << m_MaxDR << ">" << endreq; + << dr << " outside < " << m_MinDR << "," << m_MaxDR << ">" << endmsg; } continue; }else{ if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::DEBUG << "Combination passed delta R cut: " - << dr << " inside < " << m_MinDR << "," << m_MaxDR << ">" << endreq; } + << dr << " inside < " << m_MinDR << "," << m_MaxDR << ">" << endmsg; } m_monDRAccepted=dr; } @@ -247,7 +247,7 @@ HLT::ErrorCode TrigL2ElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination failed mass cut: " << mass << " not in [" << m_lowerMassCut << "," - << m_upperMassCut << "]" << endreq; + << m_upperMassCut << "]" << endmsg; } continue; } else { @@ -258,16 +258,16 @@ HLT::ErrorCode TrigL2ElectronMuonAngleHypo::hltExecute(const HLT::TriggerElement if(msgLvl() <= MSG::VERBOSE) { msg() << MSG::VERBOSE << "Combination passed mass cut: " << m_lowerMassCut << " < " << mass << " < " - << m_upperMassCut << endreq; + << m_upperMassCut << endmsg; msg() << MSG::DEBUG << "Good combination found! Memu=" - << mass << " CLHEP::MeV" << endreq; + << mass << " CLHEP::MeV" << endmsg; } } }//end of loop over egMuTopoInfo objects - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "pass = " << pass << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "pass = " << pass << endmsg; return HLT::OK; } diff --git a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigL2PhotonMuonAngleFexAlgo.cxx b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigL2PhotonMuonAngleFexAlgo.cxx index a98d7a9f19532464540e93345ec3f2f962b18c8e..cc280fca46b873bd074f59d68fb59e59db194341 100755 --- a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigL2PhotonMuonAngleFexAlgo.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigL2PhotonMuonAngleFexAlgo.cxx @@ -66,7 +66,7 @@ HLT::ErrorCode TrigL2PhotonMuonAngleFexAlgo::hltInitialize() HLT::ErrorCode TrigL2PhotonMuonAngleFexAlgo::hltFinalize() { if ( msgLvl() <= MSG::INFO ) - msg() << MSG::INFO << "in finalize()" << endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; return HLT::OK; } @@ -80,10 +80,10 @@ HLT::ErrorCode TrigL2PhotonMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& inputTE // sanity checks if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "Running TrigL2PhotonMuonAngleFexAlgo::hltExecute" << endreq; + msg() << MSG::DEBUG << "Running TrigL2PhotonMuonAngleFexAlgo::hltExecute" << endmsg; if ( inputTE.size() != 2 ) { - msg() << MSG::ERROR << "Got diferent than 2 number of input TEs: " << inputTE.size() << " job badly configured" << endreq; + msg() << MSG::ERROR << "Got diferent than 2 number of input TEs: " << inputTE.size() << " job badly configured" << endmsg; return HLT::BAD_JOB_SETUP; } @@ -104,18 +104,18 @@ if ( inputTE.size() != 2 ) { { if ( msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "Failed to get TrigPhoton collection" << endreq; + msg() << MSG::WARNING << "Failed to get TrigPhoton collection" << endmsg; } return HLT::MISSING_FEATURE; } else{ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "TrigPhoton collection successfully retrieved" << endreq; + msg() << MSG::DEBUG << "TrigPhoton collection successfully retrieved" << endmsg; } }else{ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "TrigPhoton collection successfully retrieved" << endreq; + msg() << MSG::DEBUG << "TrigPhoton collection successfully retrieved" << endmsg; } // retrieving muons if ( getFeatures(te1, muonContainer1) != HLT::OK || muonContainer1.size() == 0) @@ -124,18 +124,18 @@ if ( inputTE.size() != 2 ) { { if ( msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "Failed to get MuonCombinedFeature collection" << endreq; + msg() << MSG::WARNING << "Failed to get MuonCombinedFeature collection" << endmsg; } return HLT::MISSING_FEATURE; } else{ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "MuonCombinedFeature collection successfully retrieved" << endreq; + msg() << MSG::DEBUG << "MuonCombinedFeature collection successfully retrieved" << endmsg; } }else{ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "MuonCombinedFeature collection successfully retrieved" << endreq; + msg() << MSG::DEBUG << "MuonCombinedFeature collection successfully retrieved" << endmsg; } // now we have 2 bunches of leptons and we need to find out whether they can form topological combination @@ -145,25 +145,25 @@ if ( inputTE.size() != 2 ) { for ( photon1 = photonContainer1->begin(); photon1 != photonContainer1->end(); ++photon1 ) { if((*photon1)==0) { - msg() << MSG::WARNING << "Null pointer in TrigPhotonContainer. Skipping." << endreq; + msg() << MSG::WARNING << "Null pointer in TrigPhotonContainer. Skipping." << endmsg; continue; } if ( !(*photon1)->isValid() ) { - msg() << MSG::DEBUG << "Photon is not valid" << endreq; + msg() << MSG::DEBUG << "Photon is not valid" << endmsg; continue; } for ( muon1 = muonContainer1.begin(); muon1 != muonContainer1.end(); ++muon1 ) { if((*muon1)==0) { - msg() << MSG::WARNING << "Null pointer in CombinedMuonFeature vector. Skipping." << endreq; + msg() << MSG::WARNING << "Null pointer in CombinedMuonFeature vector. Skipping." << endmsg; continue; } if((*muon1)->IDTrack()==0) { if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Null pointer to IDTrack from muon. Skipping." << endreq; + msg() << MSG::DEBUG << "Null pointer to IDTrack from muon. Skipping." << endmsg; } continue; } @@ -172,19 +172,19 @@ if ( inputTE.size() != 2 ) { if(msgLvl() <= MSG::VERBOSE) { - msg() << MSG::VERBOSE << "New combination:" << endreq; + msg() << MSG::VERBOSE << "New combination:" << endmsg; msg() << MSG::VERBOSE << "1st TrigPhoton: addr=" << (*photon1) << ((*photon1)->isValid() ? "(valid" : "(not valid") << ") RoI id="<< (*photon1)->roiId() << "; pt=" << (*photon1)->pt() << "; eta=" << (*photon1)->eta() << "; phi=" << (*photon1)->phi() - << endreq; + << endmsg; msg() << MSG::VERBOSE << "1st CombinedMuonFeature: addr=" << (*muon1) << " pt=" << 1/(*muon1)->ptq() << " trkAddr=" << (*muon1)->IDTrack() << " " << *(*muon1) << "; Zvtx =" << (*muon1)->IDTrack()->param()->z0() << "+-" << (*muon1)->IDTrack()->param()->ez0() - << endreq; + << endmsg; } EgMuTopoInfo->SetRoiWord((*photon1)->roiId()); EgMuTopoInfo->SetElecValid(true); @@ -208,7 +208,7 @@ if ( inputTE.size() != 2 ) { if(msgLvl() <= MSG::DEBUG){ msg() << MSG::DEBUG << "Created following object: " << (*EgMuTopoInfo) - << endreq; + << endmsg; } @@ -219,13 +219,13 @@ if ( inputTE.size() != 2 ) { HLT::ErrorCode hltStatus = attachFeature(outputTE, egMuTopoColl, "L2_PhotonMuonTopoFEX"); if (hltStatus != HLT::OK ){ - msg() << MSG::WARNING << "Write of ElectronMuonTopoInfo container to outputTE failed" << endreq; + msg() << MSG::WARNING << "Write of ElectronMuonTopoInfo container to outputTE failed" << endmsg; for(ElectronMuonTopoInfoContainer::iterator itr = egMuTopoColl->begin(); itr!=egMuTopoColl->end() ; ++itr) delete *itr; delete egMuTopoColl; return hltStatus; }else{ - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "successfully recorded L2_PhotonMuonTopoFEX" << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "successfully recorded L2_PhotonMuonTopoFEX" << endmsg; } // set output TriggerElement true if good combination