Skip to content
Snippets Groups Projects
Commit 5e74d966 authored by John Derek Chapman's avatar John Derek Chapman Committed by Atlas Nightlybuild
Browse files

Merge branch 'NSWPRDValAlgATHMSGLVL' into '21.3' 

Fixing ATH MSG Level in NSWPRDValAlg

See merge request atlas/athena!15409

(cherry picked from commit 80ecbaa66287e3d93e679fd0eae95f27ad246f32)

793f723b Fixing ATH MSG Level in NSWPRDValAlg
parent 71ccf230
1 merge request!20779WIP: Migrate DataQualityTools to ToolHandles
Hide whitespace changes
Inline Side-by-side
Showing
with 59 additions and 49 deletions
Control/AthenaConfiguration/python/iconfTool/utils/__init__.py 100644 → 100755
+ 0
− 0
View file @ 5e74d966
File mode changed from 100644 to 100755
MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSDOVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx
+ 16
− 16
View file @ 5e74d966
......@@ -110,25 +110,25 @@ 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() );
}
......@@ -145,14 +145,14 @@ StatusCode NSWPRDValAlg::initialize() {
// 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
......@@ -161,30 +161,30 @@ 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() );
}
......@@ -198,7 +198,7 @@ StatusCode NSWPRDValAlg::initialize() {
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
......@@ -208,13 +208,13 @@ 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() );
}
......@@ -226,7 +226,7 @@ StatusCode NSWPRDValAlg::initialize() {
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() );
}
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/ValAlgVariables.h
+ 3
− 3
View file @ 5e74d966
......@@ -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() {};
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.cxx
+ 1
− 4
View file @ 5e74d966
......@@ -18,10 +18,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;
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCPRDVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSDOVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h
+ 3
− 2
View file @ 5e74d966
......@@ -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),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment