diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/PixelDetectorManager.h b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/PixelDetectorManager.h
index 3ef1f2ee12a519f68a083fd28b9fde7c969a909d..de103258f7ac18ddfd21683d1bd4cd6414a6a2c0 100755
--- a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/PixelDetectorManager.h
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/PixelDetectorManager.h
@@ -53,7 +53,7 @@ namespace InDetDD {
       /** Constructor */
       PixelDetectorManager(StoreGateSvc* detStore);
       /** Constructor with name */
-      PixelDetectorManager(StoreGateSvc* detStore, std::string name);
+      PixelDetectorManager(StoreGateSvc* detStore, const std::string& name);
 
       /** Destructor */
       ~PixelDetectorManager();
@@ -170,7 +170,8 @@ namespace InDetDD {
       const PixelID*                                                m_idHelper;
 
       // Helpful function for debugging of transforms
-      void printTransform(const Amg::Transform3D & tr) const;
+      void printTransform(MSG::Level level,
+                          const Amg::Transform3D & tr) const;
 
 
       /** This variable switches the how the local alignment corrections are applied
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelDetectorManager.cxx b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelDetectorManager.cxx
index 462ed506f628b55f4eca17b2c763af92fb5ae292..dd6ae0e6b27fb11a70aeade2c82cbe23fe1c1119 100755
--- a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelDetectorManager.cxx
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelDetectorManager.cxx
@@ -25,7 +25,8 @@ namespace InDetDD {
   const int FIRST_HIGHER_LEVEL = 1;
 
 
-  PixelDetectorManager::PixelDetectorManager(StoreGateSvc* detStore, std::string name) 
+  PixelDetectorManager::PixelDetectorManager(StoreGateSvc* detStore,
+                                             const std::string& name) 
     : SiDetectorManager(detStore,name),
       m_idHelper(0),
       m_isLogical(false) // Change to true to change the definition of local module corrections
@@ -36,8 +37,8 @@ namespace InDetDD {
     //
 
     StatusCode sc = detStore->retrieve(m_idHelper,"PixelID");
-    if (sc.isFailure() ) {
-      msg(MSG::ERROR) << "Could not retrieve Pixel id helper" << endmsg;
+    if (sc.isFailure()) {
+      ATH_MSG_ERROR("Could not retrieve Pixel id helper");
     }
 
     // Initialize the collections.
@@ -217,22 +218,22 @@ namespace InDetDD {
         // Its a local transform
         //See header file for definition of m_isLogical          
         if( m_isLogical ){
-	  //Ensure cache is up to date and use the alignment corrected local to global transform
-	  element->setCache();
-	  return setAlignableTransformLocalDelta(m_alignableTransforms[idHash].get(), element->transform(), delta, alignStore);
+    //Ensure cache is up to date and use the alignment corrected local to global transform
+    element->setCache();
+    return setAlignableTransformLocalDelta(m_alignableTransforms[idHash].get(), element->transform(), delta, alignStore);
         } else 
-	  //Use default local to global transform
-	  return setAlignableTransformLocalDelta(m_alignableTransforms[idHash].get(), element->defTransform(), delta, alignStore);
+    //Use default local to global transform
+    return setAlignableTransformLocalDelta(m_alignableTransforms[idHash].get(), element->defTransform(), delta, alignStore);
       } else {
         // other not supported
-        msg(MSG::WARNING) << "Frames other than global or local are not supported." << endmsg;
+        ATH_MSG_WARNING("Frames other than global or local are not supported.");
         return false;
       }
 
     } else { // higher level
 
       if (frame != InDetDD::global) {
-        msg(MSG::WARNING) << "Non global shift at higher levels is not possible." << endmsg;
+        ATH_MSG_WARNING("Non global shift at higher levels is not possible.");
         return false;
       }
 
@@ -260,8 +261,7 @@ namespace InDetDD {
 
       const GeoVFullPhysVol * childFPV = dynamic_cast<const GeoVFullPhysVol *>(child);
       if (!childFPV) { 
-        msg(MSG::ERROR) << "Child of alignable transform is not a full physical volume" 
-          << endmsg;
+        ATH_MSG_ERROR("Child of alignable transform is not a full physical volume");
       } else {
         addAlignableTransform (level, id, transform, childFPV);
       }
@@ -313,9 +313,8 @@ namespace InDetDD {
   if (alignfolderType == InDetDD::static_run1) alignfolder = "/Indet/Align";
   if (alignfolderType == InDetDD::timedependent_run2) alignfolder = "/Indet/AlignL3";
 
-  if(msgLvl(MSG::INFO))
-    msg(MSG::INFO) << "Processing IBLDist alignment container with key (" <<
-      key << ") and alignment folder pointing to " << alignfolder << endmsg;
+  ATH_MSG_INFO("Processing IBLDist alignment container with key (" << key << ")"
+               << "and alignment folder pointing to " << alignfolder);
 
   int nstaves = 0;
   if (numerology().numPhiModulesForLayer(0)<14) nstaves = 14;
@@ -330,21 +329,19 @@ namespace InDetDD {
   if (StatusCode::SUCCESS==m_detStore->retrieve(atrlistcol,key)) {
     // loop over objects in collection
     for (CondAttrListCollection::const_iterator citr=atrlistcol->begin(); citr!=atrlistcol->end();++citr) {
-  
-  const coral::AttributeList& atrlist=citr->second;
-  ibldist[atrlist["stave"].data<int>()] = atrlist["mag"].data<float>();
-  iblbaseline[atrlist["stave"].data<int>()] = atrlist["base"].data<float>();
-
-  msg(MSG::VERBOSE) << "IBLDist DB -- channel: " << citr->first
-        << " ,stave: " << atrlist["stave"].data<int>() 
-        << " ,mag: " << atrlist["mag"].data<float>()
-        << " ,base: " << atrlist["base"].data<float>() << endmsg;
+      const coral::AttributeList& atrlist=citr->second;
+      ibldist[atrlist["stave"].data<int>()] = atrlist["mag"].data<float>();
+      iblbaseline[atrlist["stave"].data<int>()] = atrlist["base"].data<float>();
+
+      ATH_MSG_VERBOSE("IBLDist DB -- channel: " << citr->first
+                      << " ,stave: " << atrlist["stave"].data<int>() 
+                      << " ,mag: " << atrlist["mag"].data<float>()
+                      << " ,base: " << atrlist["base"].data<float>());
     }
   }
   else {
-    if (msgLvl(MSG::INFO))
-  msg(MSG::INFO) << "Cannot find IBLDist Container for key "
-         << key << " - no IBL bowing alignment " << endmsg;
+    ATH_MSG_WARNING("Cannot find IBLDist Container for key "
+                    << key << " - no IBL bowing alignment");
     return alignmentChange;                                   
   }
 
@@ -361,15 +358,15 @@ namespace InDetDD {
 
   const AlignableTransformContainer* container;
   if (StatusCode::SUCCESS!=m_detStore->retrieve(container, alignfolder)) {      
-    msg(MSG::ERROR) << "Cannot find AlignableTransformContainer for key " 
-        << key << " - no misalignment" << endmsg;
+    ATH_MSG_ERROR("Cannot find AlignableTransformContainer for key " 
+                  << key << " - no misalignment");
     // This should not occur in normal situations so we force job to abort.
     throw std::runtime_error("Unable to apply Inner Detector alignments");
   }
   // Check if container is empty - this can occur if it is an invalid IOV.
   if (container->empty()) {
-    msg(MSG::ERROR) << "AlignableTransformContainer for key " 
-            << key << " is empty. Probably due to out of range IOV" << endmsg;
+    ATH_MSG_ERROR("AlignableTransformContainer for key " 
+                  << key << " is empty. Probably due to out of range IOV");
     // This should not occur in normal situations so we force job to abort.
     throw std::runtime_error("Unable to apply Inner Detector alignments.");
   }
@@ -377,30 +374,30 @@ namespace InDetDD {
   std::string IBLalignfolder = alignfolder;
   IBLalignfolder.append("/PIXB1");// "/Indet/Align/PIXB1"   
   for (DataVector<AlignableTransform>::const_iterator pat=container->begin();
-       pat!=container->end();++pat) {
+       pat!=container->end();++pat)
+  {
     if (!( (*pat)->tag()==IBLalignfolder && 
-	   numerology().numPhiModulesForLayer(0)==14 &&
-	   numerology().numLayers()==4) ){  // hard-coded to IBL for now; no other geometry should really apply this!
-      msg(MSG::DEBUG) << "IBLDist; ignoring collections " << (*pat)->tag() << endmsg;
+     numerology().numPhiModulesForLayer(0)==14 &&
+     numerology().numLayers()==4) ){  // hard-coded to IBL for now; no other geometry should really apply this!
+      ATH_MSG_DEBUG("IBLDist; ignoring collections " << (*pat)->tag());
     }  
     else{
       const AlignableTransform* transformCollection = *pat;
       for (AlignableTransform::AlignTransMem_citr trans_iter = transformCollection->begin(); 
          trans_iter != transformCollection->end(); 
-         ++trans_iter) {
-        if (msgLvl(MSG::DEBUG)) {
-        msg(MSG::DEBUG) << "IBLDist alignment for identifier " 
-             << getIdHelper()->show_to_string(trans_iter->identify())   << endmsg;
-        }
+         ++trans_iter)
+      {
+        ATH_MSG_DEBUG("IBLDist alignment for identifier " 
+                      << getIdHelper()->show_to_string(trans_iter->identify()));
   
         IdentifierHash idHash = getIdHelper()->wafer_hash(trans_iter->identify());
         if (!idHash.is_valid()){
-	  msg(MSG::WARNING) << "Invalid HashID for identifier "
-			    << getIdHelper()->show_to_string(trans_iter->identify())   << endmsg;
-	  msg(MSG::WARNING) << "No IBLDist corrections can be applied for invalid HashID's - exiting " << endmsg;
-	  return false;
-	}
-	SiDetectorElement * sielem = m_elementCollection[idHash];
+          ATH_MSG_WARNING("Invalid HashID for identifier "
+                          << getIdHelper()->show_to_string(trans_iter->identify()));
+          ATH_MSG_WARNING("No IBLDist corrections can be applied for invalid HashID's - exiting");
+          return false;
+        }
+        SiDetectorElement * sielem = m_elementCollection[idHash];
         //This should work as Bowing is in L3 frame, i.e. local module frame                 
         Amg::Vector3D center = sielem->defTransform() * Amg::Vector3D{0, 0, 0};
         double z = center[2];
@@ -410,7 +407,7 @@ namespace InDetDD {
         double basex= iblbaseline[getIdHelper()->phi_module(trans_iter->identify())];
         // This is in the module frame, as bowing corrections are directly L3                
   
-        msg(MSG::DEBUG) << "Total IBL-module Tx shift (baseline+bowing): " << basex+bowx << endmsg;
+        ATH_MSG_DEBUG("Total IBL-module Tx shift (baseline+bowing): " << basex+bowx);
         if ( (basex+bowx)==0 ) continue; // make sure we ignore NULL corrections
 
         Amg::Transform3D shift = Amg::Translation3D(basex+bowx,0,0) * Amg::RotationMatrix3D::Identity();
@@ -421,12 +418,12 @@ namespace InDetDD {
 
         /** Verbose level debug section for transforms **/
         if (msgLvl(MSG::VERBOSE)) {
-          msg(MSG::VERBOSE) << "Bowing Transformation only:" << endmsg;
-          printTransform(shift);
-          msg(MSG::VERBOSE) << "Original alignable Transformation from StoreGate:" << endmsg;
-          printTransform(Amg::CLHEPTransformToEigen(this_trans->transform()));
-          msg(MSG::VERBOSE) << "Final mModified Transformation:" << endmsg;
-          printTransform(Amg::CLHEPTransformToEigen(newtrans));
+          ATH_MSG_LVL_NOCHK(MSG::VERBOSE, "Bowing Transformation only:");
+          printTransform(MSG::VERBOSE, shift);
+          ATH_MSG_LVL_NOCHK(MSG::VERBOSE, "Original alignable Transformation from StoreGate:");
+          printTransform(MSG::VERBOSE, Amg::CLHEPTransformToEigen(this_trans->transform()));
+          ATH_MSG_LVL_NOCHK(MSG::VERBOSE, "Final mModified Transformation:");
+          printTransform(MSG::VERBOSE, Amg::CLHEPTransformToEigen(newtrans));
         }
         /** End of verbose level debug section **/
     
@@ -438,11 +435,9 @@ namespace InDetDD {
                                                  nullptr);
  
         if (!status) {
-          if (msgLvl(MSG::DEBUG)) {
-            msg(MSG::DEBUG) << "Cannot set AlignableTransform for identifier."  
-                << getIdHelper()->show_to_string(trans_iter->identify())  
-                << " at level 0 for IBLDist bowing deformation " << endmsg;
-          }
+          ATH_MSG_DEBUG("Cannot set AlignableTransform for identifier."  
+                        << getIdHelper()->show_to_string(trans_iter->identify())  
+                        << " at level 0 for IBLDist bowing deformation");
         }
 
         alignmentChange = (alignmentChange || status);
@@ -484,9 +479,9 @@ namespace InDetDD {
       iblbaseline[atrlist["stave"].data<int>()] = atrlist["base"].data<float>();
 
       ATH_MSG_VERBOSE("IBLDist DB -- channel: " << citr->first
-        << ", stave: " << atrlist["stave"].data<int>()
-        << ", mag: " << atrlist["mag"].data<float>()
-        << ", base: " << atrlist["base"].data<float>());
+                      << ", stave: " << atrlist["stave"].data<int>()
+                      << ", mag: " << atrlist["mag"].data<float>()
+                      << ", base: " << atrlist["base"].data<float>());
     }
 
     /**
@@ -582,75 +577,70 @@ namespace InDetDD {
 
     bool alignmentChange = false;
 
-    if(msgLvl(MSG::INFO))
-      msg(MSG::INFO) << "Processing new global alignment containers with key " << key << " in the " << frame << " frame at level " << level << endmsg;
+    ATH_MSG_INFO("Processing new global alignment containers with key " << key
+                 << " in the " << frame << " frame at level " << level);
 
     Identifier ident=Identifier();
     const CondAttrListCollection* atrlistcol=0;
     if (StatusCode::SUCCESS==m_detStore->retrieve(atrlistcol,key)) {
       // loop over objects in collection
       for (CondAttrListCollection::const_iterator citr=atrlistcol->begin(); citr!=atrlistcol->end();++citr) {
-	const coral::AttributeList& atrlist=citr->second;
-	// We are in the Pixel manager, therefore ignore all that is not Pixel Identifier
-	if (atrlist["det"].data<int>()!=1) continue;
-
-	ident = getIdHelper()->wafer_id(atrlist["bec"].data<int>(),
-					atrlist["layer"].data<int>(),
-					atrlist["ring"].data<int>(),
-					atrlist["sector"].data<int>());
-
-	// Make sure we have valid HashID (This ONLY works here as the 0-modules exist)
-	// Precaution which does not work for e.g. SCT
-	if (!(getIdHelper()->wafer_hash(ident)).is_valid()){
-	  msg(MSG::WARNING) << "Invalid HashID for identifier "
-			    << getIdHelper()->show_to_string(ident)   << endmsg;
-	  msg(MSG::WARNING) << "No global alignment corrections can be applied for invalid HashID's - exiting " << endmsg;
-	  return false;
-	}
-
-	// construct new transform                                                                                                                
-	// Order of rotations is defined as around z, then y, then x.
-	Amg::Translation3D  newtranslation(atrlist["Tx"].data<float>(),atrlist["Ty"].data<float>(),atrlist["Tz"].data<float>());
-	Amg::Transform3D newtrans = newtranslation * Amg::RotationMatrix3D::Identity();
-	newtrans *= Amg::AngleAxis3D(atrlist["Rz"].data<float>()*CLHEP::mrad, Amg::Vector3D(0.,0.,1.));
-	newtrans *= Amg::AngleAxis3D(atrlist["Ry"].data<float>()*CLHEP::mrad, Amg::Vector3D(0.,1.,0.));
-	newtrans *= Amg::AngleAxis3D(atrlist["Rx"].data<float>()*CLHEP::mrad, Amg::Vector3D(1.,0.,0.));
-
-	msg(MSG::DEBUG) << "New global DB -- channel: " << citr->first
-			  << " ,det: "    << atrlist["det"].data<int>()
-			  << " ,bec: "    << atrlist["bec"].data<int>()
-			  << " ,layer: "  << atrlist["layer"].data<int>()
-			  << " ,ring: "   << atrlist["ring"].data<int>()
-			  << " ,sector: " << atrlist["sector"].data<int>()
-			  << " ,Tx: "     << atrlist["Tx"].data<float>()
-			  << " ,Ty: "     << atrlist["Ty"].data<float>()
-			  << " ,Tz: "     << atrlist["Tz"].data<float>()
-			  << " ,Rx: "     << atrlist["Rx"].data<float>()
-			  << " ,Ry: "     << atrlist["Ry"].data<float>()
-			  << " ,Rz: "     << atrlist["Rz"].data<float>() << endmsg;
+        const coral::AttributeList& atrlist=citr->second;
+        // We are in the Pixel manager, therefore ignore all that is not Pixel Identifier
+        if (atrlist["det"].data<int>()!=1) continue;
+
+        ident = getIdHelper()->wafer_id(atrlist["bec"].data<int>(),
+                atrlist["layer"].data<int>(),
+                atrlist["ring"].data<int>(),
+                atrlist["sector"].data<int>());
+
+        // Make sure we have valid HashID (This ONLY works here as the 0-modules exist)
+        // Precaution which does not work for e.g. SCT
+        if (!(getIdHelper()->wafer_hash(ident)).is_valid()){
+          ATH_MSG_WARNING("Invalid HashID for identifier " << getIdHelper()->show_to_string(ident));
+          ATH_MSG_WARNING("No global alignment corrections can be applied for invalid HashID's - exiting");
+          return false;
+        }
+
+        // construct new transform                                                                                                                
+        // Order of rotations is defined as around z, then y, then x.
+        Amg::Translation3D  newtranslation(atrlist["Tx"].data<float>(),atrlist["Ty"].data<float>(),atrlist["Tz"].data<float>());
+        Amg::Transform3D newtrans = newtranslation * Amg::RotationMatrix3D::Identity();
+        newtrans *= Amg::AngleAxis3D(atrlist["Rz"].data<float>()*CLHEP::mrad, Amg::Vector3D(0.,0.,1.));
+        newtrans *= Amg::AngleAxis3D(atrlist["Ry"].data<float>()*CLHEP::mrad, Amg::Vector3D(0.,1.,0.));
+        newtrans *= Amg::AngleAxis3D(atrlist["Rx"].data<float>()*CLHEP::mrad, Amg::Vector3D(1.,0.,0.));
+
+        ATH_MSG_DEBUG("New global DB -- channel: " << citr->first
+                      << " ,det: "    << atrlist["det"].data<int>()
+                      << " ,bec: "    << atrlist["bec"].data<int>()
+                      << " ,layer: "  << atrlist["layer"].data<int>()
+                      << " ,ring: "   << atrlist["ring"].data<int>()
+                      << " ,sector: " << atrlist["sector"].data<int>()
+                      << " ,Tx: "     << atrlist["Tx"].data<float>()
+                      << " ,Ty: "     << atrlist["Ty"].data<float>()
+                      << " ,Tz: "     << atrlist["Tz"].data<float>()
+                      << " ,Rx: "     << atrlist["Rx"].data<float>()
+                      << " ,Ry: "     << atrlist["Ry"].data<float>()
+                      << " ,Rz: "     << atrlist["Rz"].data<float>());
       
         // Set the new transform; Will replace existing one with updated transform                                                                 
-	bool status = setAlignableTransformDelta(level,
-						 ident,
-						 newtrans,
-						 frame,
+        bool status = setAlignableTransformDelta(level,
+                                                 ident,
+                                                 newtrans,
+                                                 frame,
                                                  alignStore);
 
         if (!status) {
-          if (msgLvl(MSG::DEBUG)) {
-            msg(MSG::DEBUG) << "Cannot set AlignableTransform for identifier."
-			    << getIdHelper()->show_to_string(ident)
-			    << " at level " << level << " for new global DB " << endmsg;
-          }
+          ATH_MSG_DEBUG("Cannot set AlignableTransform for identifier."
+                        << getIdHelper()->show_to_string(ident)
+                        << " at level " << level << " for new global DB");
         }
 
         alignmentChange = (alignmentChange || status);
       }
-    }
-    else {
-      if (msgLvl(MSG::INFO))
-	msg(MSG::INFO) << "Cannot find new global align Container for key "
-		       << key << " - no new global alignment " << endmsg;
+    } else {
+      ATH_MSG_WARNING("Cannot find new global align Container for key "
+                      << key << " - no new global alignment");
       return alignmentChange;
     }
     return alignmentChange;
@@ -658,14 +648,15 @@ namespace InDetDD {
 
 
   // Helpful function for debugging of transforms
-  void PixelDetectorManager::printTransform(const Amg::Transform3D & tr) const
+  void PixelDetectorManager::printTransform(MSG::Level level,
+                                            const Amg::Transform3D & tr) const
   {
-  msg(MSG::DEBUG) <<" - translation: "<<tr.translation().x()<<"  "<<tr.translation().y()<<"  "<<tr.translation().z() << endmsg;
-  msg(MSG::DEBUG) <<" - rotation:"<< endmsg;
-  msg(MSG::DEBUG) <<"    "<<tr(0,0)<<"  "<<tr(0,1)<<"  "<<tr(0,2)<< endmsg;
-  msg(MSG::DEBUG) <<"    "<<tr(1,0)<<"  "<<tr(1,1)<<"  "<<tr(1,2)<< endmsg;
-  msg(MSG::DEBUG) <<"    "<<tr(2,0)<<"  "<<tr(2,1)<<"  "<<tr(2,2)<< endmsg;
-  return;
+    ATH_MSG_LVL_NOCHK(level, " - translation: " << tr.translation().x() << "  " <<tr.translation().y() << "  " <<tr.translation().z());
+    ATH_MSG_LVL_NOCHK(level, " - rotation:");
+    ATH_MSG_LVL_NOCHK(level, "    " << tr(0,0) << "  " << tr(0,1) << "  " << tr(0,2));
+    ATH_MSG_LVL_NOCHK(level, "    " << tr(1,0) << "  " << tr(1,1) << "  " << tr(1,2));
+    ATH_MSG_LVL_NOCHK(level, "    " << tr(2,0) << "  " << tr(2,1) << "  " << tr(2,2));
+    return;
   }
 
 
diff --git a/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/SCT_ReadoutGeometry/SCT_DetectorManager.h b/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/SCT_ReadoutGeometry/SCT_DetectorManager.h
index df4cec0a96701d13c3c40e87fe8edc46bf347378..6b43bb4fb906aa816313276031deae920adb523e 100755
--- a/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/SCT_ReadoutGeometry/SCT_DetectorManager.h
+++ b/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/SCT_ReadoutGeometry/SCT_DetectorManager.h
@@ -54,7 +54,7 @@ namespace InDetDD {
     SCT_DetectorManager( StoreGateSvc* detStore );
 
     /// Constructur with name
-    SCT_DetectorManager( StoreGateSvc* detStore, std::string name );
+    SCT_DetectorManager( StoreGateSvc* detStore, const std::string& name );
      
     /// Destructor
     virtual ~SCT_DetectorManager();
diff --git a/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/src/SCT_DetectorManager.cxx b/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/src/SCT_DetectorManager.cxx
index 03fba5f2e9def422ceb47c65af76b44ce89921fe..aa96ed9a8c7fd5cfb8df17182a593fa3f97cc3ab 100755
--- a/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/src/SCT_DetectorManager.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/src/SCT_DetectorManager.cxx
@@ -26,12 +26,13 @@ namespace InDetDD {
   SCT_DetectorManager::SCT_DetectorManager( StoreGateSvc* detStore )
     : SCT_DetectorManager(detStore, "SCT") {}
 
-  SCT_DetectorManager::SCT_DetectorManager( StoreGateSvc* detStore , std::string name)
+  SCT_DetectorManager::SCT_DetectorManager( StoreGateSvc* detStore,
+                                            const std::string& name )
     : SiDetectorManager(detStore,name),
       m_idHelper(0),
       m_isLogical(false) // Change to true to change the definition of local module corrections
   {
-    ATH_MSG_INFO("Using contructor with name specification, to create SCT_DetectorManager named "<<name<<endmsg);
+    ATH_MSG_VERBOSE("Creating SCT_DetectorManager named " << name);
     //  
     // Initialized the Identifier helper.
     //
@@ -320,8 +321,8 @@ namespace InDetDD {
 
     const CondAttrListCollection* atrlistcol=obj;
     if(atrlistcol==nullptr and m_detStore->retrieve(atrlistcol,key)!=StatusCode::SUCCESS) {
-      ATH_MSG_INFO("Cannot find new global align Container for key "
-                   << key << " - no new global alignment ");
+      ATH_MSG_WARNING("Cannot find new global align Container for key "
+                      << key << " - no new global alignment ");
       return false;
     }
 
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CompetingMuonClustersOnTrackCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CompetingMuonClustersOnTrackCnv_p2_test.ref
index e1e476e67f6d9b190a4f283945b243c651c5f9c4..309d5a1a4b96696a99981f7107372429c86a22e3 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CompetingMuonClustersOnTrackCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CompetingMuonClustersOnTrackCnv_p2_test.ref
@@ -140,8 +140,6 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
 ClassIDSvc           INFO  getRegistryEntries: read 320 CLIDRegistry entries for module ALL
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscClusterOnTrackCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscClusterOnTrackCnv_p2_test.ref
index eeeefbe0302b1c70663e39634fa50ca6978c3949..43c07e16f5d6b16f88d482d7e34635c9f0093691 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscClusterOnTrackCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscClusterOnTrackCnv_p2_test.ref
@@ -140,8 +140,6 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
 ClassIDSvc           INFO  getRegistryEntries: read 320 CLIDRegistry entries for module ALL
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p1_test.ref
index 851b18a96969ec79a2cb9c0224b6d4f2e22d3f63..54c1ab9d9c33189c409ea8cebf49e05632695d2c 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p1_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p2_test.ref
index 30848425c8b60ab4e0f218706560e8e17df41f9f..f8e21d8dc42f6ac9851732dae83d45f52a34e48e 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscPrepDataContainerCnv_p2_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscStripPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscStripPrepDataContainerCnv_p1_test.ref
index 764dbbe20bea1d22f14a64dbb9dd883d3e826c67..3f1b0d76cd201bdbb47bf8574da218b87b1d1316 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscStripPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscStripPrepDataContainerCnv_p1_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MMPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MMPrepDataContainerCnv_p1_test.ref
index df8f187c316bc26ed9b490b051e1fd31f796ec97..3cd171c475c5b6de76afa2ab29a7a99fabb39915 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MMPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MMPrepDataContainerCnv_p1_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_ClusterOnTrackCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_ClusterOnTrackCnv_p1_test.ref
index b87dc25d8c1d1e71459759f9e4e10dea61d733bc..bc750a9634ec0a785026b427cfe48233001a0f2d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_ClusterOnTrackCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_ClusterOnTrackCnv_p1_test.ref
@@ -140,8 +140,6 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
 ClassIDSvc           INFO  getRegistryEntries: read 320 CLIDRegistry entries for module ALL
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p1_test.ref
index 28dae364c486ec9d8a0b63511e7665d960e9ab3d..2585fcf71181472422a23a067e84aea2246af506 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p1_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p2_test.ref
index ad5ca7f9891de24ab02e8754b631883c08828885..7c761e86cccb1ba2df451664333647771bd75996 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MM_DigitContainerCnv_p2_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtDriftCircleOnTrackCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtDriftCircleOnTrackCnv_p2_test.ref
index 54a2dbe22d0df7849a566eb72f870bd0e6dea47d..bbf4b00b1aee50566dfbbeb5acbf480cf5fc497c 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtDriftCircleOnTrackCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtDriftCircleOnTrackCnv_p2_test.ref
@@ -140,8 +140,6 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
 ClassIDSvc           INFO  getRegistryEntries: read 320 CLIDRegistry entries for module ALL
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p1_test.ref
index 6d93fdab534a8a9fbe7094f73c62778307f4e204..911568af82bf9370064f58b4e2d76d45e7651bbf 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p1_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p2_test.ref
index ef6a7a9a7038e5b5b8ed7e8c703dfad206eecb74..3934b603b410976ca5f8d36552efe31f9788695a 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MdtPrepDataContainerCnv_p2_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcClusterOnTrackCnv_p3_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcClusterOnTrackCnv_p3_test.ref
index ea4f6544a6f4aa05f535c1cfb17e9e8de2392427..1a0f13b1c0c227435ce376c2e4cc5c8e01a7f8a5 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcClusterOnTrackCnv_p3_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcClusterOnTrackCnv_p3_test.ref
@@ -140,8 +140,6 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
 ClassIDSvc           INFO  getRegistryEntries: read 320 CLIDRegistry entries for module ALL
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcCoinDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcCoinDataContainerCnv_p1_test.ref
index 181fafde8e41f169feef2c4f3ee136f3290737db..37d3bc57a50bddab07999e2574bfcba359b79c0b 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcCoinDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcCoinDataContainerCnv_p1_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p1_test.ref
index 502a24e0fad6148483eac7445f667a815cb26dba..5636415539d52778261301827ad0f11a8a8290c7 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p1_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p2_test.ref
index 9df09184480cf66e90da817fe69bafa5b43a8ed9..997bc0557f5f592867d15fea25ef3d70677acc51 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p2_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p3_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p3_test.ref
index 261490cbdd5bdf3c6d5de4610dd711688a56d77d..7f8be9acd74deb1ce4dbb998df15218e3264ad49 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p3_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/RpcPrepDataContainerCnv_p3_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_ClusterOnTrackCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_ClusterOnTrackCnv_p1_test.ref
index a5372c3c70f75bb979b22c08992954f6de39d477..e9908470fc969545fb3be6a0c793add316c2c4ba 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_ClusterOnTrackCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_ClusterOnTrackCnv_p1_test.ref
@@ -140,8 +140,6 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
 ClassIDSvc           INFO  getRegistryEntries: read 320 CLIDRegistry entries for module ALL
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_DigitContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_DigitContainerCnv_p1_test.ref
index d00583b1dd27333880def958a7a62723d1ddad95..cb664f54651404e964537757e952f5e504da71f1 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_DigitContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_DigitContainerCnv_p1_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_RawDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_RawDataContainerCnv_p1_test.ref
index 69b35ca28fac4063cc4b1e4eaa8110f2f5f060d3..54c3f168fdbbed6cb04a47a8adebae4bc48f81e3 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_RawDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/STGC_RawDataContainerCnv_p1_test.ref
@@ -140,8 +140,6 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
  Before has size: 2, after has size: 2
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcClusterOnTrackCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcClusterOnTrackCnv_p2_test.ref
index e27a493f1a5fc7453973f371a1e555b5da20cc31..a216b0a3c4c5fb12f88a79d4d1abd15c9cfa1e37 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcClusterOnTrackCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcClusterOnTrackCnv_p2_test.ref
@@ -140,8 +140,6 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
 ClassIDSvc           INFO  getRegistryEntries: read 320 CLIDRegistry entries for module ALL
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p1_test.ref
index c2e52e80af0b59e3d9985a03b7a97b1f54d49890..fe8dd235360ef206269804df65cfa2414a93839b 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p1_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p2_test.ref
index 504ba4f1fb7e42ad6278d029d721a037cb7beb22..7e2ea0595251a74c2261f9fa6cb21779e7215f1d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p2_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p3_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p3_test.ref
index 4a86c312012bc4e1f452bb003ee5a1608297b62d..08753e8b94b72c88e0f387016049c33fe74ea582 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p3_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcCoinDataContainerCnv_p3_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p1_test.ref
index c3da0d71eacf6dfd1bfdaacdb023cbf058ede200..6b326a928c9fffe92efb257b6bb87389cf012149 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p1_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p2_test.ref
index c5386371eae29bd428fd5faf2466b2e0a6b2bbf3..6443a5ffd3b1d391f4ce5197943e88b050f741b1 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p2_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p3_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p3_test.ref
index 94c5023c1e765e61dc831d4165fa04630af458df..e4fb9369a6ad8e7659aeb821200a3dcbd2a0d08b 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p3_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/TgcPrepDataContainerCnv_p3_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/sTgcPrepDataContainerCnv_p1_test.ref b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/sTgcPrepDataContainerCnv_p1_test.ref
index 74deb3704f3a5fd5f89f2e8eae814b6af74b8d26..27d72f519f66cf0fcc18f9474536686e04d67d17 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/sTgcPrepDataContainerCnv_p1_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/sTgcPrepDataContainerCnv_p1_test.ref
@@ -140,7 +140,5 @@ MmIdHelper           INFO The element hash max is 64
 MmIdHelper           INFO The detector element hash max is 128
 MmIdHelper           INFO Initializing MicroMegas hash indices for finding neighbors ... 
  AtlasDetectorID::initialize_from_dictionary - OK 
-SCTDetectorManager   INFO Using contructor with name specification, to create SCT_DetectorManager named SCT
-SCTDetectorManager   INFO 
 ClassIDSvc           INFO  getRegistryEntries: read 379 CLIDRegistry entries for module ALL
 test1