diff --git a/Trigger/TrigHypothesis/TrigHIHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigHIHypo/CMakeLists.txt
index 81ba8a678eec36aac503602deb820886a8588e36..e6ba875b48e5f72419353d7ead0abd4739e98fe8 100644
--- a/Trigger/TrigHypothesis/TrigHIHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigHIHypo/CMakeLists.txt
@@ -14,6 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
Calorimeter/CaloEvent
Calorimeter/CaloInterface
Control/AthenaBaseComps
+ Control/AthenaKernel
Event/xAOD/xAODHIEvent
Event/xAOD/xAODMuon
Event/xAOD/xAODTracking
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/cmt/requirements b/Trigger/TrigHypothesis/TrigHIHypo/cmt/requirements
index b8fd63a5ef1f3ab9723185cacf8dd83c9cd981fa..5bddbae22923790c2b693fa30f1d4d9ca11cb257 100755
--- a/Trigger/TrigHypothesis/TrigHIHypo/cmt/requirements
+++ b/Trigger/TrigHypothesis/TrigHIHypo/cmt/requirements
@@ -31,6 +31,7 @@ use CaloEvent CaloEvent-* Calorimeter
use CaloInterface CaloInterface-* Calorimeter
use HIGlobal HIGlobal-* Reconstruction/HeavyIonRec
use AthenaBaseComps AthenaBaseComps-* Control
+use AthenaKernel AthenaKernel-* Control
use xAODHIEvent xAODHIEvent-* Event/xAOD
use xAODMuon xAODMuon-* Event/xAOD
use xAODTracking xAODTracking-* Event/xAOD
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/python/VnHypos.py b/Trigger/TrigHypothesis/TrigHIHypo/python/VnHypos.py
index 60fb061bf380fc784389d88873bb36ac87c8469a..da0a52862d9b3f3b3b47eada59871c7619482d9f 100644
--- a/Trigger/TrigHypothesis/TrigHIHypo/python/VnHypos.py
+++ b/Trigger/TrigHypothesis/TrigHIHypo/python/VnHypos.py
@@ -60,7 +60,7 @@ class QZeroMonitoring(TrigGenericMonitoringToolConfig):
_EtCuts_v2=[ x*1e-3 for x in reversed(range(300, 6050, 50)) ] # equidistant bins
_EtCuts_v3=[ x*1e-3 for x in reversed(range(400, 6050, 50)) ]
-_EtCuts_v2_assym = [ x*1e-3 for x in reversed(range(100, 303, 2))]
+_EtCuts_v2_assym = [ x*1e-3 for x in reversed(range(100, 553, 2))]
########################################################################################
# V2
@@ -138,13 +138,13 @@ class V2HypoAssym(VnHypo):
self.CentralityBins = _EtCuts_v2_assym
if side == "A":
self.MinEta=3.2
- self.QxShifts = [0.00289428]*len(_EtCuts_v2_assym)
- self.QyShifts = [0.00369803]*len(_EtCuts_v2_assym)
+ self.QxShifts = [0.00171448]*len(_EtCuts_v2_assym)
+ self.QyShifts = [0.00382335]*len(_EtCuts_v2_assym)
elif side == "C":
self.MaxEta=-3.2
- self.QxShifts = [-0.0015]*len(_EtCuts_v2_assym)
- self.QyShifts = [0.0039]*len(_EtCuts_v2_assym)
+ self.QxShifts = [0.00217681]*len(_EtCuts_v2_assym)
+ self.QyShifts = [-0.00227773]*len(_EtCuts_v2_assym) # what a precission! :-) this is copy paste
else:
raise 'The V2 hypothesis algorithm is insufficiently configured, no FCal side specified '
@@ -212,25 +212,25 @@ V2C_th0p.QThresholds = generateAssymVnThresholds( 10, 0, _EtCuts_v2_assym)
V2C_th0p.AthenaMonTools += [ VnBootstrap(name="VnBootstrap", harmonic=2), QZeroMonitoring(name="QZeroMonitoring", harmonic=2, qmax=2) ]
V2C_th005p = V2HypoAssym("V2C_th005p", "C")
-V2C_th005p.QThresholds = generateAssymVnThresholds( 0.3043, -7.20e-07 , _EtCuts_v2_assym)
+V2C_th005p.QThresholds = generateAssymVnThresholds( 0.316655, -8.2129e-07 , _EtCuts_v2_assym)
V2C_th01p = V2HypoAssym("V2C_th01p", "C")
-V2C_th01p.QThresholds = generateAssymVnThresholds( 0.280792, -6.50e-07, _EtCuts_v2_assym)
+V2C_th01p.QThresholds = generateAssymVnThresholds( 0.273325, -6.05744e-07, _EtCuts_v2_assym)
V2C_th025p = V2HypoAssym("V2C_th025p", "C")
-V2C_th025p.QThresholds = generateAssymVnThresholds( 0.22820, -4.09e-07, _EtCuts_v2_assym)
+V2C_th025p.QThresholds = generateAssymVnThresholds( 0.228979, -4.38362e-07, _EtCuts_v2_assym)
V2C_th05p = V2HypoAssym("V2C_th05p", "C")
-V2C_th05p.QThresholds = generateAssymVnThresholds( 0.194324, -2.90e-07, _EtCuts_v2_assym)
+V2C_th05p.QThresholds = generateAssymVnThresholds( 0.208411, -4.26355e-07, _EtCuts_v2_assym)
V2C_th10p = V2HypoAssym("V2C_th10p", "C")
-V2C_th10p.QThresholds = generateAssymVnThresholds( 0.174735, -2.93e-07, _EtCuts_v2_assym)
+V2C_th10p.QThresholds = generateAssymVnThresholds( 0.18202, -3.76357e-07, _EtCuts_v2_assym)
V2C_th15p = V2HypoAssym("V2C_th15p", "C")
-V2C_th15p.QThresholds = generateAssymVnThresholds( 0.151147, -2.12e-07, _EtCuts_v2_assym)
+V2C_th15p.QThresholds = generateAssymVnThresholds( 0.164986, -3.42278e-07, _EtCuts_v2_assym)
V2C_th20p = V2HypoAssym("V2C_th20p", "C")
-V2C_th20p.QThresholds = generateAssymVnThresholds( 0.140162, -2.03e-07, _EtCuts_v2_assym)
+V2C_th20p.QThresholds = generateAssymVnThresholds( 0.151113, -3.11194e-07, _EtCuts_v2_assym)
V2C_thresholds = {"1": V2C_th1, "2": V2C_th2, "3": V2C_th3,
"0p": V2C_th0p,
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/ElectronUEMonitoring.cxx b/Trigger/TrigHypothesis/TrigHIHypo/src/ElectronUEMonitoring.cxx
index 4e854c50d242838429aeaa8a89321baed252a3ee..0c08d3f57e601753947998e7b4181351a7ecedde 100644
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/ElectronUEMonitoring.cxx
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/ElectronUEMonitoring.cxx
@@ -5,6 +5,10 @@
//ElectronUEMonitoring.cxx
//#include ""
#include "ElectronUEMonitoring.h"
+#include "AthenaKernel/Units.h"
+
+using Athena::Units::GeV;
+using Athena::Units::TeV;
ElectronUEMonitoring::ElectronUEMonitoring(const std::string& name, ISvcLocator* pSvcLocator) : HLT::FexAlgo(name, pSvcLocator){
@@ -92,7 +96,7 @@ HLT::ErrorCode ElectronUEMonitoring::hltExecute(const HLT::TriggerElement* /*inp
double fcalEt = 0.;
- for ( auto &slice: *evtShape ) {
+ for ( const xAOD::HIEventShape* slice : *evtShape ) {
if ( withinFcalRange(slice->etaMin()) and withinFcalRange(slice->etaMax()) ) {
fcalEt += slice->et();
}
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/ElectronUEMonitoring.h b/Trigger/TrigHypothesis/TrigHIHypo/src/ElectronUEMonitoring.h
index ed13b5d07e1a76a84d1e39f21775a8e1985967b0..5e6d1cfc49f2c40b1500b6c972414fc194b3bf3b 100644
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/ElectronUEMonitoring.h
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/ElectronUEMonitoring.h
@@ -6,9 +6,6 @@
#ifndef TrigHIHypo_ElectronUEMonitoring_h
#define TrigHIHypo_ElectronUEMonitoring_h
-#include "GaudiKernel/SystemOfUnits.h"
-using Gaudi::Units::GeV;
-using Gaudi::Units::TeV;
#include "GaudiKernel/ToolHandle.h"
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/HFMuonHypo.cxx b/Trigger/TrigHypothesis/TrigHIHypo/src/HFMuonHypo.cxx
index 660ad6d43be64b0f90630437b29a1d0d18522540..017c211f2a3e872827997f5787149c9bb02e0f3e 100644
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/HFMuonHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/HFMuonHypo.cxx
@@ -41,10 +41,10 @@ HLT::ErrorCode HFMuonHypo::hltExecute(const HLT::TriggerElement* outputTE, bool&
//std::cout<<"TEST "<<event++<<std::endl;
//Get Muon Container
- const xAOD::MuonContainer* m_muons=nullptr;
+ const xAOD::MuonContainer* muons=nullptr;
HLT::ErrorCode statusMuons;
- statusMuons=getFeature(outputTE,m_muons);
- if(statusMuons== HLT::OK && m_muons!=nullptr){
+ statusMuons=getFeature(outputTE,muons);
+ if(statusMuons== HLT::OK && muons!=nullptr){
ATH_MSG_DEBUG("Got MuonContainer object successfully");
}
else {
@@ -83,7 +83,7 @@ HLT::ErrorCode HFMuonHypo::hltExecute(const HLT::TriggerElement* outputTE, bool&
//loop over all muons asd check if one of them meets the criteria
//to pass the trigger
- for(auto Muon : *m_muons){
+ for(auto Muon : *muons){
//User only combined muons
if(Muon->muonType() !=xAOD::Muon::MuonType::Combined) continue;
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/HICaloCellCorectionTool.h b/Trigger/TrigHypothesis/TrigHIHypo/src/HICaloCellCorectionTool.h
index 40c7ec82af0bb7ff6626a8d65302d2f4090cba17..7fb3f1a3c7bb9c9b74f111d8d989c2704cab37c8 100644
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/HICaloCellCorectionTool.h
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/HICaloCellCorectionTool.h
@@ -14,7 +14,7 @@
#include <string>
-using namespace xAOD;
+//using namespace xAOD;
class HICaloCellCorectionTool : public ICaloCellMakerTool, public AthAlgTool{
public:
HICaloCellCorectionTool(const std::string& type, const std::string& name, const IInterface* parent);
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.cxx b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.cxx
index ed2d0b1cf8f1b2b3875fba9757a449dfda074d32..3a8edd9344dfd96f8772def7c915a889cfaa98d4 100755
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.cxx
@@ -58,15 +58,15 @@ TrigHIEFTrackHypo::TrigHIEFTrackHypo(const std::string& name, ISvcLocator* pSvcL
declareProperty("MaxNumTracks", m_numMaxTracks=10000,
"Max number of tracks satisfying the selection");
- declareMonitoredCollection("pt", *dvec_cast(&TrkParticleCont), &monPt);
- declareMonitoredCollection("Phi",*dvec_cast(&TrkParticleCont), &monPhi);
- declareMonitoredCollection("Eta",*dvec_cast(&TrkParticleCont), &monEta);
- declareMonitoredCollection("d0", *dvec_cast(&TrkParticleCont), &mond0);
- declareMonitoredCollection("z0", *dvec_cast(&TrkParticleCont), &monz0);
+ declareMonitoredCollection("pt", *dvec_cast(&m_TrkParticleCont), &monPt);
+ declareMonitoredCollection("Phi",*dvec_cast(&m_TrkParticleCont), &monPhi);
+ declareMonitoredCollection("Eta",*dvec_cast(&m_TrkParticleCont), &monEta);
+ declareMonitoredCollection("d0", *dvec_cast(&m_TrkParticleCont), &mond0);
+ declareMonitoredCollection("z0", *dvec_cast(&m_TrkParticleCont), &monz0);
declareMonitoredVariable("numTrkPartIn",m_numTrkPartIn);
declareMonitoredVariable("numTrkPartOut",m_numTrkPartOut);
- TrkParticleCont = 0;
+ m_TrkParticleCont = 0;
}
/////////////////////////////////////////////////////////////////////
@@ -88,7 +88,7 @@ TrigHIEFTrackHypo::~TrigHIEFTrackHypo()
//----------------------------------------------------------------------------
HLT::ErrorCode TrigHIEFTrackHypo::hltBeginRun(){
- msg() << MSG::INFO << "TrigHIEFTrackHypo::beginRun()" << endreq;
+ msg() << MSG::INFO << "TrigHIEFTrackHypo::beginRun()" << endmsg;
return HLT::OK;
}
@@ -98,11 +98,11 @@ HLT::ErrorCode TrigHIEFTrackHypo::hltBeginRun(){
HLT::ErrorCode TrigHIEFTrackHypo::hltInitialize() {
// ----------------------------------------------------------------------
- msg() << MSG::INFO << "TrigHIEFTrackHypo initialize()" << endreq;
+ msg() << MSG::INFO << "TrigHIEFTrackHypo initialize()" << endmsg;
msg() << MSG::INFO
<< "Initialization of TrigHIEFTrackHypo completed successfully"
- << endreq;
+ << endmsg;
return HLT::OK;
}
@@ -111,7 +111,7 @@ HLT::ErrorCode TrigHIEFTrackHypo::hltInitialize() {
HLT::ErrorCode TrigHIEFTrackHypo::hltFinalize() {
// ----------------------------------------------------------------------
- msg() << MSG::INFO << "TrigHIEFTrackHypo finalize()" << endreq;
+ msg() << MSG::INFO << "TrigHIEFTrackHypo finalize()" << endmsg;
return HLT::OK;
}
@@ -123,24 +123,24 @@ HLT::ErrorCode TrigHIEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE
// default value, it will be set to true if selection satisfied
pass = false;
- TrkParticleCont=0;
+ m_TrkParticleCont=0;
int outputLevel = msgLvl();
if(outputLevel <= MSG::DEBUG)
- msg() << MSG::DEBUG << name() << ": in execute()" << endreq;
+ msg() << MSG::DEBUG << name() << ": in execute()" << endmsg;
// AcceptAll property = true means selection cuts should not be applied
if (m_acceptAll){
if(outputLevel <= MSG::DEBUG)
- msg() << MSG::DEBUG << "AcceptAll property is set: taking all events" << endreq;
+ msg() << MSG::DEBUG << "AcceptAll property is set: taking all events" << endmsg;
pass=true;
return HLT::OK;
}
else {
if(outputLevel <= MSG::DEBUG)
msg() << MSG::DEBUG << "AcceptAll property not set: applying selection"
- << endreq;
+ << endmsg;
}
@@ -148,27 +148,27 @@ HLT::ErrorCode TrigHIEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE
//--------------------------------------------------
bool accepted=false;
- //const Rec::TrackParticleContainer* TrkParticleCont(0);
+ //const Rec::TrackParticleContainer* m_TrkParticleCont(0);
- if ( HLT::OK != getFeature(outputTE, TrkParticleCont) ) {
- msg() << MSG::ERROR << "Failed to get TrackParticleContainer from the trigger element " << endreq;
+ if ( HLT::OK != getFeature(outputTE, m_TrkParticleCont) ) {
+ msg() << MSG::ERROR << "Failed to get TrackParticleContainer from the trigger element " << endmsg;
return HLT::NAV_ERROR;
}
- if ( !TrkParticleCont ) {
- msg() << MSG::DEBUG << "No TrackParticleContainer present" << endreq;
+ if ( !m_TrkParticleCont ) {
+ msg() << MSG::DEBUG << "No TrackParticleContainer present" << endmsg;
return HLT::OK;
}
if(outputLevel <= MSG::DEBUG)
- msg() << MSG::DEBUG << " REGTEST: Got " << TrkParticleCont->size()
- << " TrackParticleContainer's associated to the TE " << endreq;
+ msg() << MSG::DEBUG << " REGTEST: Got " << m_TrkParticleCont->size()
+ << " TrackParticleContainer's associated to the TE " << endmsg;
- m_numTrkPartIn=TrkParticleCont->size();
+ m_numTrkPartIn=m_TrkParticleCont->size();
int ntracks=0;
- for(Rec::TrackParticleContainer::const_iterator trkIt = TrkParticleCont->begin();
- trkIt != TrkParticleCont->end(); trkIt++){
+ for(Rec::TrackParticleContainer::const_iterator trkIt = m_TrkParticleCont->begin();
+ trkIt != m_TrkParticleCont->end(); trkIt++){
// apply the cuts
// ---------------
@@ -177,7 +177,7 @@ HLT::ErrorCode TrigHIEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE
if(summary == 0){
msg() << MSG::WARNING
- << " Atention! There is a track with no summary information linked ! " << endreq;
+ << " Atention! There is a track with no summary information linked ! " << endmsg;
}
if(summary == 0 ) continue; // ????
@@ -221,7 +221,7 @@ HLT::ErrorCode TrigHIEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE
// << " TRTratio=" << trtratio
// << " D0=" << d0
// << " Pt=" << pt
-// << endreq;
+// << endmsg;
// ---------------------------------------------------
// At least one track passed cuts: accept the event:
// ---------------------------------------------------
@@ -230,7 +230,7 @@ HLT::ErrorCode TrigHIEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE
} // end of loop in tracks
- // msg() << MSG::DEBUG << "Number of tracks found: " << ntracks << endreq;
+ // msg() << MSG::DEBUG << "Number of tracks found: " << ntracks << endmsg;
if (ntracks >= m_numMinTracks && ntracks <= m_numMaxTracks) accepted = true;
if(accepted){
@@ -240,12 +240,12 @@ HLT::ErrorCode TrigHIEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE
pass =true;
if(outputLevel <= MSG::DEBUG)
- msg() << MSG::DEBUG << " REGTEST: Event accepted ! " << endreq;
+ msg() << MSG::DEBUG << " REGTEST: Event accepted ! " << endmsg;
}
else{
if(outputLevel <= MSG::DEBUG)
- msg() << MSG::DEBUG << " REGTEST: No track was found !! Event rejected " << endreq;
+ msg() << MSG::DEBUG << " REGTEST: No track was found !! Event rejected " << endmsg;
}
// Time total TrigHIEFTrackHypo execution time.
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.h b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.h
index ee70eb687454f20dd261ccdef5a6ebb342f8199f..9e118388a91ad51fb9ba0ebdd177d6324a6b4d84 100755
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.h
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.h
@@ -71,7 +71,7 @@ class TrigHIEFTrackHypo : public HLT::HypoAlgo {
// functions to retrieve monitored quantities
- const Rec::TrackParticleContainer* TrkParticleCont; //!< pointer to TrackParticle container
+ const Rec::TrackParticleContainer* m_TrkParticleCont; //!< pointer to TrackParticle container
int m_numTrkPartIn;
int m_numTrkPartOut;
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIJetBaseSubtraction.cxx b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIJetBaseSubtraction.cxx
index 289693d79d4b2fe6ba0088ca97c5e69141d4302b..5fdc3612d40f65406ed0e4c3196ee01520b8ac06 100644
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIJetBaseSubtraction.cxx
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIJetBaseSubtraction.cxx
@@ -72,7 +72,7 @@ ErrorCode TrigHIJetBaseSubtraction::hltExecute(const TriggerElement* input,
if (m_jet_background<0) {
const LVL1::RecEnergyRoI* lvl1_energyRoi = 0;
if(msgLvl() <= MSG::DEBUG)
- msg() << MSG::DEBUG << "Retrieving Total Energy" << endreq;
+ msg() << MSG::DEBUG << "Retrieving Total Energy" << endmsg;
HLT::Navigation* nav = config()->getNavigation();
HLT::TriggerElement* initial = nav->getInitialNode();
@@ -83,7 +83,7 @@ ErrorCode TrigHIJetBaseSubtraction::hltExecute(const TriggerElement* input,
}
}
if(!lvl1_energyRoi) {
- msg() << MSG::WARNING << "No RecEnergyRoI object found! Aborting" << endreq;
+ msg() << MSG::WARNING << "No RecEnergyRoI object found! Aborting" << endmsg;
return HLT::NAV_ERROR;
}
// Original SumET is in ~ GeV units (scale factor will be contained in LVL1ConfigSvc at one point ...) *1000 ->MeV
@@ -97,27 +97,27 @@ ErrorCode TrigHIJetBaseSubtraction::hltExecute(const TriggerElement* input,
if(msgLvl() <= MSG::DEBUG) {
const TrigRoiDescriptor* roiDescriptor(0);
if( getFeature(input, roiDescriptor, "initialRoI") != HLT::OK && roiDescriptor )
- msg() << MSG::DEBUG << "executing Jet Base subtraction on RoI :" << *roiDescriptor << endreq;
+ msg() << MSG::DEBUG << "executing Jet Base subtraction on RoI :" << *roiDescriptor << endmsg;
}
const TrigT2Jet* in_jet(0);
ErrorCode ec = getFeature(output, in_jet);
if ( ec != OK ) {
- msg() << MSG::WARNING << "retrieving jet on roi failed" << endreq;
+ msg() << MSG::WARNING << "retrieving jet on roi failed" << endmsg;
return ec;
}
if ( !in_jet ) {
// some INFO message that jet is missing
if(msgLvl() <= MSG::DEBUG)
- msg() << MSG::DEBUG << "No jet in RoI for subtraction" << endreq;
+ msg() << MSG::DEBUG << "No jet in RoI for subtraction" << endmsg;
return OK;
}
if(msgLvl() <= MSG::DEBUG)
- msg() << MSG::DEBUG << "Original jet" << *in_jet << endreq;
+ msg() << MSG::DEBUG << "Original jet" << *in_jet << endmsg;
- if(msgLvl() <= MSG::DEBUG) msg() <<MSG::DEBUG << "Jet background before calib.: " << m_jet_background << endreq;
+ if(msgLvl() <= MSG::DEBUG) msg() <<MSG::DEBUG << "Jet background before calib.: " << m_jet_background << endmsg;
//Background weight
for(int i=0; i < m_Bgnbin_eta;++i) {
@@ -128,7 +128,7 @@ ErrorCode TrigHIJetBaseSubtraction::hltExecute(const TriggerElement* input,
}
m_jet_weighted_background = m_jet_background * m_BgWeights[m_ieta];
if(msgLvl() <= MSG::DEBUG){
- msg() <<MSG::DEBUG << "Jet background after calib.: " << m_jet_weighted_background << endreq;
+ msg() <<MSG::DEBUG << "Jet background after calib.: " << m_jet_weighted_background << endmsg;
}
//Jet energy correction
@@ -136,7 +136,7 @@ ErrorCode TrigHIJetBaseSubtraction::hltExecute(const TriggerElement* input,
if ( out_jet ) {
ec = attachFeature(output, out_jet, m_label);
if(msgLvl() <= MSG::DEBUG)
- msg() << MSG::DEBUG << "Subtracted jet attached" << *out_jet << endreq;
+ msg() << MSG::DEBUG << "Subtracted jet attached" << *out_jet << endmsg;
}
//Just for monitoring purpose
@@ -148,11 +148,11 @@ ErrorCode TrigHIJetBaseSubtraction::hltExecute(const TriggerElement* input,
return OK;
}
-TrigT2Jet* TrigHIJetBaseSubtraction::corrected(const TrigT2Jet* in, double m_background ) const {
+TrigT2Jet* TrigHIJetBaseSubtraction::corrected(const TrigT2Jet* in, double background ) const {
TrigT2Jet* base_subtracted = new TrigT2Jet(*in);
base_subtracted->setGrid(0);
//Jet E has to be transfered in to Et before subtraction and than back
- base_subtracted->setE((in->e()/cosh(in->eta()) - m_background)*cosh(in->eta()));
+ base_subtracted->setE((in->e()/cosh(in->eta()) - background)*cosh(in->eta()));
return base_subtracted;
}
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIJetBaseSubtraction.h b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIJetBaseSubtraction.h
index c257878eb205644fecabdd7ec1f1c4a0e0d24962..acc7f1b0a65c3fab979b815808208bf84a941adf 100644
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIJetBaseSubtraction.h
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIJetBaseSubtraction.h
@@ -13,22 +13,22 @@
namespace HLT {
class TriggerElement;
}
-using namespace HLT;
+//using namespace HLT;
/**
* @brief Algorithms making correcting of jet Et depending of centrality of HI event
* The centrality is estimated by the ammount of total energy.
**/
-class TrigHIJetBaseSubtraction : public virtual FexAlgo{
+class TrigHIJetBaseSubtraction : public virtual HLT::FexAlgo{
public:
TrigHIJetBaseSubtraction(const std::string & name, ISvcLocator* pSvcLocator);
virtual ~TrigHIJetBaseSubtraction();
- virtual ErrorCode hltInitialize();
- virtual ErrorCode hltFinalize();
- virtual ErrorCode hltExecute(const TriggerElement* input,
- TriggerElement* output);
- virtual ErrorCode hltEndEvent();
+ virtual HLT::ErrorCode hltInitialize();
+ virtual HLT::ErrorCode hltFinalize();
+ virtual HLT::ErrorCode hltExecute(const HLT::TriggerElement* input,
+ HLT::TriggerElement* output);
+ virtual HLT::ErrorCode hltEndEvent();
private:
std::string m_label;
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIL2VtxMultHypo.cxx b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIL2VtxMultHypo.cxx
index a53353e568bd0fc39201dd9ec1acae7f4669644c..edd78c3fc0d8c828f8432bf0cf50a504e99c2081 100755
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIL2VtxMultHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIL2VtxMultHypo.cxx
@@ -54,7 +54,7 @@ TrigHIL2VtxMultHypo::~TrigHIL2VtxMultHypo(){
///
HLT::ErrorCode TrigHIL2VtxMultHypo::hltBeginRun(){
- msg() << MSG::INFO << "TrigHIL2VtxMultHypo::beginRun()" << endreq;
+ msg() << MSG::INFO << "TrigHIL2VtxMultHypo::beginRun()" << endmsg;
return HLT::OK;
}
@@ -65,11 +65,11 @@ HLT::ErrorCode TrigHIL2VtxMultHypo::hltBeginRun(){
///
HLT::ErrorCode TrigHIL2VtxMultHypo::hltInitialize() {
- msg() << MSG::INFO << "TrigHIL2VtxMultHypo initialize()" << endreq;
+ msg() << MSG::INFO << "TrigHIL2VtxMultHypo initialize()" << endmsg;
msg() << MSG::INFO
<< "Initialization of TrigHIL2VtxMultHypo completed successfully"
- << endreq;
+ << endmsg;
return HLT::OK;
}
@@ -80,7 +80,7 @@ HLT::ErrorCode TrigHIL2VtxMultHypo::hltInitialize() {
///
HLT::ErrorCode TrigHIL2VtxMultHypo::hltFinalize() {
- msg() << MSG::INFO << "TrigHIL2VtxMultHypo finalize()" << endreq;
+ msg() << MSG::INFO << "TrigHIL2VtxMultHypo finalize()" << endmsg;
return HLT::OK;
}
@@ -96,19 +96,19 @@ HLT::ErrorCode TrigHIL2VtxMultHypo::hltExecute(const HLT::TriggerElement* output
int outputLevel = msgLvl();
- if(outputLevel <= MSG::DEBUG) msg() << MSG::DEBUG << name() << ": in execute()" << endreq;
+ if(outputLevel <= MSG::DEBUG) msg() << MSG::DEBUG << name() << ": in execute()" << endmsg;
// AcceptAll property = true means selection cuts should not be applied
if (m_acceptAll) {
if(outputLevel <= MSG::DEBUG)
- msg() << MSG::DEBUG << "AcceptAll property is set: taking all events" << endreq;
+ msg() << MSG::DEBUG << "AcceptAll property is set: taking all events" << endmsg;
pass=true;
return HLT::OK;
}
else {
if(outputLevel <= MSG::DEBUG)
msg() << MSG::DEBUG << "AcceptAll property not set: applying selection"
- << endreq;
+ << endmsg;
}
/// select based on maximum allowed vertex multiplicity
@@ -118,17 +118,17 @@ HLT::ErrorCode TrigHIL2VtxMultHypo::hltExecute(const HLT::TriggerElement* output
const TrigVertexCollection* vertexCollection(0);
if ( HLT::OK != getFeature(outputTE, vertexCollection) ) {
- msg() << MSG::ERROR << "Failed to get TrigVertexCollection from the TE " << endreq;
+ msg() << MSG::ERROR << "Failed to get TrigVertexCollection from the TE " << endmsg;
return HLT::NAV_ERROR;
}
if ( !vertexCollection ) {
- msg() << MSG::DEBUG << "No TrackVertexCollection" << endreq;
+ msg() << MSG::DEBUG << "No TrackVertexCollection" << endmsg;
return HLT::OK;
}
if(outputLevel <= MSG::DEBUG) {
- msg() << MSG::DEBUG << " REGTEST: Got TrigVertexCollection associated with the TE " << endreq;
+ msg() << MSG::DEBUG << " REGTEST: Got TrigVertexCollection associated with the TE " << endmsg;
}
@@ -154,12 +154,12 @@ HLT::ErrorCode TrigHIL2VtxMultHypo::hltExecute(const HLT::TriggerElement* output
if ( nVertices >= m_minVertices ) pass = true;
if(outputLevel <= MSG::DEBUG) {
- msg() << MSG::DEBUG << " found " << nVertices << " vertices" << endreq;
+ msg() << MSG::DEBUG << " found " << nVertices << " vertices" << endmsg;
}
if(outputLevel <= MSG::DEBUG) {
- if ( pass ) msg() << MSG::DEBUG << " REGTEST: Event accepted " << endreq;
- else msg() << MSG::DEBUG << " REGTEST: Event rejected " << endreq;
+ if ( pass ) msg() << MSG::DEBUG << " REGTEST: Event accepted " << endmsg;
+ else msg() << MSG::DEBUG << " REGTEST: Event rejected " << endmsg;
}
// Time total TrigHIL2VtxMultHypo execution time.