Revert "migrated MuonMDT_CablingSvc to readCdo in MdtDigitToMdtRDO"

This reverts commit 511222ef.

MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/CMakeLists.txt

@@ -28,19 +28,18 @@ atlas_depends_on_subdirs( PUBLIC
                           MuonSpectrometer/MuonCnv/MuonTGC_CnvTools
                           MuonSpectrometer/MuonDigitContainer
                           MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData 			  
-			  MuonSpectrometer/MuonCablings/MuonCablingData )
+                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData )
 
 # Component(s) in the package:
 atlas_add_library( MuonByteStreamCnvTestLib
                    src/*.cxx
                    PUBLIC_HEADERS MuonByteStreamCnvTest
                    LINK_LIBRARIES AthenaBaseComps GaudiKernel MuonReadoutGeometry MuonRDO StoreGateLib SGtests RPCcablingInterfaceLib TrigT1RPChardwareLib RPChardware TrigT1RPClogicLib MuonMDT_CablingLib TGCcablingInterfaceLib MuonIdHelpersLib
-                   PRIVATE_LINK_LIBRARIES EventInfo MuonDigitContainer MuonPrepRawData MuonCablingData )
+                   PRIVATE_LINK_LIBRARIES EventInfo MuonDigitContainer MuonPrepRawData )
 
 atlas_add_component( MuonByteStreamCnvTest
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests GaudiKernel RPCcablingInterfaceLib MuonReadoutGeometry MuonRDO TrigT1RPChardwareLib RPChardware TrigT1RPClogicLib EventInfo MuonMDT_CablingLib TGCcablingInterfaceLib MuonDigitContainer MuonIdHelpersLib MuonPrepRawData MuonByteStreamCnvTestLib MuonCablingData )
+                     LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests GaudiKernel RPCcablingInterfaceLib MuonReadoutGeometry MuonRDO TrigT1RPChardwareLib RPChardware TrigT1RPClogicLib EventInfo MuonMDT_CablingLib TGCcablingInterfaceLib MuonDigitContainer MuonIdHelpersLib MuonPrepRawData MuonByteStreamCnvTestLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )

MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/MuonByteStreamCnvTest/MdtDigitToMdtRDO.h

@@ -10,9 +10,7 @@
 
 #include "MuonDigitContainer/MdtDigitContainer.h"
 #include "MuonRDO/MdtCsmContainer.h"
-
-#include "MuonCablingData/MuonMDT_CablingMap.h"
-#include "StoreGate/ReadCondHandleKey.h"
+#include "MuonMDT_Cabling/MuonMDT_CablingSvc.h"
 
 class MdtIdHelper;
 
@@ -33,12 +31,11 @@ class MdtDigitToMdtRDO : public AthAlgorithm {
 
  protected:
 
+  ServiceHandle<MuonMDT_CablingSvc>       m_cabling;
   const MdtIdHelper*   m_mdtIdHelper;
   bool m_BMEpresent;
   SG::WriteHandleKey<MdtCsmContainer> m_csmContainerKey{this,"OutputObjectName","MDTCSM","WriteHandleKey for Output MdtCsmContainer"};
   SG::ReadHandleKey<MdtDigitContainer> m_digitContainerKey{this,"InputObjectName","MDT_DIGITS","ReadHandleKey for Input MdtDigitContainer"};
-  SG::ReadCondHandleKey<MuonMDT_CablingMap> m_readKey{this, "ReadKey", "MuonMDT_CablingMap", "Key of MuonMDT_CablingMap"};
-
 };
 
 #endif

MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MdtDigitToMdtRDO.cxx

@@ -6,6 +6,8 @@
 #include "MuonDigitContainer/MdtDigitCollection.h"
 #include "MuonDigitContainer/MdtDigit.h"
 
+#include "MuonMDT_Cabling/MuonMDT_CablingSvc.h"
+
 #include "MuonRDO/MdtCsmIdHash.h"
 #include "MuonRDO/MdtCsmContainer.h"
 #include "MuonRDO/MdtCsm.h"
@@ -25,6 +27,7 @@ using namespace std;
 
 MdtDigitToMdtRDO::MdtDigitToMdtRDO(const std::string& name, ISvcLocator* pSvcLocator) :
   AthAlgorithm(name, pSvcLocator),
+  m_cabling("MuonMDT_CablingSvc", name),
   m_mdtIdHelper(0),
   m_BMEpresent(false)
 {
@@ -40,7 +43,7 @@ StatusCode MdtDigitToMdtRDO::initialize()
   ATH_CHECK( m_digitContainerKey.initialize() );
   ATH_MSG_VERBOSE("Initialized ReadHandleKey: " << m_digitContainerKey );
   ATH_CHECK( detStore()->retrieve(m_mdtIdHelper,"MDTIDHELPER") );
-  ATH_CHECK( m_readKey.initialize() );
+  ATH_CHECK( m_cabling.retrieve() );
 
   if ( fillTagInfo().isFailure() ) {
     ATH_MSG_WARNING( "Could not fill the tagInfo for MDT cabling"  );
@@ -92,13 +95,6 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata() const {
 
   MdtCsmIdHash hashF;
 
-  SG::ReadCondHandle<MuonMDT_CablingMap> readHandle{m_readKey};
-  const MuonMDT_CablingMap* readCdo{*readHandle};
-  if(readCdo==0){
-    ATH_MSG_ERROR("Null pointer to the read conditions object");
-    return StatusCode::FAILURE;
-  }
-
   // Iterate on the collections
   collection_iterator it_coll = container->begin();
   for ( ; it_coll != container->end(); ++it_coll) 
@@ -117,8 +113,8 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata() const {
       uint8_t link;
       uint8_t tdc;
       uint8_t channel;
-
-      bool cabling = readCdo->getOnlineId(name, eta, phi, 
+      
+      bool cabling = m_cabling->getOnlineId(name, eta, phi, 
 					    1, 1, 1,
 					    subsystem, mrod, link, 
 					    tdc, channel);
@@ -169,9 +165,9 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata() const {
         if ( name == 53 ) {
 	  uint8_t subsystem_2ndcsm, mrod_2ndcsm, link_2ndcsm, tdc_2ndcsm, channel_2ndcsm;
 
-	  cabling = readCdo->getOnlineId(name, eta, phi, 1, 1, 43,
-					 subsystem_2ndcsm, mrod_2ndcsm,
-					 link_2ndcsm, tdc_2ndcsm, channel_2ndcsm);
+	  cabling = m_cabling->getOnlineId(name, eta, phi, 1, 1, 43,
+					   subsystem_2ndcsm, mrod_2ndcsm,
+					   link_2ndcsm, tdc_2ndcsm, channel_2ndcsm);
 
 	  if (!cabling) {
 	    ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : "  );
@@ -200,10 +196,10 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata() const {
 	      int tube       = m_mdtIdHelper->tube(channelId);
 	            
 	      // Get the online Id of the channel
-	      cabling = readCdo->getOnlineId(name, eta, phi, 
-					     multilayer, layer, tube,
-					     subsystem, mrod, link, 
-					     tdc, channel);
+	      cabling = m_cabling->getOnlineId(name, eta, phi, 
+					       multilayer, layer, tube,
+					       subsystem, mrod, link, 
+					       tdc, channel);
 	            
 	      if (!cabling) {
 		ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : "  );
@@ -271,9 +267,7 @@ StatusCode MdtDigitToMdtRDO::fillTagInfo() const {
     return StatusCode::FAILURE;
   
   std::string cablingType="";
-  //if (m_cabling->usingOldCabling() ) {
-  //if (readCdo->usingOldCabling() ) { //it was only implemeted in the Svc for Run2 
-  if ( false ) { //this should be false from Run2, so the switch can be removed for Run3
+  if (m_cabling->usingOldCabling() ) {
     cablingType="OldMDT_Cabling";
   }
   else {