From 30c2429c03d586a2313dceb18f9477578f5feaba Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Thu, 23 May 2019 09:39:09 +0000
Subject: [PATCH] fixes CA unit tests that have forgotten to swich configurable
behaviour to run3
---
.../RegionSelector/python/RegSelConfig.py | 9 ++++-----
Event/ByteStreamCnvSvc/python/ByteStreamConfig.py | 4 ++++
Event/EventInfoMgt/python/TagInfoMgrConfig.py | 4 +++-
.../TrigConfigSvc/python/TrigConfigSvcConfig.py | 3 +++
.../python/HLTMenuConfig/Menu/LS2_v1_newJO.py | 3 +++
5 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/DetectorDescription/RegionSelector/python/RegSelConfig.py b/DetectorDescription/RegionSelector/python/RegSelConfig.py
index f3f49e9227c..404aff546d1 100644
--- a/DetectorDescription/RegionSelector/python/RegSelConfig.py
+++ b/DetectorDescription/RegionSelector/python/RegSelConfig.py
@@ -112,15 +112,15 @@ def regSelCfg( flags ):
return acc
if __name__ == "__main__":
+
+ from AthenaCommon.Configurable import Configurable
+ Configurable.configurableRun3Behavior=True
+
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
- acc = ComponentAccumulator()
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- from AthenaCommon.Configurable import Configurable
from AthenaCommon.Constants import DEBUG
- Configurable.configurableRun3Behavior=True
-
ConfigFlags.Detector.GeometryPixel = True
ConfigFlags.Detector.GeometrySCT = True
ConfigFlags.Detector.GeometryTRT = True
@@ -131,7 +131,6 @@ if __name__ == "__main__":
ConfigFlags.Detector.GeometryCSC = True
ConfigFlags.Detector.GeometryRPC = True
-
ConfigFlags.Input.Files = defaultTestFiles.RAW
ConfigFlags.Input.isMC = False
ConfigFlags.dump()
diff --git a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
index a8856ddcddb..a2c668ed451 100644
--- a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
+++ b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
@@ -10,7 +10,9 @@ def TrigBSReadCfg( inputFlags ):
Creates accumulator for BS reading
"""
filenames = inputFlags.Input.Files
+
+
acc = ComponentAccumulator()
from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamCnvSvc, ByteStreamEventStorageInputSvc, EventSelectorByteStream
@@ -112,6 +114,8 @@ def TrigBSReadCfg( inputFlags ):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
+ from AthenaCommon.Configurable import Configurable
+ Configurable.configurableRun3Behavior=True
ConfigFlags.Input.Files = defaultTestFiles.RAW
diff --git a/Event/EventInfoMgt/python/TagInfoMgrConfig.py b/Event/EventInfoMgt/python/TagInfoMgrConfig.py
index c58114a9ae1..dc87688ff65 100644
--- a/Event/EventInfoMgt/python/TagInfoMgrConfig.py
+++ b/Event/EventInfoMgt/python/TagInfoMgrConfig.py
@@ -34,13 +34,15 @@ def TagInfoMgrCfg(configFlags,tagValuePairs=[]):
return result,tagInfoMgr
if __name__ == "__main__":
+ from AthenaCommon.Configurable import Configurable
+ Configurable.configurableRun3Behavior=True
+
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.Input.Files = defaultTestFiles.RAW
ConfigFlags.lock()
-
acc, tagInfoMgr = TagInfoMgrCfg( ConfigFlags )
print tagInfoMgr
acc.store( file( "test.pkl", "w" ) )
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcConfig.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcConfig.py
index 2ee44d6ce6b..53847dca87a 100755
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcConfig.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcConfig.py
@@ -427,6 +427,9 @@ def TrigConfigSvcCfg( flags ):
return acc
if __name__ == "__main__":
+ from AthenaCommon.Configurable import Configurable
+ Configurable.configurableRun3Behavior=True
+
from AthenaConfiguration.AllConfigFlags import ConfigFlags
ConfigFlags.lock()
acc = TrigConfigSvcCfg( ConfigFlags )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
index bb5ac589aa1..54f095bd856 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
@@ -55,6 +55,9 @@ def setupMenu(flags):
if __name__ == "__main__":
+ from AthenaCommon.Configurable import Configurable
+ Configurable.configurableRun3Behavior=True
+
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaCommon.Constants import VERBOSE
from AthenaCommon.Logging import logging
--
GitLab