From 16c77ca11db08f478526d972bdd13209b7b767db Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Wed, 5 Dec 2018 18:23:38 +0100
Subject: [PATCH] Move tests to use default RAW file from AthenaConfiguration
Former-commit-id: 6b28f423f4f1ec6614f804face7a0431d7a1451b
---
Calorimeter/CaloTools/python/CaloNoiseToolConfig.py | 3 ++-
.../GeoModel/AtlasGeoModel/python/GeoModelConfig.py | 8 +++++---
.../RegionSelector/python/RegSelConfig.py | 4 +++-
Event/ByteStreamCnvSvc/python/ByteStreamConfig.py | 4 +++-
Event/EventInfoMgt/python/TagInfoMgrConfig.py | 5 ++++-
LArCalorimeter/LArCabling/python/LArCablingConfig.py | 5 ++++-
.../LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py | 3 ++-
.../MagFieldServices/python/MagFieldServicesConfig.py | 4 +++-
.../MuonConfig/python/MuonBytestreamDecodeConfig.py | 4 +++-
MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py | 5 ++++-
.../MuonConfig/python/MuonRdoDecodeConfig.py | 4 +++-
.../TileConditions/python/TileConditionsConfig.py | 9 +++++----
TileCalorimeter/TileGeoModel/python/TileGMConfig.py | 5 ++++-
.../python/AtlasTrackingGeometrySvcConfig.py | 3 ++-
14 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/Calorimeter/CaloTools/python/CaloNoiseToolConfig.py b/Calorimeter/CaloTools/python/CaloNoiseToolConfig.py
index 915a4d5bb1c..d3e6c0010ed 100644
--- a/Calorimeter/CaloTools/python/CaloNoiseToolConfig.py
+++ b/Calorimeter/CaloTools/python/CaloNoiseToolConfig.py
@@ -103,8 +103,9 @@ if __name__ == "__main__":
from AthenaCommon.Configurable import Configurable
Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files =["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
ConfigFlags.lock()
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py
index e0af6cc3d96..21cb0f410a2 100644
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py
@@ -41,8 +41,10 @@ if __name__ == "__main__":
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
acc = ComponentAccumulator()
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
- acc = GeoModelCfg( ConfigFlags )
- acc[0].store( file( "test.pkl", "w" ) )
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
+
+ acc, gms = GeoModelCfg( ConfigFlags )
+ acc.store( file( "test.pkl", "w" ) )
print "All OK"
diff --git a/DetectorDescription/RegionSelector/python/RegSelConfig.py b/DetectorDescription/RegionSelector/python/RegSelConfig.py
index 60e334dc9eb..b2162559ef6 100644
--- a/DetectorDescription/RegionSelector/python/RegSelConfig.py
+++ b/DetectorDescription/RegionSelector/python/RegSelConfig.py
@@ -36,7 +36,9 @@ if __name__ == "__main__":
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
acc = ComponentAccumulator()
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
acc = RegSelConfig( ConfigFlags )
acc.store( file( "test.pkl", "w" ) )
diff --git a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
index ebff37302f5..d9e1c6676f0 100644
--- a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
+++ b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
@@ -114,7 +114,9 @@ def TrigBSReadCfg( inputFlags ):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
acc = TrigBSReadCfg( ConfigFlags )
acc.store( file( "test.pkl", "w" ) )
diff --git a/Event/EventInfoMgt/python/TagInfoMgrConfig.py b/Event/EventInfoMgt/python/TagInfoMgrConfig.py
index 7b59ed102d5..c58114a9ae1 100644
--- a/Event/EventInfoMgt/python/TagInfoMgrConfig.py
+++ b/Event/EventInfoMgt/python/TagInfoMgrConfig.py
@@ -36,7 +36,10 @@ def TagInfoMgrCfg(configFlags,tagValuePairs=[]):
if __name__ == "__main__":
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
+ ConfigFlags.lock()
acc, tagInfoMgr = TagInfoMgrCfg( ConfigFlags )
print tagInfoMgr
diff --git a/LArCalorimeter/LArCabling/python/LArCablingConfig.py b/LArCalorimeter/LArCabling/python/LArCablingConfig.py
index 9df17cd6126..22004a58914 100644
--- a/LArCalorimeter/LArCabling/python/LArCablingConfig.py
+++ b/LArCalorimeter/LArCabling/python/LArCablingConfig.py
@@ -42,7 +42,10 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaCommon.Configurable import Configurable
Configurable.configurableRun3Behavior=1
- ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
+ ConfigFlags.lock()
acc = LArOnOffIdMappingCfg( ConfigFlags )[0]
acc.merge(LArFebRodMappingCfg(ConfigFlags)[0])
diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py
index ce8fecbe238..6debae0936c 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py
@@ -28,8 +28,9 @@ if __name__ == "__main__":
from AthenaCommon.Configurable import Configurable
Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files =["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
ConfigFlags.lock()
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
diff --git a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
index bc30cfc995c..f0c0a24f41f 100644
--- a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
+++ b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
@@ -79,7 +79,9 @@ if __name__=="__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
log.setLevel(VERBOSE)
- ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
ConfigFlags.Input.isMC = False
ConfigFlags.lock()
diff --git a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
index 73c96b00433..64bd649a9be 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
@@ -53,7 +53,9 @@ if __name__=="__main__":
Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
# Set global tag by hand for now
ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-13"#"CONDBR2-BLKPA-2015-17"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"#"ATLAS-R2-2015-03-01-00"
diff --git a/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
index 9c1d6b12b3f..10e536543b9 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
@@ -76,7 +76,10 @@ if __name__ == '__main__':
Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.Input.Files =["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
ConfigFlags.lock()
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
index fb6fa7762de..ca3d670956d 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
@@ -42,7 +42,9 @@ def muonRdoDecodeTestData():
Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
# Set global tag by hand for now
ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-13"#"CONDBR2-BLKPA-2015-17"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"#"ATLAS-R2-2015-03-01-00"
diff --git a/TileCalorimeter/TileConditions/python/TileConditionsConfig.py b/TileCalorimeter/TileConditions/python/TileConditionsConfig.py
index f78bf1d9bb1..5827bd78724 100644
--- a/TileCalorimeter/TileConditions/python/TileConditionsConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileConditionsConfig.py
@@ -118,9 +118,9 @@ def tileCondCfg( flags ):
# acc.addToAppProperty('CreateSvc', [infoLoaderSvc.getFullName()] )
- cabligSvc = TileCablingSvc()
- cabligSvc.CablingType = 4
- acc.addService( cabligSvc )
+ cablingSvc = TileCablingSvc()
+ cablingSvc.CablingType = 4
+ acc.addService( cablingSvc )
return acc
@@ -128,8 +128,9 @@ if __name__ == "__main__":
from AthenaCommon.Configurable import Configurable
Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files =["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
ConfigFlags.lock()
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
diff --git a/TileCalorimeter/TileGeoModel/python/TileGMConfig.py b/TileCalorimeter/TileGeoModel/python/TileGMConfig.py
index 4ea1e784faa..e8e1b464b84 100644
--- a/TileCalorimeter/TileGeoModel/python/TileGMConfig.py
+++ b/TileCalorimeter/TileGeoModel/python/TileGMConfig.py
@@ -17,7 +17,10 @@ def TileGMCfg(configFlags):
if __name__ == "__main__":
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
+ ConfigFlags.lock()
acc = TileGMCfg( ConfigFlags )
acc.store( file( "test.pkl", "w" ) )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvcConfig.py b/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvcConfig.py
index 0f70bbb0565..4022650a844 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvcConfig.py
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvcConfig.py
@@ -85,8 +85,9 @@ if __name__ == '__main__':
from AthenaCommon.Configurable import Configurable
Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
ConfigFlags.lock()
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
--
GitLab