From 257e65e3d1562bba51643abc8c8de9f70cb58802 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Acqua <Andrea.Dellacqua@cern.ch>
Date: Mon, 6 Jul 2015 14:09:18 +0200
Subject: [PATCH] see ChangeLog (MuonAGDD-00-00-21)
* tagging MuonAGDD-00-00-21
* changed the XML file name in the CfgGetter
2015-06-10 Jochen Meyer <jomeyer@mail.cern.ch>
* tagging MuonAGDD-00-00-20
* CfgGetter for MuonAGDDTool and NSWAGDDTool
2015-05-22 Jochen Meyer <jomeyer@mail.cern.ch>
* tagging MuonAGDD-00-00-19
* cleaning up requirements
2015-04-14 Jochen Meyer <jomeyer@mail.cern.ch>
* tagging MuonAGDD-00-00-18
* removing "Locked" as declarable property (ATLASRECTS-1979)
2015-04-05 scott snyder <snyder@bnl.gov>
...
(Long ChangeLog diff - truncated)
---
.../MuonDetDescr/MuonAGDD/cmt/requirements | 7 ++-----
.../MuonAGDD/python/MuonAGDDConfig.py | 15 +++++++++++++++
.../MuonAGDD/python/MuonAGDDConfigDb.py | 6 ++++++
.../MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx | 1 -
.../MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx | 2 +-
5 files changed, 24 insertions(+), 7 deletions(-)
create mode 100644 MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfig.py
create mode 100644 MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfigDb.py
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/cmt/requirements b/MuonSpectrometer/MuonDetDescr/MuonAGDD/cmt/requirements
index 09372baca2f..13b99abd25c 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/cmt/requirements
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/cmt/requirements
@@ -9,21 +9,18 @@ use GaudiInterface GaudiInterface-* External
library MuonAGDD *.cxx components/*.cxx
apply_pattern component_library
-
-apply_pattern install_runtime
+apply_pattern declare_python_modules files="*.py"
public
-use AGDDKernel AGDDKernel-* DetectorDescription/AGDD
use AGDDControl AGDDControl-* DetectorDescription/AGDD
private
+use AGDDKernel AGDDKernel-* DetectorDescription/AGDD
use MuonAGDDBase MuonAGDDBase-* MuonSpectrometer/MuonDetDescr
use StoreGate StoreGate-* Control
use GeoModelInterfaces GeoModelInterfaces-* DetectorDescription/GeoModel
-use MuonGeoModel MuonGeoModel-* MuonSpectrometer
use AGDDModel AGDDModel-* DetectorDescription/AGDD
use AGDD2GeoSvc AGDD2GeoSvc-* DetectorDescription/AGDD
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
use MuonReadoutGeometry MuonReadoutGeometry-* MuonSpectrometer/MuonDetDescr
use EventInfo EventInfo-* Event
use EventInfoMgt EventInfoMgt-* Event
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfig.py b/MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfig.py
new file mode 100644
index 00000000000..3cf1a622047
--- /dev/null
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfig.py
@@ -0,0 +1,15 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon import CfgMgr
+
+def MuonAGDDTool(name="MuonSpectrometer", **kwargs):
+ kwargs.setdefault("BuildNSW", False)
+ return CfgMgr.MuonAGDDTool(name, **kwargs)
+
+def NSWAGDDTool(name="NewSmallWheel", **kwargs):
+ kwargs.setdefault("Locked", False)
+ kwargs.setdefault("XMLFiles", ["NSW_StationDescription.xml"])
+ kwargs.setdefault("Volumes", ["NewSmallWheel"])
+ kwargs.setdefault("DefaultDetector", "Muon")
+ return CfgMgr.NSWAGDDTool(name, **kwargs)
+
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfigDb.py b/MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfigDb.py
new file mode 100644
index 00000000000..2a8104c4c66
--- /dev/null
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfigDb.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.CfgGetter import addTool
+
+addTool("MuonAGDD.MuonAGDDConfig.MuonAGDDTool", "MuonSpectrometer")
+addTool("MuonAGDD.MuonAGDDConfig.NSWAGDDTool", "NewSmallWheel")
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx
index 8b5fbfb3440..ce58f48f983 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx
@@ -18,7 +18,6 @@ MuonAGDDTool::MuonAGDDTool(const std::string& type, const std::string& name,
{
declareProperty( "Structures" , m_structuresToBuild);
declareProperty( "ReadAGDD", m_readAGDD);
- declareProperty( "Locked", m_locked);
declareProperty( "DumpAGDD", m_dumpAGDD);
declareProperty( "OverrideConfiguration",m_overrideConfiguration=false);
declareProperty( "BuildNSW", m_buildNSW);
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx
index e08358a3d01..c4052d37ae8 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx
@@ -20,7 +20,7 @@ using namespace MuonGM;
NSWAGDDTool::NSWAGDDTool(const std::string& type, const std::string& name,
const IInterface* parent):AGDDToolBase(type,name,parent)
{
- std::cout<<"This is NSWAGDDTool's constructor!!!! "<<name<<std::endl;
+ //std::cout<<"This is NSWAGDDTool's constructor!!!! "<<name<<std::endl;
}
StatusCode NSWAGDDTool::initialize()
--
GitLab