Muon raw data provider tool name update

Former-commit-id: 7ff01ac6

Event/EventOverlay/EventOverlayJobTransforms/share/MuonOverlay_jobOptions.py

@@ -34,49 +34,25 @@ if DetFlags.overlay.MDT_on() or DetFlags.overlay.CSC_on() or DetFlags.overlay.RP
         include("MuonCnvExample/MuonReadBS_jobOptions.py")
 
     if DetFlags.overlay.CSC_on():
-        if overlayFlags.isDataOverlay():
-            ToolSvc.CscRawDataProviderTool.RdoLocation = overlayFlags.dataStore()+"+CSCRDO"
         job += getAlgorithm("CscOverlay")
-        #job.CscOverlay.OutputLevel=VERBOSE
-        #svcMgr.MessageSvc.defaultLimit=100000
-        #print job.CscOverlay
-        #print "ACH123: Setting DEBUG v99"
-        #job.CscOverlay.MakeRDOTool.OutputLevel=DEBUG
-        #job.CscOverlay.MakeRDOTool.cscCalibTool.OutputLevel=DEBUG
-        #job.CscOverlay.OutputLevel=DEBUG
-        #MessageSvc.debugLimit = 100000
-        #print "ACH123: NumSamples = 2 for MakeRDOTool"
-        #job.CscOverlay.MakeRDOTool.NumSamples=2
 
     if DetFlags.overlay.MDT_on():
         job += CfgGetter.getAlgorithm("MdtRdoToMdtDigitOverlayAlg")
         job += CfgGetter.getAlgorithm("MDT_OverlayDigitizer")
         job += CfgGetter.getAlgorithm("MdtOverlay")
         job += CfgGetter.getAlgorithm("OverlayMdtDigitToMdtRDO")
-        if overlayFlags.isDataOverlay():
-            ToolSvc.MdtRawDataProviderTool.RdoLocation = overlayFlags.dataStore()+"+MDTCSM"
-        #job.MdtOverlay.OutputLevel = VERBOSE
-        #job.OverlayMdtDigitToMdtRDO.OutputLevel = VERBOSE
 
     if DetFlags.overlay.RPC_on():
         job += CfgGetter.getAlgorithm("RpcRdoToRpcDigitOverlayAlg")
         job += CfgGetter.getAlgorithm("RPC_OverlayDigitizer")
         job += CfgGetter.getAlgorithm("RpcOverlay")
         job += CfgGetter.getAlgorithm("OverlayRpcDigitToRpcRDO")
-        if overlayFlags.isDataOverlay():
-            ToolSvc.RpcRawDataProviderTool.RdoLocation = overlayFlags.dataStore()+"+RPCPAD"
-        #job.RpcOverlay.OutputLevel = VERBOSE
-        #job.OverlayRpcDigitToRpcRDO.OutputLevel = VERBOSE
 
     if DetFlags.overlay.TGC_on():
         job += CfgGetter.getAlgorithm("TgcRdoToTgcDigitOverlayAlg")
         job += CfgGetter.getAlgorithm("TGC_OverlayDigitizer")
         job += CfgGetter.getAlgorithm("TgcOverlay")
         job += CfgGetter.getAlgorithm("OverlayTgcDigitToTgcRDO")
-        if overlayFlags.isDataOverlay():
-            ToolSvc.TgcRawDataProviderTool.RdoLocation = overlayFlags.dataStore()+"+TGCRDO"
-        #job.TgcOverlay.OutputLevel = VERBOSE
-        #job.OverlayTgcDigitToTgcRDO.OutputLevel = VERBOSE
 
     # storegate dump
     #StoreGateSvc = Service( "StoreGateSvc" )

MuonSpectrometer/MuonCnv/MuonByteStream/src/CscRawDataProvider.cxx

@@ -14,7 +14,7 @@
 Muon::CscRawDataProvider::CscRawDataProvider(const std::string& name,
                                       ISvcLocator* pSvcLocator) :
   AthAlgorithm(name, pSvcLocator),
-  m_rawDataTool     ("Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool", this)
+  m_rawDataTool     ("Muon::CSC_RawDataProviderTool/CscRawDataProviderTool", this)
 {
   declareProperty ("ProviderTool", m_rawDataTool);
 }
@@ -54,4 +54,3 @@ StatusCode Muon::CscRawDataProvider::execute() {
 
   return StatusCode::SUCCESS;
 }
-

MuonSpectrometer/MuonCnv/MuonByteStream/src/MdtRawDataProvider.cxx

@@ -11,7 +11,7 @@
 Muon::MdtRawDataProvider::MdtRawDataProvider(const std::string& name,
                                       ISvcLocator* pSvcLocator) :
   AthAlgorithm(name, pSvcLocator),
-  m_rawDataTool     ("Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool", this)
+  m_rawDataTool     ("Muon::MDT_RawDataProviderTool/MdtRawDataProviderTool", this)
 {
   declareProperty ("ProviderTool", m_rawDataTool);
 }
@@ -48,4 +48,3 @@ StatusCode Muon::MdtRawDataProvider::execute() {
 
   return StatusCode::SUCCESS;
 }
-

MuonSpectrometer/MuonCnv/MuonByteStream/src/RpcRawDataProvider.cxx

@@ -11,7 +11,7 @@
 Muon::RpcRawDataProvider::RpcRawDataProvider(const std::string& name,
                                       ISvcLocator* pSvcLocator) :
   AthAlgorithm(name, pSvcLocator),
-  m_rawDataTool     ("Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool", this),
+  m_rawDataTool     ("Muon::RPC_RawDataProviderTool/RpcRawDataProviderTool", this),
   m_regionSelector  ("RegSelSvc",name) 
 {
   declareProperty ("ProviderTool", m_rawDataTool);
@@ -85,4 +85,3 @@ StatusCode Muon::RpcRawDataProvider::execute() {
 
   return StatusCode::SUCCESS;
 }
-

MuonSpectrometer/MuonCnv/MuonByteStream/src/TgcRawDataProvider.cxx

@@ -18,7 +18,7 @@ Muon::TgcRawDataProvider::TgcRawDataProvider(const std::string& name,
         ISvcLocator* pSvcLocator) :
         AthAlgorithm(name, pSvcLocator),
         m_robDataProvider ("ROBDataProviderSvc",name),
-        m_rawDataTool     ("Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool", this)
+        m_rawDataTool     ("Muon::TGC_RawDataProviderTool/TgcRawDataProviderTool", this)
 {
     declareProperty ("ProviderTool", m_rawDataTool);
 }
@@ -70,4 +70,3 @@ StatusCode Muon::TgcRawDataProvider::execute()
 
     return StatusCode::SUCCESS;
 }
-