From b294bfdacb1265769a65f96403ebc1c0d3fb23bd Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Mon, 4 Feb 2019 16:52:09 +0100
Subject: [PATCH] Move LArConfigFlags.py from LArCellRec to new
LArConfiguration package
---
Control/AthenaConfiguration/python/AllConfigFlags.py | 10 +++++-----
LArCalorimeter/LArConfiguration/CMakeLists.txt | 10 ++++++++++
.../python/LArConfigFlags.py | 0
LArCalorimeter/LArConfiguration/python/__init__.py | 1 +
Projects/AthSimulation/package_filters.txt | 1 +
5 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 LArCalorimeter/LArConfiguration/CMakeLists.txt
rename LArCalorimeter/{LArCellRec => LArConfiguration}/python/LArConfigFlags.py (100%)
create mode 100644 LArCalorimeter/LArConfiguration/python/__init__.py
diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index f0d306716fc..50c16040d7a 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -75,13 +75,13 @@ def _createCfgFlags():
#LAr Flags:
try:
- import LArCellRec # Suppress flake8 unused import warning: # noqa: F401
- haveLArCellRec = True
+ import LArConfiguration # Suppress flake8 unused import warning: # noqa: F401
+ haveLArConfiguration = True
except ImportError:
- haveLArCellRec = False
+ haveLArConfiguration = False
- if haveLArCellRec:
- from LArCellRec.LArConfigFlags import createLArConfigFlags
+ if haveLArConfiguration:
+ from LArConfiguration.LArConfigFlags import createLArConfigFlags
lcf=createLArConfigFlags()
acf.join(lcf)
diff --git a/LArCalorimeter/LArConfiguration/CMakeLists.txt b/LArCalorimeter/LArConfiguration/CMakeLists.txt
new file mode 100644
index 00000000000..39c8eb53fd2
--- /dev/null
+++ b/LArCalorimeter/LArConfiguration/CMakeLists.txt
@@ -0,0 +1,10 @@
+################################################################################
+# Package: LArConfiguration
+################################################################################
+
+# Declare the package name:
+atlas_subdir( LArConfiguration )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+
diff --git a/LArCalorimeter/LArCellRec/python/LArConfigFlags.py b/LArCalorimeter/LArConfiguration/python/LArConfigFlags.py
similarity index 100%
rename from LArCalorimeter/LArCellRec/python/LArConfigFlags.py
rename to LArCalorimeter/LArConfiguration/python/LArConfigFlags.py
diff --git a/LArCalorimeter/LArConfiguration/python/__init__.py b/LArCalorimeter/LArConfiguration/python/__init__.py
new file mode 100644
index 00000000000..4e669a90b8b
--- /dev/null
+++ b/LArCalorimeter/LArConfiguration/python/__init__.py
@@ -0,0 +1 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
diff --git a/Projects/AthSimulation/package_filters.txt b/Projects/AthSimulation/package_filters.txt
index 01d13cfba1f..9cb90575f32 100644
--- a/Projects/AthSimulation/package_filters.txt
+++ b/Projects/AthSimulation/package_filters.txt
@@ -202,6 +202,7 @@
+ LArCalorimeter/LArCnv/LArIdCnv
+ LArCalorimeter/LArCnv/LArSimEventAthenaPool
+ LArCalorimeter/LArCnv/LArSimEventTPCnv
++ LArCalorimeter/LArConfiguration
+ LArCalorimeter/LArDetDescr
+ LArCalorimeter/LArElecCalib
+ LArCalorimeter/LArExample/LArConditionsCommon
--
GitLab