diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h
index 4d91705a9cf2e606dfd724c337e0f3e46fcd1c50..88b8cc6464e3d2613a1cc43809680791664e99fc 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h
@@ -17,8 +17,9 @@ class CSCDigitVariables : public ValAlgVariables
const MuonGM::MuonDetectorManager* detManager,
const MuonIdHelper* idhelper,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "CSCDigitVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_CscIdHelper(0),
m_CSC_nDigits(0),
m_CSC_dig_stationName(0),
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h
index a0d057815c6c3fa92ccf96e68144e12f9648c3aa..30c3c8a708267e9b6e04c7fef9bd531c6e393055 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h
@@ -17,8 +17,9 @@ class MMDigitVariables : public ValAlgVariables
const MuonGM::MuonDetectorManager* detManager,
const MuonIdHelper* idhelper,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "MMDigitVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_MmIdHelper(0),
m_NSWMM_nDigits(0),
m_NSWMM_dig_stationName(0),
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.h
index 8598573d71376f7961cf9a10b979f24dcdef8303..1472f692bebd026acc08f80d54ed6b884b5194f8 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.h
@@ -17,8 +17,9 @@ class MMPRDVariables : public ValAlgVariables
const MuonGM::MuonDetectorManager* detManager,
const MuonIdHelper* idhelper,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "MMPRDVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_MmIdHelper(0),
m_NSWMM_nPRDs(0),
m_NSWMM_prd_stationName(0),
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.h
index b3a5b68511dd3e553eee715c345ba1c16fee7de9..2b587179d2c9ddc02fef65db73afeeeaced94c0a 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.h
@@ -17,8 +17,9 @@ class MMRDOVariables : public ValAlgVariables
const MuonGM::MuonDetectorManager* detManager,
const MuonIdHelper* idhelper,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "MMRDOVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_MmIdHelper(0),
m_NSWMM_nrdo(0),
m_NSWMM_rdo_stationName(0),
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSDOVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSDOVariables.h
index 2c8499f93d3103c9feb358fb1fc1c0cafd0ad9d3..71bce331df5e5129398006eae0f217346cc14733 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSDOVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSDOVariables.h
@@ -18,8 +18,9 @@ class MMSDOVariables : public ValAlgVariables
const MuonGM::MuonDetectorManager* detManager,
const MuonIdHelper* idhelper,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "MMSDOVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_MmIdHelper(0),
m_NSWMM_nsdo(0),
m_NSWMM_sdo_stationName(0),
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h
index 356dfe9e54aa223ea2d42f95eab1c073b8b00776..32f46132771bed03cdaaf31ffecb1575bfbed707 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h
@@ -17,8 +17,9 @@ class MMSimHitVariables : public ValAlgVariables
const MuonGM::MuonDetectorManager* detManager,
const MuonIdHelper* idhelper,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "MMSimHitVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_MmIdHelper(0),
m_NSWMM_nSimHits(0),
m_NSWMM_trackId(0),
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h
index b7d8eb51a9dc2b0f1417c28d10ab3ca218837aa9..6638766f2205e8599475108c59f27209d80179d8 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h
@@ -17,8 +17,9 @@ class MuEntryVariables : public ValAlgVariables
MuEntryVariables(StoreGateSvc* evtStore,
const MuonGM::MuonDetectorManager* detManager,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "MuEntryVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_MuEntry_nParticles(0),
m_MuEntry_particlePt(0),
m_MuEntry_particleEta(0),
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx
index dda8dafcb9a2664e6913140186e560f63a01a19c..f1be5669b149a1c2fb13b62e12dab87906eb8bf0 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx
@@ -110,37 +110,37 @@ StatusCode NSWPRDValAlg::initialize() {
if (m_doTruth){
m_TruthVar = new TruthVariables(&(*(evtStore())), m_detManager,
- m_tree, m_Truth_ContainerName);
- CHECK( m_TruthVar->initializeVariables() );
+ m_tree, m_Truth_ContainerName, msgLevel());
+ ATH_CHECK( m_TruthVar->initializeVariables() );
}
if (m_doMuEntry){
m_MuEntryVar = new MuEntryVariables(&(*(evtStore())), m_detManager,
- m_tree, m_MuEntry_ContainerName);
+ m_tree, m_MuEntry_ContainerName, msgLevel());
ATH_CHECK( m_MuEntryVar->initializeVariables() );
}
if (m_doSTGCHit){
m_sTgcSimHitVar = new sTGCSimHitVariables(&(*(evtStore())), m_detManager,
- m_sTgcIdHelper, m_tree, m_NSWsTGC_ContainerName);
+ m_sTgcIdHelper, m_tree, m_NSWsTGC_ContainerName, msgLevel());
ATH_CHECK( m_sTgcSimHitVar->initializeVariables() );
}
if (m_doSTGCDigit){
m_sTgcDigitVar = new sTGCDigitVariables(&(*(evtStore())), m_detManager,
- m_sTgcIdHelper, m_tree, m_NSWsTGC_DigitContainerName);
+ m_sTgcIdHelper, m_tree, m_NSWsTGC_DigitContainerName, msgLevel());
ATH_CHECK( m_sTgcDigitVar->initializeVariables() );
// Take SDO conainer
m_sTgcSdoVar = new sTGCSDOVariables(&(*(evtStore())), m_detManager,
- m_sTgcIdHelper, m_tree, m_NSWsTGC_SDOContainerName);
+ m_sTgcIdHelper, m_tree, m_NSWsTGC_SDOContainerName, msgLevel());
ATH_CHECK( m_sTgcSdoVar->initializeVariables() );
}
if (m_doSTGCFastDigit){
// Take the "fast_SDO" instead of the SDOs from full sim
m_sTgcFastSdoVar = new sTGCSDOVariables(&(*(evtStore())), m_detManager,
- m_sTgcIdHelper, m_tree, "sTGCfast_SDO");
+ m_sTgcIdHelper, m_tree, "sTGCfast_SDO", msgLevel());
ATH_CHECK( m_sTgcFastSdoVar->initializeVariables() );
// Fast digits = PRD
@@ -149,37 +149,37 @@ StatusCode NSWPRDValAlg::initialize() {
if (m_doSTGCRDO){
m_sTgcRdoVar = new sTGCRDOVariables(&(*(evtStore())), m_detManager,
- m_sTgcIdHelper, m_tree, m_NSWsTGC_RDOContainerName);
+ m_sTgcIdHelper, m_tree, m_NSWsTGC_RDOContainerName, msgLevel());
ATH_CHECK( m_sTgcRdoVar->initializeVariables() );
}
if (m_doSTGCPRD){
m_sTgcPrdVar = new sTGCPRDVariables(&(*(evtStore())), m_detManager,
- m_sTgcIdHelper, m_tree, m_NSWsTGC_PRDContainerName);
+ m_sTgcIdHelper, m_tree, m_NSWsTGC_PRDContainerName, msgLevel());
ATH_CHECK( m_sTgcPrdVar->initializeVariables() );
}
if (m_doMMHit) {
m_MmSimHitVar = new MMSimHitVariables(&(*(evtStore())), m_detManager,
- m_MmIdHelper, m_tree, m_NSWMM_ContainerName);
+ m_MmIdHelper, m_tree, m_NSWMM_ContainerName, msgLevel());
ATH_CHECK( m_MmSimHitVar->initializeVariables() );
}
if (m_doMMDigit) {
m_MmDigitVar = new MMDigitVariables(&(*(evtStore())), m_detManager,
- m_MmIdHelper, m_tree, m_NSWMM_DigitContainerName);
+ m_MmIdHelper, m_tree, m_NSWMM_DigitContainerName, msgLevel());
ATH_CHECK( m_MmDigitVar->initializeVariables() );
// Take SDO conainer
m_MmSdoVar = new MMSDOVariables(&(*(evtStore())), m_detManager,
- m_MmIdHelper, m_tree, m_NSWMM_SDOContainerName);
+ m_MmIdHelper, m_tree, m_NSWMM_SDOContainerName, msgLevel());
ATH_CHECK( m_MmSdoVar->initializeVariables() );
}
if (m_doMMFastDigit){
// Take the "fast_SDO" instead of the SDOs from full sim
m_MmFastSdoVar = new MMSDOVariables(&(*(evtStore())), m_detManager,
- m_MmIdHelper, m_tree, "MMfast_SDO");
+ m_MmIdHelper, m_tree, "MMfast_SDO", msgLevel());
ATH_CHECK( m_MmFastSdoVar->initializeVariables() );
// Fast digits = PRD
@@ -189,19 +189,19 @@ StatusCode NSWPRDValAlg::initialize() {
if (m_doMMRDO) {
m_MmRdoVar = new MMRDOVariables(&(*(evtStore())), m_detManager,
- m_MmIdHelper, m_tree, m_NSWMM_RDOContainerName);
+ m_MmIdHelper, m_tree, m_NSWMM_RDOContainerName, msgLevel());
ATH_CHECK( m_MmRdoVar->initializeVariables() );
}
if (m_doMMPRD){
m_MmPrdVar = new MMPRDVariables(&(*(evtStore())), m_detManager,
- m_MmIdHelper, m_tree, m_NSWMM_PRDContainerName);
+ m_MmIdHelper, m_tree, m_NSWMM_PRDContainerName, msgLevel());
ATH_CHECK( m_MmPrdVar->initializeVariables() );
}
if (m_doCSCDigit){
m_CscDigitVar = new CSCDigitVariables(&(*(evtStore())), m_detManager,
- m_CscIdHelper, m_tree, m_CSC_DigitContainerName);
+ m_CscIdHelper, m_tree, m_CSC_DigitContainerName, msgLevel());
ATH_CHECK( m_CscDigitVar->initializeVariables() );
}
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h
index 008c847ca93bf05179d7d6e047499ba093c532b0..d600dcd4dcac8a7c44bf49441808a2ac9d485722 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h
@@ -17,8 +17,9 @@ class TruthVariables : public ValAlgVariables
TruthVariables(StoreGateSvc* evtStore,
const MuonGM::MuonDetectorManager* detManager,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "TruthVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_Truth_nVertices(0),
m_Truth_vertexX(0),
m_Truth_vertexY(0),
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/ValAlgVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/ValAlgVariables.h
index 264735a55f14348d9da38f920eef7d582e834746..b7ed44e29f837013c65a072d61a66c11975eae98 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/ValAlgVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/ValAlgVariables.h
@@ -23,13 +23,13 @@ class ValAlgVariables
const MuonGM::MuonDetectorManager* detManager,
TTree* tree,
std::string containername,
- std::string msgname) :
+ MSG::Level msglvl) :
m_evtStore(evtStore),
m_detManager(detManager),
m_tree(tree),
- m_ContainerName(containername),
- m_msg(msgname)
+ m_ContainerName(containername)
{
+ m_msg.get().setLevel(msglvl);
}
virtual ~ValAlgVariables() {};
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.cxx
index c62946bfc2fe8722f23b4d429ef0c9c296c861b8..1a72c7f578114c86df31084348b377e89480d8c6 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.cxx
@@ -20,10 +20,7 @@
/** ---------- to be called on each evt i.e. execute level of main alg */
StatusCode sTGCDigitVariables::fillVariables()
{
- ATH_MSG_INFO(" do fillNSWsTGCDigitVariables()");
- MSG::Level msgLevel = MSG::VERBOSE;
- m_msg.get().setLevel(msgLevel);
-
+ ATH_MSG_DEBUG(" do fillNSWsTGCDigitVariables()");
CHECK( this->clearVariables() );
const sTgcDigitContainer* nsw_sTgcDigitContainer = nullptr;
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h
index fee6145b8ce5d187a040045e43673fdb9e655804..46dbf101db9d4c4e6f38929867663054db476dc1 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h
@@ -17,8 +17,9 @@ class sTGCDigitVariables : public ValAlgVariables
const MuonGM::MuonDetectorManager* detManager,
const MuonIdHelper* idhelper,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "sTGCDigitVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_NSWsTGC_nDigits(0),
m_NSWsTGC_nPadDigits(0),
m_NSWsTGC_dig_time(0),
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCPRDVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCPRDVariables.h
index d359e8ca4e9d5ec0add416a925ddc6ecfbae5131..d4c8ecf41420b8cbabdf5b720ded2123f9d18462 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCPRDVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCPRDVariables.h
@@ -17,8 +17,9 @@ class sTGCPRDVariables : public ValAlgVariables
const MuonGM::MuonDetectorManager* detManager,
const MuonIdHelper* idhelper,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "sTGCPRDVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_sTgcIdHelper(0),
m_NSWsTGC_nPRDs(0),
m_NSWsTGC_prd_stationName(0),
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h
index 80092e91b629fd2123cf3befe172254cc6db8169..369488426e4d63881a355fe3ec7d5a13cf8ae780 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h
@@ -17,8 +17,9 @@ class sTGCRDOVariables : public ValAlgVariables
const MuonGM::MuonDetectorManager* detManager,
const MuonIdHelper* idhelper,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "sTGCRDOVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_sTgcIdHelper(0),
m_NSWsTGC_nrdo(0),
m_NSWsTGC_rdo_stationName(0),
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSDOVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSDOVariables.h
index 6a2899176a1576e1c48e5b8f771f6356d050c0de..325f3ae3b69e1a28908f353481b673e00be7595f 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSDOVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSDOVariables.h
@@ -18,8 +18,9 @@ class sTGCSDOVariables : public ValAlgVariables
const MuonGM::MuonDetectorManager* detManager,
const MuonIdHelper* idhelper,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "sTGCSDOVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_sTgcIdHelper(0),
m_NSWsTGC_nsdo(0),
m_NSWsTGC_sdo_stationName(0),
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h
index 66898ae838625cf5afa8176d006dc12c5e468ed7..57544158f35576b9ab2ce1c925f3445ec0344935 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h
@@ -17,8 +17,9 @@ class sTGCSimHitVariables : public ValAlgVariables
const MuonGM::MuonDetectorManager* detManager,
const MuonIdHelper* idhelper,
TTree* tree,
- std::string containername) :
- ValAlgVariables(evtStore, detManager, tree, containername, "sTGCSimHitVariables"),
+ std::string containername,
+ MSG::Level msglvl) :
+ ValAlgVariables(evtStore, detManager, tree, containername, msglvl),
m_sTgcIdHelper(0),
m_NSWsTGC_nSimHits(0),
m_NSWsTGC_trackId(0),