From adb540f4cb189b9834e29eda7e9e851a5071501a Mon Sep 17 00:00:00 2001 From: ckato <ckato@cern.ch> Date: Thu, 22 Nov 2018 17:58:12 +0100 Subject: [PATCH] small changes to use nullptr or ATH_MSG_DEBUG Former-commit-id: d931bcd9292406634bab408f5292e03f7c073dbf --- .../MuonAlignErrorTool/src/AlignmentErrorTool.cxx | 1 - .../MuonCablingData/MuonCablingData/MdtMapBase.h | 2 +- .../MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/AlignmentErrorTool.cxx b/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/AlignmentErrorTool.cxx index 851b0c882a2..5fcd423b5cc 100644 --- a/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/AlignmentErrorTool.cxx +++ b/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/AlignmentErrorTool.cxx @@ -81,7 +81,6 @@ void AlignmentErrorTool::makeAlignmentDeviations (const Trk::Track& track, std:: const MuonAlignmentErrorData* readCdo{*readHandle}; if(readCdo==nullptr){ ATH_MSG_ERROR("Null pointer to the read conditions object"); - std::cout<<"ckato Null pointer to the read conditions object"<<std::endl; return; } std::vector<deviationStr> devStrVec; diff --git a/MuonSpectrometer/MuonCablings/MuonCablingData/MuonCablingData/MdtMapBase.h b/MuonSpectrometer/MuonCablings/MuonCablingData/MuonCablingData/MdtMapBase.h index cce06952d5d..cd68f71f975 100644 --- a/MuonSpectrometer/MuonCablings/MuonCablingData/MuonCablingData/MdtMapBase.h +++ b/MuonSpectrometer/MuonCablings/MuonCablingData/MuonCablingData/MdtMapBase.h @@ -196,7 +196,7 @@ template<class T> T* MdtMapBase<T>::findItem(uint8_t itemId) const{ if (it!=m_mapOfItems->end()) { return (*it).second; } else { - return NULL; + return nullptr; } } diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx index f43b20b69ee..6995ddad727 100644 --- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx +++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx @@ -71,11 +71,11 @@ bool MdtTestCabling::testMap() // print the list of ROBids std::vector<uint32_t> robVector = readCdo->getAllROBId(); - std::cout << "============================= List of ROBids:" << std::endl; + ATH_MSG_DEBUG( "============================= List of ROBids:" ); for (unsigned int i=0 ; i<robVector.size() ; ++i) { - std::cout << std::hex << robVector[i] << std::dec << std::endl; + ATH_MSG_DEBUG( std::hex << robVector[i] << std::dec ); } - std::cout << "=============================================" << std::endl; + ATH_MSG_DEBUG( "=============================================" ); // loop on the hardware objects to get online identifiers -- GitLab