'CMakeLists.txt' (MdtOverlay-00-03-02)

	* python/MdtOverlayConfig.py - rename MdtRdoToMdtDigit to MdtRdoToMdtDigitOverlay
	* MdtOverlay-00-03-02

2015-08-31 Tanya Kharlamova <Tatyana.Kharlamova@cern.ch>
	* share/MdtOverlay_jobOptions.py, cmt/requirements
	* python/MdtOverlayConfig.py, python/MdtOverlayConfigDb.py - added
	Migration of overlay configuration to be based on CfgGetter. ATLASSIM-1922
	* MdtOverlay-00-03-01

MuonSpectrometer/MuonOverlay/MdtOverlay/CMakeLists.txt

+################################################################################
+# Package: MdtOverlay
+################################################################################
+
+# Declare the package name:
+atlas_subdir( MdtOverlay )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          GaudiKernel
+                          MuonSpectrometer/MuonDigitContainer
+                          MuonSpectrometer/MuonOverlay/MuonOverlayBase
+                          PRIVATE
+                          Control/StoreGate
+                          Generators/GeneratorObjects
+                          MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
+                          MuonSpectrometer/MuonIdHelpers
+                          MuonSpectrometer/MuonSimData )
+
+# Component(s) in the package:
+atlas_add_component( MdtOverlay
+                     src/*.cxx
+                     src/components/*.cxx
+                     LINK_LIBRARIES GaudiKernel MuonDigitContainer MuonOverlayBase StoreGateLib SGtests GeneratorObjects MuonIdHelpersLib MuonSimData )
+
+# Install files from the package:
+atlas_install_headers( MdtOverlay )
+atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/*.py )
+

MuonSpectrometer/MuonOverlay/MdtOverlay/cmt/requirements

@@ -21,4 +21,6 @@ library MdtOverlay *.cxx components/*.cxx
 
 apply_pattern component_library
 apply_pattern declare_joboptions files="*.py *.C *.sh"
+apply_pattern declare_python_modules files="*.py"
+
 

MuonSpectrometer/MuonOverlay/MdtOverlay/python/MdtOverlayConfig.py

+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon import CfgMgr
+
+def getMdtOverlay(name="MdtOverlay", **kwargs):
+    kwargs.setdefault("mainInputMDT_Name", "MDT_DIGITS")
+    kwargs.setdefault("overlayInputMDT_Name", "MDT_DIGITS")
+    kwargs.setdefault("IntegrationWindow", 20)
+    kwargs.setdefault("DigitizationTool", "Mdt_OverlayDigitizationTool")
+    kwargs.setdefault("ConvertRDOToDigitTool", "MdtRdoToMdtDigitOverlay")
+    from OverlayCommonAlgs.OverlayFlags import overlayFlags
+    kwargs.setdefault("MCStore",overlayFlags.evtStore())
+    kwargs.setdefault("DataStore", overlayFlags.dataStore())
+    if overlayFlags.doSignal():
+        kwargs.setdefault("CopyObject", True)
+    return CfgMgr.MdtOverlay(name, **kwargs)

MuonSpectrometer/MuonOverlay/MdtOverlay/python/MdtOverlayConfigDb.py

+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.CfgGetter import addAlgorithm
+
+addAlgorithm("MdtOverlay.MdtOverlayConfig.getMdtOverlay", "MdtOverlay")

MuonSpectrometer/MuonOverlay/MdtOverlay/share/MdtOverlay_jobOptions.py

 include.block ( "MdtOverlay/MdtOverlay_jobOptions.py" )
 
-from Digitization.DigitizationFlags import jobproperties
-
-from MuonByteStreamCnvTest.MuonByteStreamCnvTestConf import MuonRdoToMuonDigitTool
-MuonRdoToMuonDigitTool = MuonRdoToMuonDigitTool (
-                         "MdtRdoToMdtDigit",
-                         DecodeMdtRDO = True,
-                         DecodeRpcRDO = False,
-                         DecodeTgcRDO = False,
-                         DecodeCscRDO = False ) 
-ToolSvc += MuonRdoToMuonDigitTool
+#from Digitization.DigitizationFlags import jobproperties
+from AthenaCommon import CfgGetter
+#from MuonByteStreamCnvTest.MuonByteStreamCnvTestConf import MuonRdoToMuonDigitTool
+#MuonRdoToMuonDigitTool = MuonRdoToMuonDigitTool (
+#                         "MdtRdoToMdtDigit",
+#                         DecodeMdtRDO = True,
+#                         DecodeRpcRDO = False,
+#                         DecodeTgcRDO = False,
+#                         DecodeCscRDO = False ) 
+#ToolSvc += CfgGetter.getPrivateTool("MdtRdoToMdtDigit")
+ToolSvc += CfgGetter.getPrivateTool("MdtRdoToMdtDigit")
+#job += MdtRdoToMdtDigit()
 
 #include ( "MDT_Digitization/MdtDigitizationTool_jobOptions.py" )
 
 #if readBS and isRealData:
 #   ToolSvc.MdtDigitizationTool.GetT0FromBD = True
-if readBS and isRealData:
-   if not hasattr(ToolSvc, 'MdtDigitizationTool'):
-       from AthenaCommon import CfgGetter
-       ToolSvc += CfgGetter.getPrivateTool("MdtDigitizationTool", checkType=True)
-   ToolSvc.MdtDigitizationTool.GetT0FromBD = True
+
+#t if readBS and isRealData:
+#t   if not hasattr(ToolSvc, 'Mdt_OverlayDigitizationTool'):
+# t      from AthenaCommon import CfgGetter
+#  t     ToolSvc += CfgGetter.getPrivateTool("Mdt_OverlayDigitizationTool")
+
+#, checkType=True)
+ #  ToolSvc.Mdt_OverlayDigitizationTool.GetT0FromBD = True
 
 #jobproperties.Digitization.rndmSeedList.addSeed("MDTResponse", 49261510,105132394 )
 #jobproperties.Digitization.rndmSeedList.addSeed("MDT_Digitization", 393242561, 857132381 )
 
-from AthenaCommon import CfgGetter
-from MdtOverlay.MdtOverlayConf import MdtOverlay
-job += MdtOverlay()
-job.MdtOverlay.mainInputMDT_Name                         = "MDT_DIGITS"
-job.MdtOverlay.overlayInputMDT_Name                      = "MDT_DIGITS"
-job.MdtOverlay.IntegrationWindow                         = 20
-job.MdtOverlay.DigitizationTool                          = ToolSvc.MdtDigitizationTool
-job.MdtOverlay.ConvertRDOToDigitTool                     = MuonRdoToMuonDigitTool
-job.MdtOverlay.DigitizationTool.EvtStore                 = job.MdtOverlay.MCStore
-job.MdtOverlay.ConvertRDOToDigitTool.RetrievePrivateCopy = True
-job.MdtOverlay.ConvertRDOToDigitTool.DataStore           = job.MdtOverlay.DataStore
-
-from OverlayCommonAlgs.OverlayFlags import overlayFlags
-if overlayFlags.doSignal==True:
-   job.MdtOverlay.CopyObject = True
-
+#from AthenaCommon import CfgGetter
+#from MdtOverlay.MdtOverlayConf import MdtOverlay
+job += CfgGetter.getAlgorithm("MdtOverlay")
+#job.MdtOverlay.mainInputMDT_Name                         = "MDT_DIGITS"
+#job.MdtOverlay.overlayInputMDT_Name                      = "MDT_DIGITS"
+#job.MdtOverlay.IntegrationWindow                         = 20
+#job.MdtOverlay.DigitizationTool                          = ToolSvc.Mdt_OverlayDigitizationTool
+#job.MdtOverlay.ConvertRDOToDigitTool                     = MuonRdoToMuonDigitTool
+#job.MdtOverlay.DigitizationTool.EvtStore                 = job.MdtOverlay.MCStore
+#job.MdtOverlay.ConvertRDOToDigitTool.RetrievePrivateCopy = True
+#job.MdtOverlay.ConvertRDOToDigitTool.DataStore           = job.MdtOverlay.DataStore
+
+#from OverlayCommonAlgs.OverlayFlags import overlayFlags
+#if overlayFlags.doSignal==True:
+#   job.MdtOverlay.CopyObject = True
+   
+#from MuonByteStreamCnvTest.MuonByteStreamCnvTestConf import MdtDigitToMdtRDO
+#job += MdtDigitToMdtRDO()
+#job.MdtDigitToMdtRDO.Store = job.MdtOverlay.OutputStore
+
+
+#from MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig import MdtDigitToMdtRDO
+#job += MdtDigitToMdtRDO()
+#job.MdtDigitToMdtRDO.Store = job.MdtOverlay.OutputStore
+#job +=  CfgGetter.getPrivateTool("MdtRdoToMdtDigit")
 from MuonByteStreamCnvTest.MuonByteStreamCnvTestConf import MdtDigitToMdtRDO
 job += MdtDigitToMdtRDO()
 job.MdtDigitToMdtRDO.Store = job.MdtOverlay.OutputStore
-
-