From ffae505bcc5f40e70644477b85de8cd37705779b Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Wed, 31 Oct 2018 09:23:17 +0000
Subject: [PATCH] Merge branch 'atlasRects4637' into '21.3'

Skip setting message level when intializing NSW PRD and RDO converters (ATLASRECTS-4637)

See merge request atlas/athena!15118

(cherry picked from commit 3f5f710dd091fc54f3ca12350d926b920d3408ae [formerly 753b50682ff7971d4657656c751ed62a947e0f15])

1ec194c5 Skip setting message level when intializing NSW PRD and RDO converters
6deaa956 Clean commented lines in NSW RDO and PRD converters

Former-commit-id: 8c9637d6f253a17a67d4543fc082509f95efe95c
---
 .../AthenaConfiguration/python/iconfTool/utils/__init__.py    | 0
 .../MuonEventAthenaPool/src/MMPrepDataContainerCnv.cxx        | 2 --
 .../MuonEventAthenaPool/src/MM_RawDataContainerCnv.cxx        | 4 +---
 .../MuonEventAthenaPool/src/STGC_RawDataContainerCnv.cxx      | 4 +---
 .../MuonEventAthenaPool/src/sTgcPrepDataContainerCnv.cxx      | 2 --
 5 files changed, 2 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 Control/AthenaConfiguration/python/iconfTool/utils/__init__.py

diff --git a/Control/AthenaConfiguration/python/iconfTool/utils/__init__.py b/Control/AthenaConfiguration/python/iconfTool/utils/__init__.py
old mode 100644
new mode 100755
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MMPrepDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MMPrepDataContainerCnv.cxx
index 424657976f5..68497de4c03 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MMPrepDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MMPrepDataContainerCnv.cxx
@@ -32,8 +32,6 @@ StatusCode MMPrepDataContainerCnv::initialize() {
     if( !MMPrepDataContainerCnvBase::initialize().isSuccess() )
        return StatusCode::FAILURE;
     
-    msgSvc()->setOutputLevel( "MMPrepDataContainerCnv", MSG::DEBUG );
-
    // Get the messaging service, print where you are
     MsgStream log(msgSvc(), "MMPrepDataContainerCnv");
     if (log.level() <= MSG::INFO) log << MSG::INFO << "MMPrepDataContainerCnv::initialize()" << endmsg;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MM_RawDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MM_RawDataContainerCnv.cxx
index 86df555daaf..cba2e8a51c8 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MM_RawDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MM_RawDataContainerCnv.cxx
@@ -20,8 +20,6 @@ StatusCode MM_RawDataContainerCnv::initialize() {
   if( !MM_RawDataContainerCnvBase::initialize().isSuccess() )
     return StatusCode::FAILURE;  
     
-  msgSvc()->setOutputLevel( "MM_RawDataContainerCnv", MSG::DEBUG );
-
   // Get the messaging service, print where you are
   MsgStream log(msgSvc(), "MM_RawDataContainerCnv");
   if (log.level() <= MSG::INFO) log << MSG::INFO << "MM_RawDataContainerCnv::initialize()" << endmsg;
@@ -74,4 +72,4 @@ MM_RawDataContainerCnv::createTransient()
     throw std::runtime_error("Unsupported persistent version of MM Raw Data (RDO) container");
   }
   return transCont;
-}
\ No newline at end of file
+}
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/STGC_RawDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/STGC_RawDataContainerCnv.cxx
index 979d5c62143..1319fa8508a 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/STGC_RawDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/STGC_RawDataContainerCnv.cxx
@@ -19,8 +19,6 @@ StatusCode STGC_RawDataContainerCnv::initialize() {
   if( !STGC_RawDataContainerCnvBase::initialize().isSuccess() )
     return StatusCode::FAILURE;
     
-  msgSvc()->setOutputLevel( "STGC_RawDataContainerCnv", MSG::DEBUG );
-
   // Get the messaging service, print where you are
   MsgStream log(msgSvc(), "STGC_RawDataContainerCnv");
   if (log.level() <= MSG::INFO) log << MSG::INFO << "STGC_RawDataContainerCnv::initialize()" << endmsg;
@@ -76,4 +74,4 @@ STGC_RawDataContainerCnv::createTransient()
     throw std::runtime_error("Unsupported persistent version of STGC Raw Data (RDO) container");
   }
   return transCont;
-}
\ No newline at end of file
+}
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcPrepDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcPrepDataContainerCnv.cxx
index 2787a36a080..86872b81668 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcPrepDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/sTgcPrepDataContainerCnv.cxx
@@ -32,8 +32,6 @@ StatusCode sTgcPrepDataContainerCnv::initialize() {
     if( !sTgcPrepDataContainerCnvBase::initialize().isSuccess() )
        return StatusCode::FAILURE;
     
-    msgSvc()->setOutputLevel( "sTgcPrepDataContainerCnv", MSG::DEBUG );
-
    // Get the messaging service, print where you are
     MsgStream log(msgSvc(), "sTgcPrepDataContainerCnv");
     if (log.level() <= MSG::INFO) log << MSG::INFO << "sTgcPrepDataContainerCnv::initialize()" << endmsg;
-- 
GitLab