diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CSC_DCSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CSC_DCSConditionsSvc.cxx
index ad765dc3337bf55d25066ba8422a1e0bbb069ceb..59b7bc7734cc0d9b9643f6c4b96f32b4523f1c50 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CSC_DCSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CSC_DCSConditionsSvc.cxx
@@ -38,15 +38,15 @@ CSC_DCSConditionsSvc::~CSC_DCSConditionsSvc()
 StatusCode CSC_DCSConditionsSvc::initialize()
 {
   
-  msg(MSG::INFO) << "Initializing " << name() << " - package version " 
-		 << PACKAGE_VERSION << endmsg;
+  ATH_MSG_INFO( "Initializing " << name() << " - package version " 
+                << PACKAGE_VERSION  );
   
   StoreGateSvc * detStore;
   StatusCode status = service("DetectorStore",detStore);
   if (status.isFailure()) {
-    msg(MSG::FATAL) << "DetectorStore service not found !" << endmsg; 
+    ATH_MSG_FATAL( "DetectorStore service not found !"  );
   } else {
-    msg(MSG::INFO) << "DetectorStore service found !" << endmsg; 
+    ATH_MSG_VERBOSE( "DetectorStore service found !"  );
     
   }
   if(m_dcsInfofromCool)
@@ -55,42 +55,42 @@ StatusCode CSC_DCSConditionsSvc::initialize()
       if ( sc.isFailure() )
 	{
 	  
-	  msg(MSG::ERROR) << "Could not retrieve CSC_DCSConditionsTool" << endmsg;
+	  ATH_MSG_ERROR( "Could not retrieve CSC_DCSConditionsTool"  );
 	}
       else
 	{
 	  
-	  msg(MSG::INFO)<<"CSC_DCSConditionsTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool<<endmsg;
+	  ATH_MSG_VERBOSE("CSC_DCSConditionsTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool );
 	}
       std::vector<std::string> folderNames;
       folderNames.push_back((m_condDataTool)->ChamberFolder());
       folderNames.push_back((m_condDataTool)->HVFolderName());
       
       
-      msg(MSG::INFO)<<"Register call-back  against "<<folderNames.size()<<" folders listed below "<<endmsg;
+      ATH_MSG_VERBOSE("Register call-back  against "<<folderNames.size()<<" folders listed below " );
       //bool aFolderFound = false;
       short ic=0;
       for (std::vector<std::string>::const_iterator ifld =folderNames.begin(); ifld!=folderNames.end(); ++ifld )
 	{
 	  ++ic;
-	  msg(MSG::INFO)<<" Folder n. "<<ic<<" <"<<(*ifld)<<">";
+	  ATH_MSG_VERBOSE(" Folder n. "<<ic<<" <"<<(*ifld)<<">"  );
 	  if (detStore->contains<CondAttrListCollection>(*ifld)) {
 	    //    aFolderFound=true;
-	    msg(MSG::INFO)<<"     found in the DetStore"<<endmsg;
+	    ATH_MSG_VERBOSE("     found in the DetStore" );
 	    const DataHandle<CondAttrListCollection> CSCDCSData;
 	    if (detStore->regFcn(&ICSC_DCSConditionsSvc::initInfo,
 				 dynamic_cast<ICSC_DCSConditionsSvc *>(this),
 				 CSCDCSData,
 				 *ifld)!=StatusCode::SUCCESS)
 	      {
-		msg(MSG::WARNING)<<"Unable to register call back for initDCSInfo against folder <"<<(*ifld)<<">";
+		ATH_MSG_WARNING("Unable to register call back for initDCSInfo against folder <"<<(*ifld)<<">"  );
 	      }
-	    else msg(MSG::INFO)<<"initDCSInfo registered for call-back against folder <"<<(*ifld)<<">"<<endmsg;
+	    else ATH_MSG_VERBOSE("initDCSInfo registered for call-back against folder <"<<(*ifld)<<">" );
 	  }
 	  else
 	    {   
-	      msg(MSG::WARNING)<<"Folder "<<(*ifld)
-			       <<" NOT found in the DetStore --- failing to init ???"<<endmsg;
+	      ATH_MSG_WARNING("Folder "<<(*ifld)
+                              <<" NOT found in the DetStore --- failing to init ???" );
 	    }
 	}
     }
@@ -101,7 +101,7 @@ StatusCode CSC_DCSConditionsSvc::initialize()
 StatusCode CSC_DCSConditionsSvc::finalize()
 {
   
-  msg(MSG::INFO) << "Finalize" << endmsg;
+  ATH_MSG_VERBOSE( "Finalize"  );
   return StatusCode::SUCCESS;
 }
 
@@ -125,8 +125,8 @@ StatusCode CSC_DCSConditionsSvc::queryInterface(const InterfaceID& riid, void**
 
 StatusCode CSC_DCSConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
 {
-  msg(MSG::INFO)<<"initDCSInfo has been called"<<endmsg;
-  msg(MSG::INFO)<<"ToolHandle in initMappingModel - <"<<m_condDataTool<<">"<<endmsg;
+  ATH_MSG_VERBOSE("initDCSInfo has been called" );
+  ATH_MSG_VERBOSE("ToolHandle in initMappingModel - <"<<m_condDataTool<<">" );
   
   if(m_dcsInfofromCool)
     {
@@ -134,7 +134,7 @@ StatusCode CSC_DCSConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
       StatusCode sc = m_condDataTool->loadParameters(I, keys);
       if (sc.isFailure())
 	{
-	  msg(MSG::WARNING)<<"Reading DCS from COOL failed; NO CSC DCS INFO AVAILABLE"<<endmsg;
+	  ATH_MSG_WARNING("Reading DCS from COOL failed; NO CSC DCS INFO AVAILABLE" );
 	}
       
     }
@@ -166,7 +166,7 @@ const std::vector<Identifier>& CSC_DCSConditionsSvc::deadStationsId() const{
   
   unsigned int size_new =m_condDataTool->deadStationsId().size();
  
-  msg(MSG::VERBOSE)<<"DCS SERVICE: Number of DEAD CHAMBERS: "<<size_new <<endmsg;
+  ATH_MSG_VERBOSE("DCS SERVICE: Number of DEAD CHAMBERS: "<<size_new  );
   
   return m_condDataTool->deadStationsId();
 }
@@ -179,7 +179,7 @@ const std::vector<Identifier>& CSC_DCSConditionsSvc::deadWireLayersId() const{
   
   unsigned int size_new =m_condDataTool->deadWireLayersId().size();
   
-  msg(MSG::VERBOSE)<<"DCS SERVICE: Number of DEAD Wire Layer: "<<size_new <<endmsg;
+  ATH_MSG_VERBOSE("DCS SERVICE: Number of DEAD Wire Layer: "<<size_new  );
   
   return m_condDataTool->deadWireLayersId();
   
@@ -190,7 +190,7 @@ const std::vector<std::string>& CSC_DCSConditionsSvc::deadStations() const{
   
   unsigned int size_new =m_condDataTool->deadStations().size();
  
-  msg(MSG::VERBOSE)<<"DCS SERVICE: Number of DEAD CHAMBERS: "<<size_new <<endmsg;
+  ATH_MSG_VERBOSE("DCS SERVICE: Number of DEAD CHAMBERS: "<<size_new  );
   
   return m_condDataTool->deadStations();
 }
@@ -203,7 +203,7 @@ const std::vector<std::string>& CSC_DCSConditionsSvc::deadWireLayers() const{
   
   unsigned int size_new =m_condDataTool->deadWireLayers().size();
   
-  msg(MSG::VERBOSE)<<"DCS SERVICE: Number of DEAD Wire Layer: "<<size_new <<endmsg;
+  ATH_MSG_VERBOSE("DCS SERVICE: Number of DEAD Wire Layer: "<<size_new  );
   
   return m_condDataTool->deadWireLayers();
   
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsSvc.cxx
index 1401cfefee8a592b6998a272e6473d9032ad35c2..73d77b28b4dc0bf5f65d98dc8f6df82ffd1e76b5 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsSvc.cxx
@@ -38,15 +38,15 @@ MDT_DCSConditionsSvc::~MDT_DCSConditionsSvc()
 StatusCode MDT_DCSConditionsSvc::initialize()
 {
   
-  msg(MSG::INFO) << "Initializing " << name() << " - package version " 
-		 << PACKAGE_VERSION << endmsg;
+  ATH_MSG_INFO( "Initializing " << name() << " - package version " 
+                << PACKAGE_VERSION  );
   
   StoreGateSvc * detStore;
   StatusCode status = service("DetectorStore",detStore);
   if (status.isFailure()) {
-    msg(MSG::FATAL) << "DetectorStore service not found !" << endmsg; 
+    ATH_MSG_FATAL( "DetectorStore service not found !"  );
   } else {
-    msg(MSG::INFO) << "DetectorStore service found !" << endmsg; 
+    ATH_MSG_VERBOSE( "DetectorStore service found !"  );
     
   }
   if(m_dcsInfofromCool)
@@ -55,12 +55,12 @@ StatusCode MDT_DCSConditionsSvc::initialize()
       if ( sc.isFailure() )
 	{
 	  
-	  msg(MSG::ERROR) << "Could not retrieve MDT_DCSConditionsTool" << endmsg;
+	  ATH_MSG_ERROR( "Could not retrieve MDT_DCSConditionsTool"  );
 	}
       else
 	{
 	  
-	  msg(MSG::INFO)<<"MDT_DCSConditionsTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool<<endmsg;
+	  ATH_MSG_VERBOSE("MDT_DCSConditionsTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool );
 	}
       std::vector<std::string> folderNames;
       folderNames.push_back((m_condDataTool)->DropChamberFolderName());
@@ -71,30 +71,30 @@ StatusCode MDT_DCSConditionsSvc::initialize()
       folderNames.push_back((m_condDataTool)->SetPointsV1FolderName());
       folderNames.push_back((m_condDataTool)->SetPointsV0FolderName());
       }
-      msg(MSG::INFO)<<"Register call-back  against "<<folderNames.size()<<" folders listed below "<<endmsg;
+      ATH_MSG_VERBOSE("Register call-back  against "<<folderNames.size()<<" folders listed below " );
       //  bool aFolderFound = false;
       short ic=0;
       for (std::vector<std::string>::const_iterator ifld =folderNames.begin(); ifld!=folderNames.end(); ++ifld )
 	{
 	  ++ic;
-	  msg(MSG::INFO)<<" Folder n. "<<ic<<" <"<<(*ifld)<<">";
+	  ATH_MSG_VERBOSE(" Folder n. "<<ic<<" <"<<(*ifld)<<">" );
 	  if (detStore->contains<CondAttrListCollection>(*ifld)) {
 	    //    aFolderFound=true;
-	    msg(MSG::INFO)<<"     found in the DetStore"<<endmsg;
+	    ATH_MSG_VERBOSE("     found in the DetStore" );
 	    const DataHandle<CondAttrListCollection> MDTDCSData;
 	    if (detStore->regFcn(&IMDT_DCSConditionsSvc::initInfo,
 				 dynamic_cast<IMDT_DCSConditionsSvc *>(this),
 				 MDTDCSData,
 				 *ifld)!=StatusCode::SUCCESS)
 	      {
-		msg(MSG::WARNING)<<"Unable to register call back for initDCSInfo against folder <"<<(*ifld)<<">";
+		ATH_MSG_WARNING("Unable to register call back for initDCSInfo against folder <"<<(*ifld)<<">" );
 	      }
-	    else msg(MSG::INFO)<<"initDCSInfo registered for call-back against folder <"<<(*ifld)<<">"<<endmsg;
+	    else ATH_MSG_VERBOSE("initDCSInfo registered for call-back against folder <"<<(*ifld)<<">" );
 	  }
 	  else
 	    {   
-	      msg(MSG::WARNING)<<"Folder "<<(*ifld)
-			       <<" NOT found in the DetStore --- failing to init ???"<<endmsg;
+	      ATH_MSG_WARNING("Folder "<<(*ifld)
+                              <<" NOT found in the DetStore --- failing to init ???" );
 	    }
 	}
     }
@@ -105,7 +105,7 @@ StatusCode MDT_DCSConditionsSvc::initialize()
 StatusCode MDT_DCSConditionsSvc::finalize()
 {
   
-  msg(MSG::INFO) << "Finalize" << endmsg;
+  ATH_MSG_VERBOSE( "Finalize"  );
   return StatusCode::SUCCESS;
 }
 
@@ -129,8 +129,8 @@ StatusCode MDT_DCSConditionsSvc::queryInterface(const InterfaceID& riid, void**
 
 StatusCode MDT_DCSConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
 {
-  msg(MSG::INFO)<<"initDCSInfo has been called"<<endmsg;
-  msg(MSG::INFO)<<"ToolHandle in initMappingModel - <"<<m_condDataTool<<">"<<endmsg;
+  ATH_MSG_VERBOSE("initDCSInfo has been called" );
+  ATH_MSG_VERBOSE("ToolHandle in initMappingModel - <"<<m_condDataTool<<">" );
   
   if(m_dcsInfofromCool)
     {
@@ -138,7 +138,7 @@ StatusCode MDT_DCSConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
       StatusCode sc = m_condDataTool->loadParameters(I, keys);
       if (sc.isFailure())
 	{
-	  msg(MSG::WARNING)<<"Reading DCS from COOL failed; NO MDT DCS INFO AVAILABLE"<<endmsg;
+	  ATH_MSG_WARNING("Reading DCS from COOL failed; NO MDT DCS INFO AVAILABLE" );
 	}
       
     }
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DQConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DQConditionsSvc.cxx
index 429df5f5e005c4159c1ea36c777e5ad6f0e0d58a..f96abeed3be238ff5305ce03e836b1f477fbed43 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DQConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DQConditionsSvc.cxx
@@ -34,15 +34,15 @@ MDT_DQConditionsSvc::~MDT_DQConditionsSvc()
 StatusCode MDT_DQConditionsSvc::initialize()
 {
   
-  msg(MSG::INFO) << "Initializing " << name() << " - package version " 
-		 << PACKAGE_VERSION << endmsg;
+  ATH_MSG_INFO( "Initializing " << name() << " - package version " 
+                << PACKAGE_VERSION  );
   
   StoreGateSvc * detStore;
   StatusCode status = service("DetectorStore",detStore);
   if (status.isFailure()) {
-    msg(MSG::FATAL) << "DetectorStore service not found !" << endmsg; 
+    ATH_MSG_FATAL( "DetectorStore service not found !"  );
   } else {
-    msg(MSG::INFO) << "DetectorStore service found !" << endmsg; 
+    ATH_MSG_VERBOSE( "DetectorStore service found !"  );
     
   }
   if(m_dqInfofromCool)
@@ -51,12 +51,12 @@ StatusCode MDT_DQConditionsSvc::initialize()
       if ( sc.isFailure() )
 	{
 	  
-	  msg(MSG::ERROR) << "Could not retrieve MDT_DQConditionsTool" << endmsg;
+	  ATH_MSG_ERROR( "Could not retrieve MDT_DQConditionsTool"  );
 	}
       else
 	{
 	  
-	  msg(MSG::INFO)<<"MDT_DQConditionsTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool<<endmsg;
+	  ATH_MSG_VERBOSE("MDT_DQConditionsTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool );
 	}
             
       std::vector<std::string> folderNames;
@@ -64,30 +64,30 @@ StatusCode MDT_DQConditionsSvc::initialize()
       folderNames.push_back((m_condDataTool)->NoisyFolderName());
       
       
-      msg(MSG::INFO)<<"Register call-back  against "<<folderNames.size()<<" folders listed below "<<endmsg;
+      ATH_MSG_VERBOSE("Register call-back  against "<<folderNames.size()<<" folders listed below " );
       //  bool aFolderFound = false;
       short ic=0;
       for (std::vector<std::string>::const_iterator ifld =folderNames.begin(); ifld!=folderNames.end(); ++ifld )
 	{
 	  ++ic;
-	  msg(MSG::INFO)<<" Folder n. "<<ic<<" <"<<(*ifld)<<">";
+	  ATH_MSG_VERBOSE(" Folder n. "<<ic<<" <"<<(*ifld)<<">" );
 	  if (detStore->contains<CondAttrListCollection>(*ifld)) {
 	    //    aFolderFound=true;
-	    msg(MSG::INFO)<<"     found in the DetStore"<<endmsg;
+	    ATH_MSG_VERBOSE("     found in the DetStore" );
 	    const DataHandle<CondAttrListCollection> MDTDQData;
 	    if (detStore->regFcn(&IMDT_DQConditionsSvc::initInfo,
 				 dynamic_cast<IMDT_DQConditionsSvc *>(this),
 				 MDTDQData,
 				 *ifld)!=StatusCode::SUCCESS)
 	      {
-		msg(MSG::WARNING)<<"Unable to register call back for initDQInfo against folder <"<<(*ifld)<<">";
+		ATH_MSG_WARNING("Unable to register call back for initDQInfo against folder <"<<(*ifld)<<">" );
 	      }
-	    else msg(MSG::INFO)<<"initDQInfo registered for call-back against folder <"<<(*ifld)<<">"<<endmsg;
+	    ATH_MSG_VERBOSE("initDQInfo registered for call-back against folder <"<<(*ifld)<<">" );
 	  }
 	  else
 	    {   
-	      msg(MSG::WARNING)<<"Folder "<<(*ifld)
-			       <<" NOT found in the DetStore --- failing to init ???"<<endmsg;
+	      ATH_MSG_WARNING("Folder "<<(*ifld)
+                              <<" NOT found in the DetStore --- failing to init ???" );
 	    }
 	}
     }
@@ -122,8 +122,8 @@ StatusCode MDT_DQConditionsSvc::queryInterface(const InterfaceID& riid, void** p
 	
 StatusCode MDT_DQConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
 {
-  msg(MSG::INFO)<<"initDQInfo has been called"<<endmsg;
-  msg(MSG::INFO)<<"ToolHandle in init DQ Info - <"<<m_condDataTool<<">"<<endmsg;
+  ATH_MSG_VERBOSE("initDQInfo has been called" );
+  ATH_MSG_VERBOSE("ToolHandle in init DQ Info - <"<<m_condDataTool<<">" );
    
   if(m_dqInfofromCool)
     {
@@ -131,7 +131,7 @@ StatusCode MDT_DQConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
       StatusCode sc = m_condDataTool->loadParameters(I, keys);
       if (sc.isFailure())
 	{
-	  msg(MSG::WARNING)<<"Reading DQ from COOL failed; NO MDT DQ INFO AVAILABLE"<<endmsg;
+	  ATH_MSG_WARNING("Reading DQ from COOL failed; NO MDT DQ INFO AVAILABLE" );
 	}
     }
     
@@ -147,7 +147,7 @@ const std::vector<std::string>& MDT_DQConditionsSvc::deadTubes() const{
 
 const std::vector<std::string>& MDT_DQConditionsSvc::deadStations() const{
    
-  msg(MSG::DEBUG)<<"CONFIGURATION SERVICE: Number of DEAD STATIONS NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_DEBUG("CONFIGURATION SERVICE: Number of DEAD STATIONS NOT AVAILABLE: " );
   
   return m_cachedDeadStations;
 }
@@ -155,7 +155,7 @@ const std::vector<std::string>& MDT_DQConditionsSvc::deadStations() const{
 
 const std::vector<std::string>& MDT_DQConditionsSvc::deadMultiLayers() const{
    
-  msg(MSG::DEBUG)<<"CONFIGURATION SERVICE: Number of DEAD ML NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_DEBUG("CONFIGURATION SERVICE: Number of DEAD ML NOT AVAILABLE: " );
   
   return m_cachedDeadMultiLayers;
 }
@@ -192,14 +192,14 @@ bool MDT_DQConditionsSvc::isGoodMultiLayer(const Identifier & /*Id*/) const{
 const std::vector<Identifier>& MDT_DQConditionsSvc::deadTubesId() const{
   
   unsigned int size_new =m_condDataTool->deadTubesId().size();
-  msg(MSG::DEBUG)<<"DCS SERVICE: Number of DEAD TUBE: "<<size_new <<endmsg;
+  ATH_MSG_DEBUG("DCS SERVICE: Number of DEAD TUBE: "<<size_new  );
   return m_condDataTool->deadTubesId();
 }
 
 
 const std::vector<Identifier>& MDT_DQConditionsSvc::deadStationsId() const{
    
-  msg(MSG::DEBUG)<<"CONFIGURATION SERVICE: Number of DEAD STATIONS NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_DEBUG("CONFIGURATION SERVICE: Number of DEAD STATIONS NOT AVAILABLE: " );
   
   return m_cachedDeadStationsId;
 }
@@ -207,7 +207,7 @@ const std::vector<Identifier>& MDT_DQConditionsSvc::deadStationsId() const{
 
 const std::vector<Identifier>& MDT_DQConditionsSvc::deadMultiLayersId() const{
    
-  msg(MSG::DEBUG)<<"CONFIGURATION SERVICE: Number of DEAD ML NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_DEBUG("CONFIGURATION SERVICE: Number of DEAD ML NOT AVAILABLE: " );
   
   return m_cachedDeadMultiLayersId;
 }
@@ -215,14 +215,14 @@ const std::vector<Identifier>& MDT_DQConditionsSvc::deadMultiLayersId() const{
 
 const std::vector<Identifier>& MDT_DQConditionsSvc::deadLayersId() const{
    
-  msg(MSG::DEBUG)<<"CONFIGURATION SERVICE: Number of DEAD LAYER NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_DEBUG("CONFIGURATION SERVICE: Number of DEAD LAYER NOT AVAILABLE: " );
   
   return m_cachedDeadLayersId;
 }
 
 const std::vector<Identifier>& MDT_DQConditionsSvc::List_Chambers_with_deadTube() const{
    
-  msg(MSG::DEBUG)<<"CONFIGURATION SERVICE: Name of STATIONS WITH DEAD TUBE: "<<endmsg;
+  ATH_MSG_DEBUG("CONFIGURATION SERVICE: Name of STATIONS WITH DEAD TUBE: " );
   
   return m_condDataTool->List_Chambers_with_deadTube();
 }
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DeadTubeConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DeadTubeConditionsSvc.cxx
index d4d51c9e0d0672768680e51fb7de3f6c3de7efa1..b47e935f2f60413936db17769fa11f1a274a6848 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DeadTubeConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DeadTubeConditionsSvc.cxx
@@ -34,15 +34,15 @@ MDT_DeadTubeConditionsSvc::~MDT_DeadTubeConditionsSvc()
 StatusCode MDT_DeadTubeConditionsSvc::initialize()
 {
   
-  msg(MSG::INFO) << "Initializing " << name() << " - package version " 
-		 << PACKAGE_VERSION << endmsg;
+  ATH_MSG_INFO( "Initializing " << name() << " - package version " 
+                << PACKAGE_VERSION  );
   
   StoreGateSvc * detStore;
   StatusCode status = service("DetectorStore",detStore);
   if (status.isFailure()) {
-    msg(MSG::FATAL) << "DetectorStore service not found !" << endmsg; 
+    ATH_MSG_FATAL( "DetectorStore service not found !"  );
   } else {
-    msg(MSG::INFO) << "DetectorStore service found !" << endmsg; 
+    ATH_MSG_VERBOSE( "DetectorStore service found !"  );
     
   }
   if(m_deadtubeInfofromCool)
@@ -51,42 +51,42 @@ StatusCode MDT_DeadTubeConditionsSvc::initialize()
       if ( sc.isFailure() )
 	{
 	  
-	  msg(MSG::ERROR) << "Could not retrieve MDT_DeadTubeConditionsTool" << endmsg;
+	  ATH_MSG_ERROR( "Could not retrieve MDT_DeadTubeConditionsTool"  );
 	}
       else
 	{
 	  
-	  msg(MSG::INFO)<<"MDT_DeadTubeConditionsTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool<<endmsg;
+	  ATH_MSG_VERBOSE("MDT_DeadTubeConditionsTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool );
 	}
             
       std::vector<std::string> folderNames;
       folderNames.push_back((m_condDataTool)->DeadTubeFolderName());
       
       
-      msg(MSG::INFO)<<"Register call-back  against "<<folderNames.size()<<" folders listed below "<<endmsg;
+      ATH_MSG_VERBOSE("Register call-back  against "<<folderNames.size()<<" folders listed below " );
       //  bool aFolderFound = false;
       short ic=0;
       for (std::vector<std::string>::const_iterator ifld =folderNames.begin(); ifld!=folderNames.end(); ++ifld )
 	{
 	  ++ic;
-	  msg(MSG::INFO)<<" Folder n. "<<ic<<" <"<<(*ifld)<<">";
+	  ATH_MSG_VERBOSE(" Folder n. "<<ic<<" <"<<(*ifld)<<">" );
 	  if (detStore->contains<CondAttrListCollection>(*ifld)) {
 	    //    aFolderFound=true;
-	    msg(MSG::INFO)<<"     found in the DetStore"<<endmsg;
+	    ATH_MSG_VERBOSE("     found in the DetStore" );
 	    const DataHandle<CondAttrListCollection> MDTDeadTubeData;
 	    if (detStore->regFcn(&IMDT_DeadTubeConditionsSvc::initInfo,
 				 dynamic_cast<IMDT_DeadTubeConditionsSvc *>(this),
 				 MDTDeadTubeData,
 				 *ifld)!=StatusCode::SUCCESS)
 	      {
-		msg(MSG::WARNING)<<"Unable to register call back for initDeadTubeInfo against folder <"<<(*ifld)<<">";
+		ATH_MSG_WARNING("Unable to register call back for initDeadTubeInfo against folder <"<<(*ifld)<<">" );
 	      }
-	    else msg(MSG::INFO)<<"initDeadTubeInfo registered for call-back against folder <"<<(*ifld)<<">"<<endmsg;
+	    else ATH_MSG_VERBOSE("initDeadTubeInfo registered for call-back against folder <"<<(*ifld)<<">" );
 	  }
 	  else
 	    {   
-	      msg(MSG::WARNING)<<"Folder "<<(*ifld)
-			       <<" NOT found in the DetStore --- failing to init ???"<<endmsg;
+	      ATH_MSG_WARNING("Folder "<<(*ifld)
+                              <<" NOT found in the DetStore --- failing to init ???" );
 	    }
 	}
     }
@@ -121,8 +121,8 @@ StatusCode MDT_DeadTubeConditionsSvc::queryInterface(const InterfaceID& riid, vo
 	
 StatusCode MDT_DeadTubeConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
 {
-  msg(MSG::INFO)<<"initDeadTubeInfo has been called"<<endmsg;
-  msg(MSG::INFO)<<"ToolHandle in init DeadTube Info - <"<<m_condDataTool<<">"<<endmsg;
+  ATH_MSG_VERBOSE("initDeadTubeInfo has been called" );
+  ATH_MSG_VERBOSE("ToolHandle in init DeadTube Info - <"<<m_condDataTool<<">" );
    
   if(m_deadtubeInfofromCool)
     {
@@ -130,7 +130,7 @@ StatusCode MDT_DeadTubeConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
       StatusCode sc = m_condDataTool->loadParameters(I, keys);
       if (sc.isFailure())
 	{
-	  msg(MSG::WARNING)<<"Reading DeadTube from COOL failed; NO MDT DeadTube INFO AVAILABLE"<<endmsg;
+	  ATH_MSG_WARNING("Reading DeadTube from COOL failed; NO MDT DeadTube INFO AVAILABLE" );
 	}
     }
     
@@ -141,14 +141,14 @@ StatusCode MDT_DeadTubeConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
 const std::vector<std::string>& MDT_DeadTubeConditionsSvc::deadTubes() const{
   
   unsigned int size_new =m_condDataTool->deadTubes().size();
-  msg(MSG::DEBUG)<<"Dead SERVICE: Number of DEAD TUBE: "<<size_new <<endmsg;
+  ATH_MSG_DEBUG("Dead SERVICE: Number of DEAD TUBE: "<<size_new  );
   return m_condDataTool->deadTubes();
 }
 
 
 const std::vector<std::string>& MDT_DeadTubeConditionsSvc::deadStations() const{
    
-  msg(MSG::DEBUG)<<"CONFIGURATION SERVICE: Number of DEAD STATIONS NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_DEBUG("CONFIGURATION SERVICE: Number of DEAD STATIONS NOT AVAILABLE: " );
   
   return m_cachedDeadStations;
 }
@@ -156,7 +156,7 @@ const std::vector<std::string>& MDT_DeadTubeConditionsSvc::deadStations() const{
 
 const std::vector<std::string>& MDT_DeadTubeConditionsSvc::deadMultiLayers() const{
    
-  msg(MSG::DEBUG)<<"CONFIGURATION SERVICE: Number of DEAD ML NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_DEBUG("CONFIGURATION SERVICE: Number of DEAD ML NOT AVAILABLE: " );
   
   return m_cachedDeadMultiLayers;
 }
@@ -190,14 +190,14 @@ bool MDT_DeadTubeConditionsSvc::isGoodMultiLayer(const Identifier & /*Id*/) cons
 const std::vector<Identifier>& MDT_DeadTubeConditionsSvc::deadTubesId() const{
   
   unsigned int size_new =m_condDataTool->deadTubesId().size();
-  msg(MSG::DEBUG)<<"DCS SERVICE: Number of DEAD TUBE: "<<size_new <<endmsg;
+  ATH_MSG_DEBUG("DCS SERVICE: Number of DEAD TUBE: "<<size_new  );
   return m_condDataTool->deadTubesId();
 }
 
 
 const std::vector<Identifier>& MDT_DeadTubeConditionsSvc::deadStationsId() const{
    
-  msg(MSG::DEBUG)<<"CONFIGURATION SERVICE: Number of DEAD STATIONS NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_DEBUG("CONFIGURATION SERVICE: Number of DEAD STATIONS NOT AVAILABLE: " );
   
   return m_cachedDeadStationsId;
 }
@@ -205,21 +205,21 @@ const std::vector<Identifier>& MDT_DeadTubeConditionsSvc::deadStationsId() const
 
 const std::vector<Identifier>& MDT_DeadTubeConditionsSvc::deadMultiLayersId() const{
    
-  msg(MSG::DEBUG)<<"CONFIGURATION SERVICE: Number of DEAD ML NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_DEBUG("CONFIGURATION SERVICE: Number of DEAD ML NOT AVAILABLE: " );
   
   return m_cachedDeadMultiLayersId;
 }
 
 const std::vector<Identifier>& MDT_DeadTubeConditionsSvc::deadLayersId() const{
    
-  msg(MSG::DEBUG)<<"CONFIGURATION SERVICE: Number of DEAD LAYERS NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_DEBUG("CONFIGURATION SERVICE: Number of DEAD LAYERS NOT AVAILABLE: " );
   
   return m_cachedDeadLayersId;
 }
 
 const std::vector<Identifier>& MDT_DeadTubeConditionsSvc::List_Chambers_with_deadTube() const{
    
-  msg(MSG::DEBUG)<<"CONFIGURATION SERVICE: Name of STATIONS WITH DEAD TUBE: "<<endmsg;
+  ATH_MSG_DEBUG("CONFIGURATION SERVICE: Name of STATIONS WITH DEAD TUBE: " );
   
   return m_condDataTool->List_Chambers_with_deadTube();
 }
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MuonAlignmentErrorDbSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MuonAlignmentErrorDbSvc.cxx
index d4aeb4446a05662e57cadf1d5ab3fea30257c805..aeab9b4f8f70c83e84f0d337b120fe6e70c2f4e2 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MuonAlignmentErrorDbSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MuonAlignmentErrorDbSvc.cxx
@@ -38,15 +38,15 @@ MuonAlignmentErrorDbSvc::~MuonAlignmentErrorDbSvc()
 StatusCode MuonAlignmentErrorDbSvc::initialize()
 {
   
-  msg(MSG::INFO) << "Initializing " << name() << " - package version " 
-		 << PACKAGE_VERSION << endmsg;
+  ATH_MSG_INFO( "Initializing " << name() << " - package version " 
+                << PACKAGE_VERSION  );
   
   StoreGateSvc * detStore;
   StatusCode status = service("DetectorStore",detStore);
   if (status.isFailure()) {
-    msg(MSG::FATAL) << "DetectorStore service not found !" << endmsg; 
+    ATH_MSG_FATAL( "DetectorStore service not found !"  );
   } else {
-    msg(MSG::INFO) << "DetectorStore service found !" << endmsg; 
+    ATH_MSG_VERBOSE( "DetectorStore service found !"  );
     
   }
 
@@ -54,12 +54,12 @@ StatusCode MuonAlignmentErrorDbSvc::initialize()
   if ( sc.isFailure() )
     {
       
-      msg(MSG::ERROR) << "Could not retrieve MuonAlignmentErrorDbTool" << endmsg;
+      ATH_MSG_ERROR( "Could not retrieve MuonAlignmentErrorDbTool"  );
     }
   else
     {
 	  
-      msg(MSG::INFO)<<"MuonAlignmentErrorTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool<<endmsg;
+      ATH_MSG_VERBOSE("MuonAlignmentErrorTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool );
     }
 
   
@@ -70,36 +70,36 @@ StatusCode MuonAlignmentErrorDbSvc::initialize()
 //   {
 //     return StatusCode::FAILURE;
 //   }
-      msg(MSG::INFO)<<"dopo init "<<sc<<endmsg;
+      ATH_MSG_VERBOSE("dopo init "<<sc );
 
       std::vector<std::string> folderNames;
       folderNames.push_back((m_condDataTool)->ErrorFolderName());
 
 
-      msg(MSG::INFO)<<"Register call-back  against "<<folderNames.size()<<" folders listed below "<<endmsg;
+      ATH_MSG_VERBOSE("Register call-back  against "<<folderNames.size()<<" folders listed below " );
 
       short ic=0;
       for (std::vector<std::string>::const_iterator ifld =folderNames.begin(); ifld!=folderNames.end(); ++ifld )
 	{
 	  ++ic;
-	  msg(MSG::INFO)<<" Folder n. "<<ic<<" <"<<(*ifld)<<">";
+	  ATH_MSG_VERBOSE(" Folder n. "<<ic<<" <"<<(*ifld)<<">" );
 	  if (detStore->contains<CondAttrListCollection>(*ifld)) {
 	    //    aFolderFound=true;
-	    msg(MSG::INFO)<<"     found in the DetStore"<<endmsg;
+	    ATH_MSG_VERBOSE("     found in the DetStore" );
 	    const DataHandle<CondAttrListCollection> MUONERRORData;
 	    if (detStore->regFcn(&IMuonAlignmentErrorDbSvc::initInfo,
 				 dynamic_cast<IMuonAlignmentErrorDbSvc *>(this),
 				 MUONERRORData,
 				 *ifld)!=StatusCode::SUCCESS)
 	      {
-		msg(MSG::WARNING)<<"Unable to register call back for initErrorInfo against folder <"<<(*ifld)<<">";
+		ATH_MSG_WARNING("Unable to register call back for initErrorInfo against folder <"<<(*ifld)<<">" );
 	      }
-	    else msg(MSG::INFO)<<"initInfo registered for call-back against folder <"<<(*ifld)<<">"<<endmsg;
+	    ATH_MSG_VERBOSE("initInfo registered for call-back against folder <"<<(*ifld)<<">" );
 	  }
 	  else
 	    {   
-	      msg(MSG::WARNING)<<"Folder "<<(*ifld)
-			       <<" NOT found in the DetStore --- failing to init ???"<<endmsg;
+	      ATH_MSG_WARNING("Folder "<<(*ifld)
+                              <<" NOT found in the DetStore --- failing to init ???" );
 	    }
 	}
  
@@ -109,26 +109,26 @@ StatusCode MuonAlignmentErrorDbSvc::initialize()
 StatusCode MuonAlignmentErrorDbSvc::finalize()
 {
   
-  msg(MSG::INFO) << "Finalize" << endmsg;
+  ATH_MSG_VERBOSE( "Finalize"  );
   return StatusCode::SUCCESS;
 }
 /*
 StatusCode MuonAlignmentErrorDbSvc::queryInterface(const InterfaceID& riid, void** ppvIF)
 {
-  msg(MSG::INFO) << "queryInterface Start" << endmsg;
+  ATH_MSG_VERBOSE( "queryInterface Start"  );
   if(IMuonAlignmentErrorDbSvc::interfaceID().versionMatch(riid) )
     {
-      msg(MSG::INFO) << "versionMatch=true" << endmsg;
+      ATH_MSG_VERBOSE( "versionMatch=true"  );
       *ppvIF = this;
     }else if ( IMuonAlignmentErrorDbSvc::interfaceID().versionMatch(riid) ){
     *ppvIF = dynamic_cast<IMuonAlignmentErrorSvc*>(this);
-    msg(MSG::INFO) << "service cast***************************" << endmsg;
+    ATH_MSG_VERBOSE( "service cast***************************"  );
 
   } else {
-    msg(MSG::INFO) << "cannot find the interface!" << endmsg;
+    ATH_MSG_VERBOSE( "cannot find the interface!"  );
     return AthService::queryInterface(riid, ppvIF);
   }
-  msg(MSG::INFO) << "queryInterface succesfull" << endmsg;
+  ATH_MSG_VERBOSE( "queryInterface successful"  );
   //addRef();  // is this needed ??                                                                                             
   return StatusCode::SUCCESS;
 }
@@ -151,14 +151,14 @@ StatusCode MuonAlignmentErrorDbSvc::queryInterface(const InterfaceID& riid, void
 
 StatusCode MuonAlignmentErrorDbSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
 {
-  msg(MSG::INFO)<<"initInfo has been called"<<endmsg;
-  msg(MSG::INFO)<<"ToolHandle in initMappingModel - <"<<m_condDataTool<<">"<<endmsg;
+  ATH_MSG_VERBOSE("initInfo has been called" );
+  ATH_MSG_VERBOSE("ToolHandle in initMappingModel - <"<<m_condDataTool<<">" );
   
   
   StatusCode sc = m_condDataTool->loadParameters(I, keys);
   if (sc.isFailure())
     {
-      msg(MSG::WARNING)<<"Reading Alignment Error from COOL failed; NO ERROR INFO AVAILABLE"<<endmsg;
+      ATH_MSG_WARNING("Reading Alignment Error from COOL failed; NO ERROR INFO AVAILABLE" );
     }
   
   
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_DCSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_DCSConditionsSvc.cxx
index 5f0fd1041edb677eda320d90c03412d3730757ab..a6704afa485ea579720d791e24144cf846f1911d 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_DCSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_DCSConditionsSvc.cxx
@@ -38,15 +38,15 @@ RPC_DCSConditionsSvc::~RPC_DCSConditionsSvc()
 StatusCode RPC_DCSConditionsSvc::initialize()
 {
   
-  msg(MSG::INFO) << "Initializing " << name() << " - package version " 
-		 << PACKAGE_VERSION << endmsg;
+  ATH_MSG_INFO( "Initializing " << name() << " - package version " 
+                << PACKAGE_VERSION  );
   
   StoreGateSvc * detStore;
   StatusCode status = service("DetectorStore",detStore);
   if (status.isFailure()) {
-    msg(MSG::FATAL) << "DetectorStore service not found !" << endmsg; 
+    ATH_MSG_FATAL( "DetectorStore service not found !"  );
   } else {
-    msg(MSG::INFO) << "DetectorStore service found !" << endmsg; 
+    ATH_MSG_VERBOSE( "DetectorStore service found !"  );
     
   }
   if(m_dcsInfofromCool)
@@ -55,41 +55,41 @@ StatusCode RPC_DCSConditionsSvc::initialize()
       if ( sc.isFailure() )
 	{
 	  
-	  msg(MSG::ERROR) << "Could not retrieve RPC_DCSConditionsTool" << endmsg;
+	  ATH_MSG_ERROR( "Could not retrieve RPC_DCSConditionsTool"  );
 	}
       else
 	{
 	  
-	  msg(MSG::INFO)<<"RPC_DCSConditionsTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool<<endmsg;
+	  ATH_MSG_VERBOSE("RPC_DCSConditionsTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool );
 	}
       std::vector<std::string> folderNames;
       folderNames.push_back((m_condDataTool)->PanelOffFolderName());
       folderNames.push_back((m_condDataTool)->PanelDeadFolderName());
      
-      msg(MSG::INFO)<<"Register call-back  against "<<folderNames.size()<<" folders listed below "<<endmsg;
+      ATH_MSG_VERBOSE("Register call-back  against "<<folderNames.size()<<" folders listed below " );
       //   bool aFolderFound = false;
       short ic=0;
       for (std::vector<std::string>::const_iterator ifld =folderNames.begin(); ifld!=folderNames.end(); ++ifld )
 	{
 	  ++ic;
-	  msg(MSG::INFO)<<" Folder n. "<<ic<<" <"<<(*ifld)<<">";
+	  ATH_MSG_VERBOSE(" Folder n. "<<ic<<" <"<<(*ifld)<<">" );
 	  if (detStore->contains<CondAttrListCollection>(*ifld)) {
 	    //    aFolderFound=true;
-	    msg(MSG::INFO)<<"     found in the DetStore"<<endmsg;
+	    ATH_MSG_VERBOSE("     found in the DetStore" );
 	    const DataHandle<CondAttrListCollection> RPCDCSData;
 	    if (detStore->regFcn(&IRPC_DCSConditionsSvc::initInfo,
 				 dynamic_cast<IRPC_DCSConditionsSvc *>(this),
 				 RPCDCSData,
 				 *ifld)!=StatusCode::SUCCESS)
 	      {
-		msg(MSG::WARNING)<<"Unable to register call back for initDCSInfo against folder <"<<(*ifld)<<">";
+		ATH_MSG_WARNING("Unable to register call back for initDCSInfo against folder <"<<(*ifld)<<">" );
 	      }
-	    else msg(MSG::INFO)<<"initDCSInfo registered for call-back against folder <"<<(*ifld)<<">"<<endmsg;
+	    else ATH_MSG_VERBOSE("initDCSInfo registered for call-back against folder <"<<(*ifld)<<">" );
 	  }
 	  else
 	    {   
-	      msg(MSG::WARNING)<<"Folder "<<(*ifld)
-			       <<" NOT found in the DetStore --- failing to init ???"<<endmsg;
+	      ATH_MSG_WARNING("Folder "<<(*ifld)
+                              <<" NOT found in the DetStore --- failing to init ???" );
 	    }
 	}
     }
@@ -100,7 +100,7 @@ StatusCode RPC_DCSConditionsSvc::initialize()
 StatusCode RPC_DCSConditionsSvc::finalize()
 {
   
-  msg(MSG::INFO) << "Finalize" << endmsg;
+  ATH_MSG_VERBOSE( "Finalize"  );
   return StatusCode::SUCCESS;
 }
 
@@ -124,8 +124,8 @@ StatusCode RPC_DCSConditionsSvc::queryInterface(const InterfaceID& riid, void**
 
 StatusCode RPC_DCSConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
 {
-  msg(MSG::INFO)<<"initDCSInfo has been called"<<endmsg;
-  msg(MSG::INFO)<<"ToolHandle in initMappingModel - <"<<m_condDataTool<<">"<<endmsg;
+  ATH_MSG_VERBOSE("initDCSInfo has been called" );
+  ATH_MSG_VERBOSE("ToolHandle in initMappingModel - <"<<m_condDataTool<<">" );
   
   if(m_dcsInfofromCool)
     {
@@ -133,7 +133,7 @@ StatusCode RPC_DCSConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
       StatusCode sc = m_condDataTool->loadParameters(I, keys);
       if (sc.isFailure())
 	{
-	  msg(MSG::WARNING)<<"Reading DCS from COOL failed; NO RPC DCS INFO AVAILABLE"<<endmsg;
+	  ATH_MSG_WARNING("Reading DCS from COOL failed; NO RPC DCS INFO AVAILABLE" );
 	}
       
     }
@@ -159,7 +159,7 @@ const std::vector<Identifier>& RPC_DCSConditionsSvc::deadPanelId() const{
   
   unsigned int size_new =m_condDataTool->deadPanelId().size();
   
-  msg(MSG::VERBOSE)<<"DCS SERVICE: Number of DEAD Panel: "<<size_new <<endmsg;
+  ATH_MSG_VERBOSE("DCS SERVICE: Number of DEAD Panel: "<<size_new  );
   
   //std::cout<<"DCS SERVICE: Number of DEAD Panel: "<<size_new <<std::endl;
   
@@ -168,14 +168,14 @@ const std::vector<Identifier>& RPC_DCSConditionsSvc::deadPanelId() const{
 }
 const std::vector<Identifier>& RPC_DCSConditionsSvc::EffPanelId() const{
   
-  msg(MSG::VERBOSE)<<"DCS SERVICE: RPC  Eff PANEL NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_VERBOSE("DCS SERVICE: RPC  Eff PANEL NOT AVAILABLE: " );
   
   return m_cachedeffPanelId;
 }
 
 const std::vector<Identifier>& RPC_DCSConditionsSvc::EffStripId() const{
   
-  msg(MSG::VERBOSE)<<"DCS SERVICE: RPC  Eff STRIP NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_VERBOSE("DCS SERVICE: RPC  Eff STRIP NOT AVAILABLE: " );
   
   return m_cachedeffStripId;
 }
@@ -186,7 +186,7 @@ const std::vector<Identifier>& RPC_DCSConditionsSvc::offPanelId() const{
   
   unsigned int size_new =m_condDataTool->offPanelId().size();
   
-  msg(MSG::VERBOSE)<<"DCS SERVICE: Number of OFF Panel: "<<size_new <<endmsg;
+  ATH_MSG_VERBOSE("DCS SERVICE: Number of OFF Panel: "<<size_new  );
   //std::cout<<"DCS SERVICE: Number of OFF Panel: "<<size_new <<std::endl;
   
   
@@ -199,7 +199,7 @@ const std::vector<Identifier>& RPC_DCSConditionsSvc::offPanelId() const{
 const std::map<Identifier,double>& RPC_DCSConditionsSvc::RPC_EfficiencyMap(){
 static  std::map<Identifier ,double> s_RPCCondSummarySvc_RPC_PanelEfficiencyMap_empty;
  s_RPCCondSummarySvc_RPC_PanelEfficiencyMap_empty.clear(); 
-  msg(MSG::VERBOSE)<<"Efficiency Map per RPC panel"<<endmsg;
+ ATH_MSG_VERBOSE("Efficiency Map per RPC panel" );
  
   return s_RPCCondSummarySvc_RPC_PanelEfficiencyMap_empty;
 }
@@ -207,7 +207,7 @@ const std::map<Identifier,double>& RPC_DCSConditionsSvc::RPC_EfficiencyGapMap(){
 static  std::map<Identifier ,double> s_RPCCondSummarySvc_RPC_GapEfficiencyMap_empty;
  
   s_RPCCondSummarySvc_RPC_GapEfficiencyMap_empty.clear(); 
-  msg(MSG::VERBOSE)<<"EfficiencyGap Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("EfficiencyGap Map per RPC panel" );
  
   return s_RPCCondSummarySvc_RPC_GapEfficiencyMap_empty;
 }
@@ -217,7 +217,7 @@ const std::map<Identifier,double>& RPC_DCSConditionsSvc::RPC_MeanClusterSizeMap(
  static  std::map<Identifier ,double> s_RPCCondSummarySvc_RPC_PanelMeanClusterSizeMap_empty;
 
   s_RPCCondSummarySvc_RPC_PanelMeanClusterSizeMap_empty.clear();
-  msg(MSG::VERBOSE)<<"MeanClusterSize Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("MeanClusterSize Map per RPC panel" );
  
   return s_RPCCondSummarySvc_RPC_PanelMeanClusterSizeMap_empty;
 }
@@ -227,7 +227,7 @@ const std::map<Identifier,double>& RPC_DCSConditionsSvc::RPC_FracClusterSize1Map
 static  std::map<Identifier ,double> s_RPCCondSummarySvc_RPC_PanelFracClusterSize1Map_empty;
  
   s_RPCCondSummarySvc_RPC_PanelFracClusterSize1Map_empty.clear(); 
-  msg(MSG::VERBOSE)<<"FracClusterSize1 Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("FracClusterSize1 Map per RPC panel" );
  
   return s_RPCCondSummarySvc_RPC_PanelFracClusterSize1Map_empty;
 }
@@ -237,7 +237,7 @@ const std::map<Identifier,double>& RPC_DCSConditionsSvc::RPC_FracClusterSize2Map
 static  std::map<Identifier ,double> s_RPCCondSummarySvc_RPC_PanelFracClusterSize2Map_empty;
  
   s_RPCCondSummarySvc_RPC_PanelFracClusterSize2Map_empty.clear();
-  msg(MSG::VERBOSE)<<"FracClusterSize2 Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("FracClusterSize2 Map per RPC panel" );
  
   return s_RPCCondSummarySvc_RPC_PanelFracClusterSize2Map_empty;
 }
@@ -246,7 +246,7 @@ const std::map<Identifier,double>& RPC_DCSConditionsSvc::RPC_FracClusterSize3Map
 static  std::map<Identifier ,double> s_RPCCondSummarySvc_RPC_PanelFracClusterSize3Map_empty;
  
   s_RPCCondSummarySvc_RPC_PanelFracClusterSize3Map_empty.clear();
-  msg(MSG::VERBOSE)<<"FracClusterSize3 Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("FracClusterSize3 Map per RPC panel" );
  
   return s_RPCCondSummarySvc_RPC_PanelFracClusterSize3Map_empty;
 }
@@ -255,7 +255,7 @@ const std::map<Identifier,std::string>& RPC_DCSConditionsSvc::RPC_DeadStripListM
  static  std::map<Identifier ,std::string> s_RPCCondSummarySvc_RPC_PanelDeadStripListMap_empty;
 
   s_RPCCondSummarySvc_RPC_PanelDeadStripListMap_empty.clear();
-  msg(MSG::VERBOSE)<<"DeadStripList Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("DeadStripList Map per RPC panel" );
  
   return s_RPCCondSummarySvc_RPC_PanelDeadStripListMap_empty;
 }
@@ -265,7 +265,7 @@ const std::map<Identifier,float>& RPC_DCSConditionsSvc::RPC_FracDeadStripMap(){
 static  std::map<Identifier ,float> s_RPCCondSummarySvc_RPC_PanelFracDeadStripMap_empty;
 
   s_RPCCondSummarySvc_RPC_PanelFracDeadStripMap_empty.clear(); 
-  msg(MSG::VERBOSE)<<"FracDeadStrip Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("FracDeadStrip Map per RPC panel" );
  
   return s_RPCCondSummarySvc_RPC_PanelFracDeadStripMap_empty;
 }
@@ -274,7 +274,7 @@ const std::map<Identifier,int>& RPC_DCSConditionsSvc::RPC_ProjectedTracksMap(){
 static  std::map<Identifier ,int> s_RPCCondSummarySvc_RPC_PanelProjectedTracksMap_empty;
 
   s_RPCCondSummarySvc_RPC_PanelProjectedTracksMap_empty.clear(); 
-  msg(MSG::VERBOSE)<<"ProjectedTracks Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("ProjectedTracks Map per RPC panel" );
  
   return s_RPCCondSummarySvc_RPC_PanelProjectedTracksMap_empty;
 }
@@ -284,7 +284,7 @@ const std::map<Identifier,int>& RPC_DCSConditionsSvc::RPC_DeadStripList(){
 static  std::map<Identifier ,int> s_RPCCondSummarySvc_RPC_PanelDeadStripList_empty;
 
   s_RPCCondSummarySvc_RPC_PanelDeadStripList_empty.clear(); 
-  msg(MSG::VERBOSE)<<"DeadStripList per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("DeadStripList per RPC panel" );
  
   return s_RPCCondSummarySvc_RPC_PanelDeadStripList_empty;
 }
@@ -293,7 +293,7 @@ const std::map<Identifier,std::vector<double> >& RPC_DCSConditionsSvc::RPC_TimeM
 static  std::map<Identifier ,std::vector<double> > s_RPCCondSummarySvc_RPC_StripTimeMap_empty;
 
   s_RPCCondSummarySvc_RPC_StripTimeMap_empty.clear(); 
-  msg(MSG::VERBOSE)<<"StripTimeMap per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("StripTimeMap per RPC panel" );
  
   return s_RPCCondSummarySvc_RPC_StripTimeMap_empty;
 }
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_STATUSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_STATUSConditionsSvc.cxx
index 311a0e10da04a49bdfbd8666b7dc3d6e00d57175..62477569e016f917d5cba6457c130bf59037d22c 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_STATUSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_STATUSConditionsSvc.cxx
@@ -39,15 +39,15 @@ RPC_STATUSConditionsSvc::~RPC_STATUSConditionsSvc()
 StatusCode RPC_STATUSConditionsSvc::initialize()
 {
   
-  msg(MSG::INFO) << "Initializing " << name() << " - package version " 
-		 << PACKAGE_VERSION << endmsg;
+  ATH_MSG_INFO( "Initializing " << name() << " - package version " 
+                << PACKAGE_VERSION  );
   
   StoreGateSvc * detStore;
   StatusCode status = service("DetectorStore",detStore);
   if (status.isFailure()) {
-    msg(MSG::FATAL) << "DetectorStore service not found !" << endmsg; 
+    ATH_MSG_FATAL( "DetectorStore service not found !"  );
   } else {
-    msg(MSG::INFO) << "DetectorStore service found !" << endmsg; 
+    ATH_MSG_VERBOSE( "DetectorStore service found !"  );
     
   }
   //if(m_dcsInfofromCool)
@@ -56,12 +56,12 @@ StatusCode RPC_STATUSConditionsSvc::initialize()
   if ( sc.isFailure() )
     {
       
-      msg(MSG::ERROR) << "Could not retrieve RPC_STATUSConditionsTool" << endmsg;
+      ATH_MSG_ERROR( "Could not retrieve RPC_STATUSConditionsTool"  );
     }
   else
     {
       
-      msg(MSG::INFO)<<"RPC_STATUSConditionsTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool<<endmsg;
+      ATH_MSG_VERBOSE("RPC_STATUSConditionsTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool );
     }
   
   
@@ -69,31 +69,31 @@ StatusCode RPC_STATUSConditionsSvc::initialize()
   std::vector<std::string> folderNames;
   folderNames.push_back((m_condDataTool)->FolderName());
    
-  msg(MSG::INFO)<<"Register call-back  against "<<folderNames.size()<<" folders listed below "<<endmsg;
+  ATH_MSG_VERBOSE("Register call-back  against "<<folderNames.size()<<" folders listed below " );
   //bool aFolderFound = false;
   short ic=0;
   for (std::vector<std::string>::const_iterator ifld =folderNames.begin(); ifld!=folderNames.end(); ++ifld )
     {
       ++ic;
-      msg(MSG::INFO)<<" Folder n. "<<ic<<" <"<<(*ifld)<<">";
+      ATH_MSG_VERBOSE(" Folder n. "<<ic<<" <"<<(*ifld)<<">" );
       if (detStore->contains<CondAttrListCollection>(*ifld)) {
 	//aFolderFound=true;
-	msg(MSG::INFO)<<"     found in the DetStore"<<endmsg;
+	ATH_MSG_VERBOSE("     found in the DetStore" );
 	const DataHandle<CondAttrListCollection> RPCData;
 	if (detStore->regFcn(&IRPC_STATUSConditionsSvc::initInfo,
 			     dynamic_cast<IRPC_STATUSConditionsSvc *>(this),
 			     RPCData,
 			     *ifld)!=StatusCode::SUCCESS)
 	  {
-	    msg(MSG::WARNING)<<"Unable to register call back for initDCSInfo against folder <"<<(*ifld)<<">";
+	    ATH_MSG_WARNING("Unable to register call back for initDCSInfo against folder <"<<(*ifld)<<">" );
 	    //return StatusCode::FAILURE;
 	  }
-	    else msg(MSG::INFO)<<"initDCSInfo registered for call-back against folder <"<<(*ifld)<<">"<<endmsg;
+        else ATH_MSG_VERBOSE("initDCSInfo registered for call-back against folder <"<<(*ifld)<<">" );
       }
       else
 	{   
-	  msg(MSG::WARNING)<<"Folder "<<(*ifld)
-			   <<" NOT found in the DetStore --- failing to init ???"<<endmsg;
+	  ATH_MSG_WARNING("Folder "<<(*ifld)
+                          <<" NOT found in the DetStore --- failing to init ???" );
 	  //	      break;
 	}
     }
@@ -105,7 +105,7 @@ StatusCode RPC_STATUSConditionsSvc::initialize()
 StatusCode RPC_STATUSConditionsSvc::finalize()
 {
 
-     msg(MSG::INFO) << "Finalize" << endmsg;
+  ATH_MSG_VERBOSE( "Finalize"  );
   return StatusCode::SUCCESS;
 }
 
@@ -129,8 +129,8 @@ StatusCode RPC_STATUSConditionsSvc::queryInterface(const InterfaceID& riid, void
 	
 StatusCode RPC_STATUSConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
 {
-  msg(MSG::INFO)<<"initDCSInfo has been called"<<endmsg;
-  msg(MSG::INFO)<<"ToolHandle in initMappingModel - <"<<m_condDataTool<<">"<<endmsg;
+  ATH_MSG_VERBOSE("initDCSInfo has been called" );
+  ATH_MSG_VERBOSE("ToolHandle in initMappingModel - <"<<m_condDataTool<<">" );
    
   //  if(m_dcsInfofromCool)
   // {
@@ -138,7 +138,7 @@ StatusCode RPC_STATUSConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys))
       StatusCode sc = m_condDataTool->loadParameterStatus(I, keys);
       if (sc.isFailure())
 	{
-	  msg(MSG::WARNING)<<"Reading DCS from COOL failed; NO INFO AVAILABLE"<<endmsg;
+	  ATH_MSG_WARNING("Reading DCS from COOL failed; NO INFO AVAILABLE" );
 	}
       
       // }
@@ -163,7 +163,7 @@ bool RPC_STATUSConditionsSvc::isGoodStrip(const Identifier & /*Id*/) const{
 const std::vector<Identifier>& RPC_STATUSConditionsSvc::EffPanelId() const{
   
    
-  msg(MSG::VERBOSE)<<"SERVICE: Number of Panel: "<<endmsg;
+  ATH_MSG_VERBOSE("SERVICE: Number of Panel: " );
   
   return m_condDataTool->EffPanelId();
 }
@@ -171,14 +171,14 @@ const std::vector<Identifier>& RPC_STATUSConditionsSvc::EffPanelId() const{
 
 const std::vector<Identifier>& RPC_STATUSConditionsSvc::EffStripId() const{
   
-  msg(MSG::VERBOSE)<<"Eff Strip RPC "<<endmsg;
+  ATH_MSG_VERBOSE("Eff Strip RPC " );
   
   return m_condDataTool->EffStripId();
 }
 
 const std::vector<Identifier>& RPC_STATUSConditionsSvc::offPanelId() const{
    
-  msg(MSG::VERBOSE)<<"DCS SERVICE: RPC  off PANEL NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_VERBOSE("DCS SERVICE: RPC  off PANEL NOT AVAILABLE: " );
   
   return m_cachedoffPanelId;
  
@@ -187,7 +187,7 @@ const std::vector<Identifier>& RPC_STATUSConditionsSvc::offPanelId() const{
 
 const std::vector<Identifier>& RPC_STATUSConditionsSvc::deadPanelId() const{
    
-  msg(MSG::VERBOSE)<<"DCS SERVICE: RPC  dead PANEL NOT AVAILABLE: "<<endmsg;
+  ATH_MSG_VERBOSE("DCS SERVICE: RPC  dead PANEL NOT AVAILABLE: " );
   
   return m_cacheddeadPanelId;
  
@@ -195,13 +195,13 @@ const std::vector<Identifier>& RPC_STATUSConditionsSvc::deadPanelId() const{
 }
 const std::map<Identifier,double>& RPC_STATUSConditionsSvc::RPC_EfficiencyMap(){
   
-  msg(MSG::VERBOSE)<<"Efficiency Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("Efficiency Map per RPC panel" );
   //std::cout<<"Efficiency Map per RPC panel: "<<m_condDataTool->RPC_EfficiencyMap().size() <<std::endl;
   return m_condDataTool->RPC_EfficiencyMap();
 }
 const std::map<Identifier,double>& RPC_STATUSConditionsSvc::RPC_EfficiencyGapMap(){
   
-  msg(MSG::VERBOSE)<<"EfficiencyGap Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("EfficiencyGap Map per RPC panel" );
   
   return m_condDataTool->RPC_EfficiencyGapMap();
 }
@@ -209,7 +209,7 @@ const std::map<Identifier,double>& RPC_STATUSConditionsSvc::RPC_EfficiencyGapMap
 
 const std::map<Identifier,double>& RPC_STATUSConditionsSvc::RPC_MeanClusterSizeMap(){
   
-  msg(MSG::VERBOSE)<<"MeanClusterSize Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("MeanClusterSize Map per RPC panel" );
   
   return m_condDataTool->RPC_MeanClusterSizeMap();
 }
@@ -217,7 +217,7 @@ const std::map<Identifier,double>& RPC_STATUSConditionsSvc::RPC_MeanClusterSizeM
 
 const std::map<Identifier,double>& RPC_STATUSConditionsSvc::RPC_FracClusterSize1Map(){
   
-  msg(MSG::VERBOSE)<<"FracClusterSize1 Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("FracClusterSize1 Map per RPC panel" );
   
   return m_condDataTool->RPC_FracClusterSize1Map();
 }
@@ -225,21 +225,21 @@ const std::map<Identifier,double>& RPC_STATUSConditionsSvc::RPC_FracClusterSize1
 
 const std::map<Identifier,double>& RPC_STATUSConditionsSvc::RPC_FracClusterSize2Map(){
   
-  msg(MSG::VERBOSE)<<"FracClusterSize2 Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("FracClusterSize2 Map per RPC panel" );
   
   return m_condDataTool->RPC_FracClusterSize2Map();
 }
 
 const std::map<Identifier,double>& RPC_STATUSConditionsSvc::RPC_FracClusterSize3Map(){
   
-  msg(MSG::VERBOSE)<<"FracClusterSize3 Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("FracClusterSize3 Map per RPC panel" );
   
   return m_condDataTool->RPC_FracClusterSize3Map();
 }
 
 const std::map<Identifier,std::string>& RPC_STATUSConditionsSvc::RPC_DeadStripListMap(){
   
-  msg(MSG::VERBOSE)<<"DeadStripList Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("DeadStripList Map per RPC panel" );
   
   return m_condDataTool->RPC_DeadStripListMap();
 }
@@ -247,14 +247,14 @@ const std::map<Identifier,std::string>& RPC_STATUSConditionsSvc::RPC_DeadStripLi
 
 const std::map<Identifier,float>& RPC_STATUSConditionsSvc::RPC_FracDeadStripMap(){
   
-  msg(MSG::VERBOSE)<<"FracDeadStrip Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("FracDeadStrip Map per RPC panel" );
   
   return m_condDataTool->RPC_FracDeadStripMap();
 }
 
 const std::map<Identifier,int>& RPC_STATUSConditionsSvc::RPC_ProjectedTracksMap(){
   
-  msg(MSG::VERBOSE)<<"ProjectedTracks Map per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("ProjectedTracks Map per RPC panel" );
   
   return m_condDataTool->RPC_ProjectedTracksMap();
 }
@@ -262,7 +262,7 @@ const std::map<Identifier,int>& RPC_STATUSConditionsSvc::RPC_ProjectedTracksMap(
 
 const std::map<Identifier,int>& RPC_STATUSConditionsSvc::RPC_DeadStripList(){
   
-  msg(MSG::VERBOSE)<<"DeadStripList per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("DeadStripList per RPC panel" );
   
   return m_condDataTool->RPC_DeadStripList();
 }
@@ -270,7 +270,7 @@ const std::map<Identifier,int>& RPC_STATUSConditionsSvc::RPC_DeadStripList(){
 
 const std::map<Identifier,std::vector<double> >& RPC_STATUSConditionsSvc::RPC_TimeMapforStrip(){
   
-  msg(MSG::VERBOSE)<<"DeadStripList per RPC panel"<<endmsg;
+  ATH_MSG_VERBOSE("DeadStripList per RPC panel" );
   
   return m_condDataTool->RPC_TimeMapforStrip();
 }
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGC_STATUSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGC_STATUSConditionsSvc.cxx
index 7799c76e2b9d6f32289e0f8e2a88835613d45f97..ec4509cfb6016c05f0ca913b4e0464fa625c552a 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGC_STATUSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGC_STATUSConditionsSvc.cxx
@@ -45,18 +45,18 @@ TGC_STATUSConditionsSvc::~TGC_STATUSConditionsSvc()
 
 StatusCode TGC_STATUSConditionsSvc::initialize()
 {
-  msg(MSG::INFO) << "Initializing "
+  ATH_MSG_INFO( "Initializing "
 		 << name() 
 		 << " - version" 
 		 << PACKAGE_VERSION 
-		 << endmsg;
+                );
   
   StoreGateSvc * detStore;
   StatusCode status = service("DetectorStore",detStore);
   if (status.isFailure()) {
-    msg(MSG::FATAL) << "DetectorStore service not found !" << endmsg; 
+    ATH_MSG_FATAL( "DetectorStore service not found !"  );
   } else {
-    msg(MSG::INFO) << "DetectorStore service found !" << endmsg; 
+    ATH_MSG_VERBOSE( "DetectorStore service found !"  );
     
   }
   //if(m_dcsInfofromCool)
@@ -65,12 +65,12 @@ StatusCode TGC_STATUSConditionsSvc::initialize()
   if ( sc.isFailure() )
     {
       
-      msg(MSG::ERROR) << "Could not retrieve TgcDetectorStatusDbTool" << endmsg;
+      ATH_MSG_ERROR( "Could not retrieve TgcDetectorStatusDbTool"  );
     }
   else
     {
       
-      msg(MSG::INFO)<<"TgcDetectorStatusDbTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool<<endmsg;
+      ATH_MSG_VERBOSE("TgcDetectorStatusDbTool retrieved with statusCode = "<<sc<<" pointer = "<<m_condDataTool );
     }
   
   
@@ -78,31 +78,31 @@ StatusCode TGC_STATUSConditionsSvc::initialize()
   std::vector<std::string> folderNames;
   folderNames.push_back((m_condDataTool)->FolderName());
    
-  msg(MSG::INFO)<<"Register call-back  against "<<folderNames.size()<<" folders listed below "<<endmsg;
+  ATH_MSG_VERBOSE("Register call-back  against "<<folderNames.size()<<" folders listed below " );
   // bool aFolderFound = false;
   short ic=0;
   for (std::vector<std::string>::const_iterator ifld =folderNames.begin(); ifld!=folderNames.end(); ++ifld )
     {
       ++ic;
-      msg(MSG::INFO)<<" Folder n. "<<ic<<" <"<<(*ifld)<<">";
+      ATH_MSG_VERBOSE(" Folder n. "<<ic<<" <"<<(*ifld)<<">" );
       if (detStore->contains<CondAttrListCollection>(*ifld)) {
 	//	aFolderFound=true;
-	msg(MSG::INFO)<<"     found in the DetStore"<<endmsg;
+	ATH_MSG_VERBOSE("     found in the DetStore" );
 	const DataHandle<CondAttrListCollection> TGCData;
 	if (detStore->regFcn(&ITGC_STATUSConditionsSvc::initInfo,
 			     dynamic_cast<ITGC_STATUSConditionsSvc *>(this),
 			     TGCData,
 			     *ifld)!=StatusCode::SUCCESS)
 	  {
-	    msg(MSG::WARNING)<<"Unable to register call back for initDCSInfo against folder <"<<(*ifld)<<">";
+	    ATH_MSG_WARNING("Unable to register call back for initDCSInfo against folder <"<<(*ifld)<<">" );
 	    //return StatusCode::FAILURE;
 	  }
-	    else msg(MSG::INFO)<<"initDCSInfo registered for call-back against folder <"<<(*ifld)<<">"<<endmsg;
+        else ATH_MSG_VERBOSE("initDCSInfo registered for call-back against folder <"<<(*ifld)<<">" );
       }
       else
 	{   
-	  msg(MSG::WARNING)<<"Folder "<<(*ifld)
-			   <<" NOT found in the DetStore --- failing to init ???"<<endmsg;
+	  ATH_MSG_WARNING("Folder "<<(*ifld)
+                          <<" NOT found in the DetStore --- failing to init ???" );
 	  //	      break;
 	}
     }
@@ -121,7 +121,7 @@ StatusCode TGC_STATUSConditionsSvc::initialize()
 StatusCode TGC_STATUSConditionsSvc::finalize()
 {
 
-  msg(MSG::INFO) << "Finalize" << endmsg;
+  ATH_MSG_VERBOSE( "Finalize"  );
   
   return StatusCode::SUCCESS;
 }
@@ -146,10 +146,10 @@ StatusCode TGC_STATUSConditionsSvc::queryInterface(const InterfaceID& riid, void
 	
 StatusCode TGC_STATUSConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys)) {
 
-  msg(MSG::INFO) << "initTGCInfo() has been called for "
+  ATH_MSG_VERBOSE( "initTGCInfo() has been called for "
 		 << keys.size()
 		 << " keys"
-		 << endmsg;
+                );
    
   if (m_useCool) {
     
@@ -157,7 +157,7 @@ StatusCode TGC_STATUSConditionsSvc::initInfo(IOVSVC_CALLBACK_ARGS_P(I,keys)) {
       StatusCode sc = m_condDataTool->loadParameterStatus(I, keys);
       if (sc.isFailure())
 	{
-	  msg(MSG::WARNING)<<"Reading TGC INFO from COOL failed; NO TGC INFO AVAILABLE"<<endmsg;
+	  ATH_MSG_WARNING("Reading TGC INFO from COOL failed; NO TGC INFO AVAILABLE" );
 	}
       
     }
@@ -179,7 +179,7 @@ const std::vector<Identifier>& TGC_STATUSConditionsSvc::deadStationsId(){
   
   unsigned int size_new =m_condDataTool->deadStationsId().size();
  
-  msg(MSG::VERBOSE)<<"TGC STATUS SERVICE: Number of DEAD CHAMBERS: "<<size_new <<endmsg;
+  ATH_MSG_VERBOSE("TGC STATUS SERVICE: Number of DEAD CHAMBERS: "<<size_new  );
   
   return m_condDataTool->deadStationsId();
 }