From eb6cfcc85fdda8006f35a2068ba9ae5ea5394d3d Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Sun, 23 Jan 2022 19:18:36 +0100
Subject: [PATCH] Update HITS and RDO test inputs for Run 2 reprocessing
---
.../test/BeamPipeGMConfig_test.py | 6 +--
.../CaloClusterCorrection/test/config_t.py | 2 +-
.../python/CaloBaselineMonAlg.py | 4 +-
.../CaloMonitoring/python/LArCellMonAlg.py | 4 +-
.../CaloRec/python/CaloBCIDAvgAlgConfig.py | 9 ++---
.../python/CaloCellContainerAliasAlg_test.py | 4 +-
.../CaloRec/python/CaloCellMakerConfig.py | 4 +-
.../python/CaloThinCellsByClusterAlg_test.py | 4 +-
.../python/CaloThinCellsBySamplingAlg_test.py | 4 +-
.../share/ToolConstantsCondAlg_test.ref | 2 +-
.../CaloRec/test/ToolConstantsCondAlg_test.py | 5 +--
.../python/CaloEstimatedGainToolConfig.py | 4 +-
.../python/CaloEstimatedGainTool_test.py | 4 +-
.../CaloUtils/test/ToolWithConstants_test.py | 4 +-
.../python/TestDefaults.py | 39 +++++++++----------
.../test/testAllConfigFlags_HITS.py | 4 +-
.../test/testAllConfigFlags_RDO.py | 4 +-
.../AtlasGeoModel/python/GeoModelConfig.py | 5 +--
.../test/AtlasGeometryConfig_HITS_test.py | 6 +--
.../python/DumpEventDataToJSONConfig.py | 3 +-
Event/EventInfoMgt/python/TagInfoMgrConfig.py | 2 +-
.../test/EventInfoCnv_test.py | 4 +-
.../test/EventInfoOverlayLegacy_test.py | 7 ++--
.../test/EventInfoOverlay_test.py | 4 +-
.../test/SCT_ConditionsConfig_test.py | 5 +--
.../test/SiLorentzAngleConfig_test.py | 5 +--
.../test/SiPropertiesConfig_test.py | 5 +--
.../InDetConfig/python/BackTrackingConfig.py | 2 +-
.../python/ClusterizationConfig.py | 4 +-
.../python/ITkSiliconPreProcessing.py | 4 +-
.../InDetConfig/python/ITkTrackRecoConfig.py | 2 +-
.../InDetConfig/python/ITkTrackTruthConfig.py | 4 +-
.../InDetConfig/python/InDetGeometryConfig.py | 13 +++----
.../python/SiliconPreProcessing.py | 2 +-
.../InDetConfig/python/TRTExtensionConfig.py | 2 +-
.../InDetConfig/python/TRTPhaseConfig.py | 4 +-
.../InDetConfig/python/TRTPreProcessing.py | 2 +-
.../python/TRTSegmentFindingConfig.py | 3 +-
.../InDetConfig/python/TRTStandaloneConfig.py | 2 +-
.../InDetConfig/python/TrackRecoConfig.py | 2 +-
.../InDetConfig/python/TrackTruthConfig.py | 2 +-
.../InDetConfig/python/VertexFindingConfig.py | 4 +-
.../PixelGeoModel/test/PixelGMConfig_test.py | 6 +--
.../test/PixelReadoutGeometryConfig_test.py | 5 +--
.../SCT_GeoModel/test/SCT_GMConfig_test.py | 6 +--
.../TRT_GeoModel/test/TRT_GMConfig_test.py | 4 +-
.../test/BCM_DigitizationConfigNew_test.py | 5 +--
.../test/PixelDigitizationConfigNew_test.py | 4 +-
.../test/SCT_DigitizationConfigNew_test.py | 4 +-
.../test/TRT_DigitizationConfigNew_test.py | 4 +-
.../share/LArCellConditions.py | 8 ++--
.../LArRecUtils/python/LArRecUtilsConfig.py | 8 ++--
.../python/MuonBytestreamDecodeConfig.py | 7 ++--
.../test/CSC_DigitizationConfig_test.py | 4 +-
.../test/MDT_DigitizationConfig_test.py | 4 +-
.../test/RPC_DigitizationConfig_test.py | 4 +-
.../test/TGC_DigitizationConfig_test.py | 4 +-
.../python/RpcMonitorAlgorithm.py | 6 +--
.../python/ThinGeantTruthConfig.py | 4 +-
.../python/ThinTRTStandaloneConfig.py | 4 +-
.../python/MCTruthClassifierConfig.py | 4 +-
.../RecJobTransforms/test/RecoSteeringTest.py | 4 +-
.../IsolationAlgs/python/IsoDensityConfig.py | 4 +-
.../python/IsolationBuilderConfig.py | 4 +-
.../python/IsolationSteeringConfig.py | 2 +-
.../python/EMBremCollectionBuilderConfig.py | 4 +-
.../python/EMVertexBuilderConfig.py | 4 +-
.../python/egammaForwardBuilderConfig.py | 4 +-
.../python/egammaRecBuilderConfig.py | 4 +-
.../python/egammaSelectedTrackCopyConfig.py | 4 +-
.../python/egammaSuperClusterBuilderConfig.py | 4 +-
.../python/egammaTopoClusterCopierConfig.py | 4 +-
.../python/egammaTruthAssociationConfig.py | 4 +-
.../python/topoEgammaBuilderConfig.py | 4 +-
.../python/egammaLRTReconstructionConfig.py | 4 +-
.../python/egammaReconstructionConfig.py | 4 +-
.../python/egammaSteeringConfig.py | 2 +-
.../python/egammaUpstreamConfig.py | 4 +-
.../python/egammaMVACalibConfig.py | 4 +-
.../egammaTools/python/EMClusterToolConfig.py | 4 +-
.../python/EMConversionBuilderConfig.py | 4 +-
.../egammaTools/python/EMPIDBuilderConfig.py | 4 +-
.../python/EMShowerBuilderConfig.py | 4 +-
.../python/EMTrackMatchBuilderConfig.py | 4 +-
.../python/egammaLargeClusterMakerConfig.py | 4 +-
.../python/egammaOQFlagsBuilderConfig.py | 4 +-
.../egammaTools/python/egammaSwToolConfig.py | 4 +-
.../python/GSFTrackFitterConfig.py | 2 +-
.../python/egammaTrackToolsConfig.py | 4 +-
.../test/DigitizationConfigNew_test.py | 4 +-
.../test/DigitizationPUConfigNew_test.py | 12 +++---
.../python/AddNoiseCellBuilderToolConfig.py | 4 +-
.../python/AddNoiseCellBuilderTool_test.py | 4 +-
.../G4AtlasTests/share/DCubeTestsConfig.py | 4 +-
.../python/ISF_FatrasConfig.py | 2 +-
.../python/OverlayTestHelpers.py | 6 +--
.../TileCondToolsTestConfig_OfflineMC_test.py | 4 +-
.../TileCondToolsTestConfig_OnlineMC_test.py | 4 +-
.../python/TileDigitizationConfig.py | 4 +-
.../python/TileDigitsMakerConfig.py | 4 +-
.../TileSimAlgs/python/TileHitToTTL1Config.py | 4 +-
.../python/TileHitVecToCntConfig.py | 4 +-
.../python/TileMuonReceiverConfig.py | 4 +-
.../python/TileMuonReceiverDecisionConfig.py | 4 +-
.../python/AtlasExtrapolatorConfig.py | 2 +-
105 files changed, 227 insertions(+), 249 deletions(-)
diff --git a/AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py b/AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py
index cced184f10a..a15021edca2 100755
--- a/AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py
+++ b/AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests on BeamPipeGeoModel configuration
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
if __name__ == "__main__":
from AthenaCommon.Configurable import Configurable
@@ -9,8 +9,8 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.HITS
- ConfigFlags.GeoModel.Align.Dynamic = False
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
+ ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
from BeamPipeGeoModel.BeamPipeGMConfig import BeamPipeGeometryCfg
diff --git a/Calorimeter/CaloClusterCorrection/test/config_t.py b/Calorimeter/CaloClusterCorrection/test/config_t.py
index df176c80988..9ffcbccad69 100644
--- a/Calorimeter/CaloClusterCorrection/test/config_t.py
+++ b/Calorimeter/CaloClusterCorrection/test/config_t.py
@@ -218,7 +218,7 @@ def test2 (flags_in):
flags = flags_in.clone()
flags.Input.isMC = True
flags.IOVDb.GlobalTag = 'OFLCOND-RUN12-SDR-31'
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.lock()
ca = make_CaloSwCorrectionsCfg (flags, version = '@GLOBAL',
diff --git a/Calorimeter/CaloMonitoring/python/CaloBaselineMonAlg.py b/Calorimeter/CaloMonitoring/python/CaloBaselineMonAlg.py
index 4c9ec1ab2a6..ead2b1800e1 100644
--- a/Calorimeter/CaloMonitoring/python/CaloBaselineMonAlg.py
+++ b/Calorimeter/CaloMonitoring/python/CaloBaselineMonAlg.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
#
from __future__ import print_function
@@ -205,8 +205,6 @@ if __name__=='__main__':
# Set the Athena configuration flags
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- #from AthenaConfiguration.TestDefaults import defaultTestFiles
- #ConfigFlags.Input.Files = defaultTestFiles.ESD
ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/data15_13TeV.00278748.physics_ZeroBias.merge.RAW._lb0384._SFO-ALL._0001.1']
#ConfigFlags.Input.isMC = True
ConfigFlags.Output.HISTFileName = 'CaloBaselineMonOutput.root'
diff --git a/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py b/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
index 8af9ba42050..8096f55531d 100644
--- a/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
+++ b/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
#
def LArCellMonConfigOld(inputFlags):
@@ -512,8 +512,6 @@ if __name__=='__main__':
# Set the Athena configuration flags
from AthenaConfiguration.AllConfigFlags import ConfigFlags
-# from AthenaConfiguration.TestDefaults import defaultTestFiles
-# ConfigFlags.Input.Files = defaultTestFiles.ESD
ConfigFlags.Input.Files = ['/eos/atlas/atlastier0/rucio//data18_13TeV/physics_Main/00357750/data18_13TeV.00357750.physics_Main.daq.RAW/data18_13TeV.00357750.physics_Main.daq.RAW._lb0123._SFO-3._0004.data']
# to test tier0 workflow:
#ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/data15_13TeV.00278748.physics_ZeroBias.merge.RAW._lb0384._SFO-ALL._0001.1']
diff --git a/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py b/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
index 4435c6957b8..b1ac95eca5f 100644
--- a/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
# File: CaloRec/python/CaloBCIDAvgAlgConfig.py
# Created: Mar 2019, sss
@@ -30,7 +30,6 @@ if __name__ == "__main__":
from AthenaCommon.Configurable import Configurable
Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.loadAllDynamicFlags()
only = ['CaloBCIDAvgAlg',
@@ -47,7 +46,7 @@ if __name__ == "__main__":
]
print ('--- data')
flags1 = ConfigFlags.clone()
- flags1.Input.Files = defaultTestFiles.RAW
+ flags1.Input.Files = []
flags1.lock()
acc1 = CaloBCIDAvgAlgCfg (flags1)
acc1.printConfig(summariseProps=True, onlyComponents=only)
@@ -55,7 +54,7 @@ if __name__ == "__main__":
print ('--- mc')
flags2 = ConfigFlags.clone()
- flags2.Input.Files = defaultTestFiles.RAW
+ flags2.Input.Files = []
flags2.Input.isMC = True
flags2.lock()
acc2 = CaloBCIDAvgAlgCfg (flags2)
@@ -64,7 +63,7 @@ if __name__ == "__main__":
print ('--- online')
flags3 = ConfigFlags.clone()
- flags3.Input.Files = defaultTestFiles.RAW
+ flags3.Input.Files = []
flags3.Common.isOnline = True
flags3.lock()
acc3 = CaloBCIDAvgAlgCfg (flags3)
diff --git a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
index eb13356e675..1f70ff423ea 100644
--- a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
+++ b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
#
# File: CaloRec/python/CaloCellContainerAliasAlg_test.py
# Author: scott snyder
@@ -58,7 +58,7 @@ Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.Detector.GeometryLAr = True
ConfigFlags.Detector.GeometryTile = True
diff --git a/Calorimeter/CaloRec/python/CaloCellMakerConfig.py b/Calorimeter/CaloRec/python/CaloCellMakerConfig.py
index b337368d552..a968db449b5 100644
--- a/Calorimeter/CaloRec/python/CaloCellMakerConfig.py
+++ b/Calorimeter/CaloRec/python/CaloCellMakerConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -70,7 +70,7 @@ if __name__=="__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
index 3cb430033b1..dbd69ad23de 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
#
# File: CaloRec/python/CaloThinCellsByClusterAlg_test.py
# Author: scott snyder
@@ -144,7 +144,7 @@ Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.Detector.GeometryLAr = True
ConfigFlags.Detector.GeometryTile = True
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
index cdc0967451c..c06be07bfef 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
#
# File: CaloRec/python/CaloThinCellsBySamplingAlg_test.py
# Author: scott snyder
@@ -79,7 +79,7 @@ Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.Detector.GeometryLAr = True
ConfigFlags.Detector.GeometryTile = True
diff --git a/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref b/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
index 9be2c8c5852..89796d57f7a 100644
--- a/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
+++ b/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
@@ -35,7 +35,7 @@ CondInputLoader INFO created CondCont<CondA
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 284500 <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #0, run #284500 0 events processed so far <<<===
-IOVDbFolder INFO HVS tag OFLCOND-MC16-SDR-17 resolved to LARCellCorrOflDeadOTX-000-00 for folder /LAR/CellCorrOfl/deadOTX
+IOVDbFolder INFO HVS tag OFLCOND-MC16-SDR-RUN2-09 resolved to LARCellCorrOflDeadOTX-000-00 for folder /LAR/CellCorrOfl/deadOTX
dumper1 INFO dumper.energyCalibrationTypes = [0, 0, 0, -1]
dumper.energyCalibrations = [2, 0.9959, 0.07493, -0.1599, 2, 2, 0.9962, 0.04997, -0.1839, 2, 2, 0.9984, 0.0143, -0.9648, 2]
dumper.etaCalibrationSizes = [14, 14, 13, 0]
diff --git a/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py b/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py
index 6b29c835bc8..14c5de7584c 100755
--- a/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py
+++ b/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
#
# File: CaloRec/python/ToolConstantsCondALg_test.py
# Author: scott snyder
@@ -11,7 +11,6 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-import ROOT
def testCfg (configFlags):
@@ -49,7 +48,7 @@ Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.lock()
diff --git a/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py b/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py
index 7cf957b74a0..18180d09d4a 100644
--- a/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py
+++ b/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
#
# File: CaloTools/python/CaloEstimatedGainToolConfig.py
# Created: Aug 2019, sss
@@ -66,7 +66,7 @@ if __name__ == "__main__":
ConfigFlags.loadAllDynamicFlags()
flags1 = ConfigFlags.clone()
- flags1.Input.Files = defaultTestFiles.RDO
+ flags1.Input.Files = defaultTestFiles.RDO_RUN2
flags1.lock()
acc1 = CaloEstimatedGainToolCfg (flags1)
only = ['CaloEstimatedGainTool']
diff --git a/Calorimeter/CaloTools/python/CaloEstimatedGainTool_test.py b/Calorimeter/CaloTools/python/CaloEstimatedGainTool_test.py
index 450684dca51..f3d0e294334 100644
--- a/Calorimeter/CaloTools/python/CaloEstimatedGainTool_test.py
+++ b/Calorimeter/CaloTools/python/CaloEstimatedGainTool_test.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
#
# File: CaloTools/python/CaloEstimatedGainTool_test.py
# Author: scott snyder
@@ -106,7 +106,7 @@ Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.Detector.GeometryLAr = True
ConfigFlags.Detector.GeometryTile = True
ConfigFlags.needFlagsCategory('Tile')
diff --git a/Calorimeter/CaloUtils/test/ToolWithConstants_test.py b/Calorimeter/CaloUtils/test/ToolWithConstants_test.py
index 5901bb89ef2..d7ef2839a3f 100755
--- a/Calorimeter/CaloUtils/test/ToolWithConstants_test.py
+++ b/Calorimeter/CaloUtils/test/ToolWithConstants_test.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
#
# File: CaloRec/python/ToolWithConstants_test.py
# Author: scott snyder
@@ -92,7 +92,7 @@ Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.lock()
diff --git a/Control/AthenaConfiguration/python/TestDefaults.py b/Control/AthenaConfiguration/python/TestDefaults.py
index 318d6519311..af4b78291dd 100644
--- a/Control/AthenaConfiguration/python/TestDefaults.py
+++ b/Control/AthenaConfiguration/python/TestDefaults.py
@@ -1,28 +1,27 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
# Files for use in configuration unit tests
class defaultTestFiles:
import os
d = os.environ.get ("ATLAS_REFERENCE_DATA",
"/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art")
- EVNT= [d + "/SimCoreTests/mcatnlojimmy_ttbar_leptonfilter.19.2.5.37.EVNT.pool.root"] #find an official file.
- HITS= [d + "/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"]
- HITS_SPECIAL = [d + "/DigitizationTests/mc16_13TeV.HITS.16965029._000024.pool.root.1"]
- HITS_DATA_OVERLAY = [d + "/OverlayMonitoringRTT/mc16_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.OverlaySim/HITS.pool.root"]
- HITS_MINBIAS_HIGH = [
- d + "/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000005.pool.root.1",
- d + "/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000013.pool.root.1",
- d + "/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000018.pool.root.1",
+ EVNT = [f"{d}/SimCoreTests/mcatnlojimmy_ttbar_leptonfilter.19.2.5.37.EVNT.pool.root"] #find an official file.
+ HITS_RUN2 = [f"{d}/Tier0ChainTests/mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3681/HITS.25836812._004813.pool.root.1"]
+ HITS_RUN2_MINBIAS_HIGH = [
+ f"{d}/Tier0ChainTests/mc16_13TeV.800831.Py8EG_minbias_inelastic_highjetphotonlepton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106512._000149.pool.root.1",
+ f"{d}/Tier0ChainTests/mc16_13TeV.800831.Py8EG_minbias_inelastic_highjetphotonlepton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106512._000581.pool.root.1",
+ f"{d}/Tier0ChainTests/mc16_13TeV.800831.Py8EG_minbias_inelastic_highjetphotonlepton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106512._000717.pool.root.1",
]
- HITS_MINBIAS_LOW = [
- d + "/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000003.pool.root.1",
- d + "/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000024.pool.root.1",
- d + "/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000044.pool.root.1",
+ HITS_RUN2_MINBIAS_LOW = [
+ f"{d}/Tier0ChainTests/mc16_13TeV.900311.Epos_minbias_inelastic_lowjetphoton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106626._000068.pool.root.1",
+ f"{d}/Tier0ChainTests/mc16_13TeV.900311.Epos_minbias_inelastic_lowjetphoton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106626._000480.pool.root.1",
+ f"{d}/Tier0ChainTests/mc16_13TeV.900311.Epos_minbias_inelastic_lowjetphoton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106626._000574.pool.root.1",
]
- RAW = [d + "/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
- RAW_BKG = [d + "/OverlayMonitoringRTT/mc15_valid.00200010.overlay_streamsAll_2016_pp_1.skim.DRAW.r8381/DRAW.09331084._000146.pool.root.1"]
- RDO = [d + "/Tier0ChainTests/q221/21.0/v1/myRDO.pool.root"]
- RDO_BKG = [d + "/OverlayMonitoringRTT/PileupPremixing/22.0/v4/RDO.merged-pileup-MT.100events.pool.root"]
- ESD = [d + "/RecExRecoTest/mc16_13TeV.361022.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2W.recon.ESD.e3668_s3170_r10572_homeMade.pool.root"]
- AOD = [d + "/CommonInputs/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1"]
- AOD_MC = [d + "/CommonInputs/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.AOD.e5458_s3126_r9364_r9315/AOD.11182705._000001.pool.root.1"]
+ HITS_DATA_OVERLAY = [f"{d}/OverlayMonitoringRTT/mc16_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.OverlaySim/HITS.pool.root"]
+ RAW = [f"{d}/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+ RAW_BKG = [f"{d}/OverlayMonitoringRTT/mc15_valid.00200010.overlay_streamsAll_2016_pp_1.skim.DRAW.r8381/DRAW.09331084._000146.pool.root.1"]
+ RDO_RUN2 = [f"{d}/WorkflowReferences/master/q443/v1/myRDO.pool.root"]
+ RDO_BKG_RUN2 = [f"{d}/OverlayTests/PresampledPileUp/22.0/Run2/large/mc20_13TeV.900149.PG_single_nu_Pt50.digit.RDO.e8307_s3482_s3136_d1715/RDO.26811908._031801.pool.root.1"]
+ ESD = [f"{d}/RecExRecoTest/mc16_13TeV.361022.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2W.recon.ESD.e3668_s3170_r10572_homeMade.pool.root"]
+ AOD = [f"{d}/CommonInputs/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1"]
+ AOD_MC = [f"{d}/CommonInputs/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.AOD.e5458_s3126_r9364_r9315/AOD.11182705._000001.pool.root.1"]
diff --git a/Control/AthenaConfiguration/test/testAllConfigFlags_HITS.py b/Control/AthenaConfiguration/test/testAllConfigFlags_HITS.py
index cbccb4d85a4..847283188d6 100755
--- a/Control/AthenaConfiguration/test/testAllConfigFlags_HITS.py
+++ b/Control/AthenaConfiguration/test/testAllConfigFlags_HITS.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags._loadDynaFlags("Detector")
# Don't fail just because G4AtlasApps isn't present in this build.
diff --git a/Control/AthenaConfiguration/test/testAllConfigFlags_RDO.py b/Control/AthenaConfiguration/test/testAllConfigFlags_RDO.py
index d8b8614d0bd..20a6c779d29 100755
--- a/Control/AthenaConfiguration/test/testAllConfigFlags_RDO.py
+++ b/Control/AthenaConfiguration/test/testAllConfigFlags_RDO.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags._loadDynaFlags("Detector")
# Don't fail just because G4AtlasApps isn't present in this build.
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py
index e192f375ff3..65159ffe201 100644
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -42,9 +42,8 @@ def GeoModelCfg(configFlags):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RAW
+ ConfigFlags.Input.Files = []
Configurable.configurableRun3Behavior=1
acc = GeoModelCfg( ConfigFlags )
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/test/AtlasGeometryConfig_HITS_test.py b/DetectorDescription/GeoModel/AtlasGeoModel/test/AtlasGeometryConfig_HITS_test.py
index b1f721b81d4..227889039b3 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/test/AtlasGeometryConfig_HITS_test.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/test/AtlasGeometryConfig_HITS_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run a test on Atlas Geometry configuration using a HITS file as input
-Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
if __name__ == "__main__":
from AthenaCommon.Logging import log
@@ -16,9 +16,9 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
from AthenaConfiguration.TestDefaults import defaultTestFiles
# Provide MC input
- ConfigFlags.Input.Files = defaultTestFiles.HITS
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
- ConfigFlags.GeoModel.Align.Dynamic = False
+ ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
# Construct ComponentAccumulator
diff --git a/Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py b/Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py
index 31d166d49b6..abdaf94c346 100644
--- a/Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py
+++ b/Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -45,7 +45,6 @@ if __name__ == "__main__":
from AthenaCommon.Logging import log
# from AthenaCommon.Constants import DEBUG
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- # from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
diff --git a/Event/EventInfoMgt/python/TagInfoMgrConfig.py b/Event/EventInfoMgt/python/TagInfoMgrConfig.py
index 1b080e60238..fab1946c060 100644
--- a/Event/EventInfoMgt/python/TagInfoMgrConfig.py
+++ b/Event/EventInfoMgt/python/TagInfoMgrConfig.py
@@ -31,7 +31,7 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.lock()
acc, tagInfoMgr = TagInfoMgrCfg( ConfigFlags, {"SomeKey": "SomeValue"} )
diff --git a/Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py b/Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py
index 20fc24eca90..46077478730 100755
--- a/Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py
+++ b/Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests for old EventInfo to xAOD::EventInfo conversion
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
import sys
@@ -34,7 +34,7 @@ parser.add_argument("-d", "--debug", default='', type=str,
args = parser.parse_args()
# Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
ConfigFlags.Output.HITSFileName = "myHITS.pool.root"
diff --git a/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlayLegacy_test.py b/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlayLegacy_test.py
index 39c4a079f96..0cb452d4ecd 100755
--- a/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlayLegacy_test.py
+++ b/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlayLegacy_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests for EventInfo overlay with legacy inputs
-Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
import sys
@@ -22,8 +22,9 @@ parser = CommonTestArgumentParser("EventInfoOverlayLegacy_test.py")
args = parser.parse_args()
# Configure
-ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG
-ConfigFlags.Input.SecondaryFiles = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG_RUN2
+# use old HITS on purpose
+ConfigFlags.Input.SecondaryFiles = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"]
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
ConfigFlags.Overlay.DataOverlay = False
ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
diff --git a/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlay_test.py b/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlay_test.py
index 2096a6dcbe4..3f441a86b95 100755
--- a/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlay_test.py
+++ b/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlay_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests for EventInfo overlay
-Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
import sys
@@ -22,7 +22,7 @@ parser = CommonTestArgumentParser("EventInfoOverlay_test.py")
args = parser.parse_args()
# Configure
-ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG
+ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG_RUN2
ConfigFlags.Input.SecondaryFiles = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/TestCase_xAODEventInfo.root"]
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
ConfigFlags.Overlay.DataOverlay = False
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/test/SCT_ConditionsConfig_test.py b/InnerDetector/InDetConditions/SCT_ConditionsTools/test/SCT_ConditionsConfig_test.py
index f4a5a71ad10..0f6c70f457c 100755
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/test/SCT_ConditionsConfig_test.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/test/SCT_ConditionsConfig_test.py
@@ -1,10 +1,9 @@
#!/usr/bin/env python
"""Run tests on SCT_ConditionsTools/python/*Config.py scripts
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.AllConfigFlags import ConfigFlags
-from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
from AthenaCommon.Configurable import Configurable
@@ -13,7 +12,7 @@ from SCT_ConditionsTools.SCT_ConditionsToolsConfig import SCT_DCSConditionsCfg,
# test setup
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = []
ConfigFlags.lock()
# call tests
dcs_acc = SCT_DCSConditionsCfg(ConfigFlags, name="DCSTest")
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/test/SiLorentzAngleConfig_test.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/test/SiLorentzAngleConfig_test.py
index 4b462d1147f..f298c9bab33 100755
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/test/SiLorentzAngleConfig_test.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/test/SiLorentzAngleConfig_test.py
@@ -1,9 +1,8 @@
#!/usr/bin/env python
"""Run tests on *LorentzAngleConfig.py
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaCommon.Logging import log
@@ -15,7 +14,7 @@ from SiLorentzAngleTool.PixelLorentzAngleConfig import PixelLorentzAngleCfg
# test setup
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
# using __init__ to reset, preventing errors on deletion
# case online
ConfigFlags.Common.isOnline = True
diff --git a/InnerDetector/InDetConditions/SiPropertiesTool/test/SiPropertiesConfig_test.py b/InnerDetector/InDetConditions/SiPropertiesTool/test/SiPropertiesConfig_test.py
index e6e58b02d35..940b4d025b6 100755
--- a/InnerDetector/InDetConditions/SiPropertiesTool/test/SiPropertiesConfig_test.py
+++ b/InnerDetector/InDetConditions/SiPropertiesTool/test/SiPropertiesConfig_test.py
@@ -1,9 +1,8 @@
#!/usr/bin/env python
"""Run tests on SCT_SiPropertiesConfig.py
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaCommon.Logging import log
@@ -15,7 +14,7 @@ from SiPropertiesTool.PixelSiPropertiesConfig import PixelSiPropertiesCfg
# test setup
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.lock()
# test
sct_acc = SCT_SiPropertiesCfg(ConfigFlags, name="SCT_SiPropertiesConfigTest")
diff --git a/InnerDetector/InDetConfig/python/BackTrackingConfig.py b/InnerDetector/InDetConfig/python/BackTrackingConfig.py
index 8ac05a06d7d..2734bf5b7e2 100644
--- a/InnerDetector/InDetConfig/python/BackTrackingConfig.py
+++ b/InnerDetector/InDetConfig/python/BackTrackingConfig.py
@@ -339,7 +339,7 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- flags.Input.Files=defaultTestFiles.RDO
+ flags.Input.Files=defaultTestFiles.RDO_RUN2
# disable calo for this test
flags.Detector.EnableCalo = False
diff --git a/InnerDetector/InDetConfig/python/ClusterizationConfig.py b/InnerDetector/InDetConfig/python/ClusterizationConfig.py
index eb94e3e1d4d..c02b9ca2cd9 100644
--- a/InnerDetector/InDetConfig/python/ClusterizationConfig.py
+++ b/InnerDetector/InDetConfig/python/ClusterizationConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from InDetConfig.TrackRecoConfig import BCM_ZeroSuppressionCfg, PixelClusterizationCfg, \
@@ -64,7 +64,7 @@ if __name__ == "__main__":
ConfigFlags.InDet.Tracking.doPixelClusterSplitting = True
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/InnerDetector/InDetConfig/python/ITkSiliconPreProcessing.py b/InnerDetector/InDetConfig/python/ITkSiliconPreProcessing.py
index 740bf414854..a21849d58ac 100644
--- a/InnerDetector/InDetConfig/python/ITkSiliconPreProcessing.py
+++ b/InnerDetector/InDetConfig/python/ITkSiliconPreProcessing.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -231,7 +231,7 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files=defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.Detector.GeometryITkPixel = True
ConfigFlags.Detector.GeometryITkStrip = True
diff --git a/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py b/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
index 666081541d4..ad92f0d5681 100644
--- a/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
@@ -314,7 +314,7 @@ if __name__ == "__main__":
ConfigFlags.Detector.EnableCalo = False
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/InnerDetector/InDetConfig/python/ITkTrackTruthConfig.py b/InnerDetector/InDetConfig/python/ITkTrackTruthConfig.py
index e1a69c12216..d4496ed3738 100644
--- a/InnerDetector/InDetConfig/python/ITkTrackTruthConfig.py
+++ b/InnerDetector/InDetConfig/python/ITkTrackTruthConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
# -------------------------------------------------------------------------
@@ -74,7 +74,7 @@ if __name__ == "__main__":
ConfigFlags.Detector.GeometryITkStrip = True
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/InnerDetector/InDetConfig/python/InDetGeometryConfig.py b/InnerDetector/InDetConfig/python/InDetGeometryConfig.py
index 32943d0ab47..b605f6db47e 100644
--- a/InnerDetector/InDetConfig/python/InDetGeometryConfig.py
+++ b/InnerDetector/InDetConfig/python/InDetGeometryConfig.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
#
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -51,14 +51,13 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
from AthenaConfiguration.TestDefaults import defaultTestFiles
# Provide MC input
- ConfigFlags.Input.Files = defaultTestFiles.HITS
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
- ConfigFlags.GeoModel.Align.Dynamic = False
+ ConfigFlags.GeoModel.Align.Dynamic = False
# Provide data input
- ##from AthenaConfiguration.TestDefaults import defaultTestFiles
- ##ConfigFlags.Input.Files = defaultTestFiles.AOD
- ##ConfigFlags.GeoModel.Align.Dynamic = True
- #
+ # from AthenaConfiguration.TestDefaults import defaultTestFiles
+ # ConfigFlags.Input.Files = defaultTestFiles.AOD
+ # ConfigFlags.GeoModel.Align.Dynamic = True
ConfigFlags.lock()
# Construct ComponentAccumulator
acc = MainServicesCfg(ConfigFlags)
diff --git a/InnerDetector/InDetConfig/python/SiliconPreProcessing.py b/InnerDetector/InDetConfig/python/SiliconPreProcessing.py
index a14f8801437..9f359d8e543 100644
--- a/InnerDetector/InDetConfig/python/SiliconPreProcessing.py
+++ b/InnerDetector/InDetConfig/python/SiliconPreProcessing.py
@@ -231,7 +231,7 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files=defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.InDet.Tracking.doPixelClusterSplitting = True
diff --git a/InnerDetector/InDetConfig/python/TRTExtensionConfig.py b/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
index 212ca304add..1a64f3eab3c 100644
--- a/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
@@ -163,7 +163,7 @@ if __name__ == "__main__":
ConfigFlags.InDet.Tracking.holeSearchInGX2Fit = True
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/InnerDetector/InDetConfig/python/TRTPhaseConfig.py b/InnerDetector/InDetConfig/python/TRTPhaseConfig.py
index 80f3fe0f091..7bbeab01ce8 100644
--- a/InnerDetector/InDetConfig/python/TRTPhaseConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTPhaseConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
import InDetConfig.TrackingCommonConfig as TC
@@ -145,7 +145,7 @@ if __name__ == "__main__":
# TODO: TRT only?
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/InnerDetector/InDetConfig/python/TRTPreProcessing.py b/InnerDetector/InDetConfig/python/TRTPreProcessing.py
index 9de5b5c2b37..a8f872baae0 100644
--- a/InnerDetector/InDetConfig/python/TRTPreProcessing.py
+++ b/InnerDetector/InDetConfig/python/TRTPreProcessing.py
@@ -280,7 +280,7 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files=defaultTestFiles.RDO
+ ConfigFlags.Input.Files=defaultTestFiles.RDO_RUN2
# TODO: TRT only?
diff --git a/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py b/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py
index 25fddb225c0..db23a977a49 100644
--- a/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py
@@ -206,8 +206,7 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- flags.Input.Files=defaultTestFiles.RDO
-
+ flags.Input.Files=defaultTestFiles.RDO_RUN2
numThreads=1
flags.Concurrency.NumThreads=numThreads
diff --git a/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py b/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
index 9838a923382..60adb120378 100644
--- a/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
@@ -194,7 +194,7 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files=defaultTestFiles.RDO
+ ConfigFlags.Input.Files=defaultTestFiles.RDO_RUN2
# TODO: TRT only?
diff --git a/InnerDetector/InDetConfig/python/TrackRecoConfig.py b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
index 963fc15b62d..3f75e0fc397 100644
--- a/InnerDetector/InDetConfig/python/TrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
@@ -534,7 +534,7 @@ if __name__ == "__main__":
ConfigFlags.Detector.EnableCalo = False
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/InnerDetector/InDetConfig/python/TrackTruthConfig.py b/InnerDetector/InDetConfig/python/TrackTruthConfig.py
index f4650b30e4b..68b0981c30c 100644
--- a/InnerDetector/InDetConfig/python/TrackTruthConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackTruthConfig.py
@@ -81,7 +81,7 @@ if __name__ == "__main__":
ConfigFlags.InDet.Tracking.doPixelClusterSplitting = True
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/InnerDetector/InDetConfig/python/VertexFindingConfig.py b/InnerDetector/InDetConfig/python/VertexFindingConfig.py
index aa7e8be6658..58e660f5e5b 100644
--- a/InnerDetector/InDetConfig/python/VertexFindingConfig.py
+++ b/InnerDetector/InDetConfig/python/VertexFindingConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -273,7 +273,7 @@ if __name__ == "__main__":
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
import sys
if 'ActsGaussAdaptiveMultiFinding' in sys.argv:
flags.InDet.PriVertex.setup = "ActsGaussAdaptiveMultiFinding"
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/test/PixelGMConfig_test.py b/InnerDetector/InDetDetDescr/PixelGeoModel/test/PixelGMConfig_test.py
index 9b927f03864..fbc63e0edc2 100755
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/test/PixelGMConfig_test.py
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/test/PixelGMConfig_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests on PixelGeoModel configuration
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
if __name__ == "__main__":
from AthenaCommon.Configurable import Configurable
@@ -9,9 +9,9 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.HITS
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
- ConfigFlags.GeoModel.Align.Dynamic = False
+ ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
if ConfigFlags.Common.Project == "AthSimulation":
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/PixelReadoutGeometryConfig_test.py b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/PixelReadoutGeometryConfig_test.py
index 6eabff9fba6..0f0b7b1d39f 100755
--- a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/PixelReadoutGeometryConfig_test.py
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/PixelReadoutGeometryConfig_test.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.AllConfigFlags import ConfigFlags
-from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
from AthenaCommon.Configurable import Configurable
@@ -10,7 +9,7 @@ from PixelReadoutGeometry.PixelReadoutGeometryConfig import PixelReadoutManagerC
# test setup
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = []
# test
PixelReadoutManagerAcc = PixelReadoutManagerCfg(ConfigFlags, name="PixelReadoutManagerTest")
# prevent raise on __del__
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/test/SCT_GMConfig_test.py b/InnerDetector/InDetDetDescr/SCT_GeoModel/test/SCT_GMConfig_test.py
index d2dab2fc1a5..57ca928f51a 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/test/SCT_GMConfig_test.py
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/test/SCT_GMConfig_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests on SCT_GeoModel configuration
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
if __name__ == "__main__":
from AthenaCommon.Configurable import Configurable
@@ -9,9 +9,9 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.HITS
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
- ConfigFlags.GeoModel.Align.Dynamic = False
+ ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
if ConfigFlags.Common.Project == "AthSimulation":
diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/test/TRT_GMConfig_test.py b/InnerDetector/InDetDetDescr/TRT_GeoModel/test/TRT_GMConfig_test.py
index 606ba3467cd..6a55c9c7973 100755
--- a/InnerDetector/InDetDetDescr/TRT_GeoModel/test/TRT_GMConfig_test.py
+++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/test/TRT_GMConfig_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests on TRT_GeoModel configuration
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
if __name__ == "__main__":
from AthenaCommon.Configurable import Configurable
@@ -9,7 +9,7 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.HITS
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
index 21d92997907..3adfe72789d 100755
--- a/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
@@ -1,10 +1,9 @@
#!/usr/bin/env python
"""Run tests on BCM_DigitizationConfigNew.py
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
import sys
-import os
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
from AthenaCommon.Configurable import Configurable
@@ -18,7 +17,7 @@ from BCM_Digitization.BCM_DigitizationConfigNew import BCM_DigitizationCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py
index 1ecfd86a203..55c699fd44f 100755
--- a/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests on SCT_DigitizationConfigNew.py
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
import sys
from AthenaCommon.Logging import log
@@ -17,7 +17,7 @@ from PixelDigitization.PixelDigitizationConfigNew import PixelDigitizationHSCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.GeoModel.Type = "BrlIncl4.0_ref"
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py
index 86eeb724d99..fde068c11df 100755
--- a/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests on SCT_DigitizationConfigNew.py
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
@@ -16,7 +16,7 @@ from SCT_Digitization.SCT_DigitizationConfigNew import SCT_DigitizationHSCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Concurrency.NumThreads = 1
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py
index b73c321dceb..8eb5d7e8dce 100755
--- a/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests on TRT_DigitizationConfigNew.py
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
import sys
from AthenaCommon.Logging import log
@@ -17,7 +17,7 @@ from TRT_Digitization.TRT_DigitizationConfigNew import TRT_DigitizationHSCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Concurrency.NumThreads = 1
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
index 7badf4e31e2..277dda21f0e 100755
--- a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
+++ b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
@@ -1,5 +1,5 @@
#!/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
##=======================================================================================
## Name: LArCellConditions.py
@@ -111,6 +111,7 @@ except:
sys.argv = sys.argv[:1] + ['-b']
from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ConfigFlags.Input.Files = []
ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.Input.isMC=False
ConfigFlags.Input.RunNumber=run
@@ -119,8 +120,7 @@ ConfigFlags.IOVDb.GlobalTag=tag
ConfigFlags.LAr.doAlign=False
ConfigFlags.Exec.OutputLevel=8
ConfigFlags.lock()
-#from AthenaConfiguration.TestDefaults import defaultTestFiles
-#ConfigFlags.Input.Files = defaultTestFiles.RAW
+
from RootUtils import PyROOTFixes # noqa F401
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
cfg=MainServicesCfg(ConfigFlags)
@@ -151,11 +151,9 @@ theLArCellConditionsAlg=LArCellConditionsAlg("LArCellConditions",
printLocation=geo)
cfg.addEventAlgo(theLArCellConditionsAlg)
-import readline
if os.path.exists( fhistory ):
readline.read_history_file( fhistory )
readline.set_history_length( 128 )
cfg.run(2,OutputLevel=7) #First event is dummy to close DB connections, second has the user-loop
readline.write_history_file(fhistory)
-
diff --git a/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py b/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py
index d6b8bf0375d..f19473e62e6 100644
--- a/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py
@@ -1,6 +1,6 @@
"""ComponentAccumulator configuration utilities for LArRecUtils
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -211,7 +211,7 @@ if __name__ == "__main__":
print ('--- LArOFCCondAlg 1')
flags1 = ConfigFlags.clone()
- flags1.Input.Files = defaultTestFiles.RDO
+ flags1.Input.Files = defaultTestFiles.RDO_RUN2
flags1.lock()
acc1 = LArOFCCondAlgCfg (flags1)
acc1.printCondAlgs(summariseProps=True)
@@ -219,7 +219,7 @@ if __name__ == "__main__":
print ('--- LArAutoCorrTotalCondAlg')
flags4 = ConfigFlags.clone()
- flags4.Input.Files = defaultTestFiles.RDO
+ flags4.Input.Files = defaultTestFiles.RDO_RUN2
flags4.LAr.ROD.nSamples = 32
flags4.lock()
acc4 = LArAutoCorrTotalCondAlgCfg (flags4)
@@ -228,7 +228,7 @@ if __name__ == "__main__":
print ('--- LArRoIMapCondAlg')
flags5 = ConfigFlags.clone()
- flags5.Input.Files = defaultTestFiles.RDO
+ flags5.Input.Files = defaultTestFiles.RDO_RUN2
flags5.lock()
acc5 = LArRoIMapCondAlgCfg (flags5)
acc5.printCondAlgs(summariseProps=True)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
index 8461fa10515..d511bc7ccfb 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -366,9 +366,8 @@ 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
+ 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/test/CSC_DigitizationConfig_test.py b/MuonSpectrometer/MuonConfig/test/CSC_DigitizationConfig_test.py
index 9977d113ef5..a7b62fbe401 100755
--- a/MuonSpectrometer/MuonConfig/test/CSC_DigitizationConfig_test.py
+++ b/MuonSpectrometer/MuonConfig/test/CSC_DigitizationConfig_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests on CSC_DigitizationConfigNew.py
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
import sys
from AthenaCommon.Logging import log
@@ -17,7 +17,7 @@ from MuonConfig.CSC_DigitizationConfig import CSC_DigitBuilderDigitToRDOCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
ConfigFlags.lock()
diff --git a/MuonSpectrometer/MuonConfig/test/MDT_DigitizationConfig_test.py b/MuonSpectrometer/MuonConfig/test/MDT_DigitizationConfig_test.py
index eb565096b38..4a2aa8dcdeb 100755
--- a/MuonSpectrometer/MuonConfig/test/MDT_DigitizationConfig_test.py
+++ b/MuonSpectrometer/MuonConfig/test/MDT_DigitizationConfig_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests on MDT_DigitizationConfigNew.py
-Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
import sys
from AthenaCommon.Logging import log
@@ -17,7 +17,7 @@ from MuonConfig.MDT_DigitizationConfig import MDT_DigitizationCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS_SPECIAL
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
ConfigFlags.lock()
diff --git a/MuonSpectrometer/MuonConfig/test/RPC_DigitizationConfig_test.py b/MuonSpectrometer/MuonConfig/test/RPC_DigitizationConfig_test.py
index cb1fb543862..a441203a7dd 100755
--- a/MuonSpectrometer/MuonConfig/test/RPC_DigitizationConfig_test.py
+++ b/MuonSpectrometer/MuonConfig/test/RPC_DigitizationConfig_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests on RPC_DigitizationConfigNew.py
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
import sys
from AthenaCommon.Logging import log
@@ -17,7 +17,7 @@ from MuonConfig.RPC_DigitizationConfig import RPC_DigitizerDigitToRDOCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
ConfigFlags.lock()
diff --git a/MuonSpectrometer/MuonConfig/test/TGC_DigitizationConfig_test.py b/MuonSpectrometer/MuonConfig/test/TGC_DigitizationConfig_test.py
index 0e93ba52832..51c33ee4afb 100755
--- a/MuonSpectrometer/MuonConfig/test/TGC_DigitizationConfig_test.py
+++ b/MuonSpectrometer/MuonConfig/test/TGC_DigitizationConfig_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests on TGC_DigitizationConfigNew.py
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
import sys
from AthenaCommon.Logging import log
@@ -17,7 +17,7 @@ from MuonConfig.TGC_DigitizationConfig import TGC_DigitizerDigitToRDOCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
ConfigFlags.lock()
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
index 3883de8ea30..b41dbecd92c 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
#
'''
@@ -399,10 +399,6 @@ if __name__=="__main__":
print ("file input.txt does not exist")
print ("WIll use files: \n", file_list)
-
- # from AthenaConfiguration.TestDefaults import defaultTestFiles
- # ConfigFlags.Input.Files = defaultTestFiles.ESD
-
ConfigFlags.Input.Files = file_list
ConfigFlags.Output.HISTFileName = 'RPCMonitoringOutput.root'
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinGeantTruthConfig.py b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinGeantTruthConfig.py
index 7bde9b5ee0e..824630c1d6a 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinGeantTruthConfig.py
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinGeantTruthConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """
Instantiate the TRT Standalone Thinning
@@ -31,7 +31,7 @@ if __name__ == "__main__":
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.Output.doWriteAOD = True # To test the AOD parts
flags.lock()
acc = MainServicesCfg(flags)
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinTRTStandaloneConfig.py b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinTRTStandaloneConfig.py
index af2a82b333a..ff77196f9f1 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinTRTStandaloneConfig.py
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinTRTStandaloneConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """
Instantiate the TRT Standalone Thinning
@@ -37,7 +37,7 @@ if __name__ == "__main__":
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.Output.doWriteAOD = True # To test the AOD parts
flags.lock()
acc = MainServicesCfg(flags)
diff --git a/PhysicsAnalysis/MCTruthClassifier/python/MCTruthClassifierConfig.py b/PhysicsAnalysis/MCTruthClassifier/python/MCTruthClassifierConfig.py
index f6fe8f54e9f..469bd0ffd02 100644
--- a/PhysicsAnalysis/MCTruthClassifier/python/MCTruthClassifierConfig.py
+++ b/PhysicsAnalysis/MCTruthClassifier/python/MCTruthClassifierConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """
Tool configuration to instantiate MCTruthClassifier
@@ -93,7 +93,7 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = 1
ConfigFlags.Input.isMC = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.lock()
mlog = logging.getLogger("MCTruthClassifierConfigTest")
diff --git a/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py b/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py
index 55f19d0b842..8370000c66d 100755
--- a/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py
+++ b/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
log = logging.getLogger("RecoSteering")
@@ -29,7 +29,7 @@ def _run(input):
if input == "ESD":
flags.Input.Files = defaultTestFiles.ESD
if input == "RDO":
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
# Enable PerfMon
flags.PerfMon.doFullMonMT = True
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoDensityConfig.py b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoDensityConfig.py
index 8c50824640f..ebc911c5416 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoDensityConfig.py
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoDensityConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """
Instantiate the electron, photon and muon isolation
@@ -101,7 +101,7 @@ if __name__ == "__main__":
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.Output.doWriteESD = True # To test the ESD parts
flags.Output.doWriteAOD = True # To test the AOD parts
flags.lock()
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationBuilderConfig.py b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationBuilderConfig.py
index 1bff452572d..b9e2108867a 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationBuilderConfig.py
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """
Instantiate the electron or photon isolation
@@ -120,7 +120,7 @@ if __name__ == "__main__":
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.Output.doWriteESD = True # To test the ESD parts
flags.Output.doWriteAOD = True # To test the AOD parts
flags.lock()
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationSteeringConfig.py b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationSteeringConfig.py
index 1db35f39137..d1b12d40fe9 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationSteeringConfig.py
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationSteeringConfig.py
@@ -54,7 +54,7 @@ if __name__ == "__main__":
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.Output.doWriteESD = True # To test the ESD parts
flags.Output.doWriteAOD = True # To test the AOD parts
flags.lock()
diff --git a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilderConfig.py
index d45fd457a71..4d761b7f176 100644
--- a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -135,7 +135,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.lock()
acc = MainServicesCfg(flags)
acc.merge(EMBremCollectionBuilderCfg(flags))
diff --git a/Reconstruction/egamma/egammaAlgs/python/EMVertexBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/EMVertexBuilderConfig.py
index a3fab87ca3c..e5d98fcc6d7 100644
--- a/Reconstruction/egamma/egammaAlgs/python/EMVertexBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/EMVertexBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -32,7 +32,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.lock()
acc = MainServicesCfg(flags)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
index 768a731f7a4..184faf257ba 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from ElectronPhotonSelectorTools.EgammaPIDdefs import egammaPID
from ElectronPhotonSelectorTools.AsgForwardElectronIsEMSelectorsConfig import (
@@ -68,7 +68,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.lock()
acc = MainServicesCfg(flags)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py
index 907222a6e38..ef385692aa8 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """
Instantiate egammaRecBuilder with default configuration
@@ -48,7 +48,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.lock()
acc = MainServicesCfg(flags)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py
index 1c0e42946b4..c92d6e55ae9 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = "Instantiate egammaSelectedTrackCopy with default configuration"
@@ -63,7 +63,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.lock()
acc = MainServicesCfg(flags)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py
index 3cf637d4024..4f3550081b4 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """Instantiate the two supercluster
builders with default configuration"""
@@ -99,7 +99,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.lock()
acc = MainServicesCfg(flags)
acc.merge(electronSuperClusterBuilderCfg(flags))
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py
index ce3d9fa4791..bf464003f49 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = "Instantiate egammaTopoClusterCopier with default configuration"
@@ -46,7 +46,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.lock()
acc = MainServicesCfg(flags)
mlog = logging.getLogger("egammaTopoClusterCopierConfigTest")
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaTruthAssociationConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaTruthAssociationConfig.py
index 406515a9e10..55da494b328 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaTruthAssociationConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaTruthAssociationConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from MCTruthClassifier.MCTruthClassifierConfig import (
MCTruthClassifierCaloTruthMatchCfg)
@@ -60,7 +60,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.lock()
acc = MainServicesCfg(flags)
mlog = logging.getLogger("egammaTruthAssociationConfigTest")
diff --git a/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py
index 0798f102438..ec536acc15c 100644
--- a/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """
Instantiate the two supercluster
@@ -81,7 +81,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.ComponentAccumulator import printProperties
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.lock()
acc = MainServicesCfg(flags)
diff --git a/Reconstruction/egamma/egammaConfig/python/egammaLRTReconstructionConfig.py b/Reconstruction/egamma/egammaConfig/python/egammaLRTReconstructionConfig.py
index 57a3accda50..174d85f83b1 100644
--- a/Reconstruction/egamma/egammaConfig/python/egammaLRTReconstructionConfig.py
+++ b/Reconstruction/egamma/egammaConfig/python/egammaLRTReconstructionConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """
Instantiate the EGamma LRT reconstruction.
@@ -127,7 +127,7 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.Output.doWriteESD = True # To test the ESD parts
flags.Output.doWriteAOD = True # To test the AOD parts
flags.lock()
diff --git a/Reconstruction/egamma/egammaConfig/python/egammaReconstructionConfig.py b/Reconstruction/egamma/egammaConfig/python/egammaReconstructionConfig.py
index a83c9d8ac95..da83156ccf6 100644
--- a/Reconstruction/egamma/egammaConfig/python/egammaReconstructionConfig.py
+++ b/Reconstruction/egamma/egammaConfig/python/egammaReconstructionConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """
Instantiate the EGamma reconstruction.
@@ -86,7 +86,7 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.Output.doWriteESD = True # To test the ESD parts
flags.Output.doWriteAOD = True # To test the AOD parts
flags.lock()
diff --git a/Reconstruction/egamma/egammaConfig/python/egammaSteeringConfig.py b/Reconstruction/egamma/egammaConfig/python/egammaSteeringConfig.py
index d1196290d7c..32abd086b76 100644
--- a/Reconstruction/egamma/egammaConfig/python/egammaSteeringConfig.py
+++ b/Reconstruction/egamma/egammaConfig/python/egammaSteeringConfig.py
@@ -66,7 +66,7 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.Output.doWriteESD = True # To test the ESD parts
flags.Output.doWriteAOD = True # To test the AOD parts
flags.lock()
diff --git a/Reconstruction/egamma/egammaConfig/python/egammaUpstreamConfig.py b/Reconstruction/egamma/egammaConfig/python/egammaUpstreamConfig.py
index 9cd005ef57d..83eaa4f3ad3 100644
--- a/Reconstruction/egamma/egammaConfig/python/egammaUpstreamConfig.py
+++ b/Reconstruction/egamma/egammaConfig/python/egammaUpstreamConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """
Instantiate things needed upstream the main egamma Reconstruction,
@@ -71,7 +71,7 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- flags.Input.Files = defaultTestFiles.RDO
+ flags.Input.Files = defaultTestFiles.RDO_RUN2
flags.lock()
acc = MainServicesCfg(flags)
diff --git a/Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibConfig.py b/Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibConfig.py
index 7672c622100..6546d6fe431 100644
--- a/Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibConfig.py
+++ b/Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -66,7 +66,7 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
diff --git a/Reconstruction/egamma/egammaTools/python/EMClusterToolConfig.py b/Reconstruction/egamma/egammaTools/python/EMClusterToolConfig.py
index a61860d07ac..e7a4aabac15 100644
--- a/Reconstruction/egamma/egammaTools/python/EMClusterToolConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/EMClusterToolConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = "Configuration for EMClusterTool"
@@ -37,7 +37,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
Configurable.configurableRun3Behavior = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/EMConversionBuilderConfig.py b/Reconstruction/egamma/egammaTools/python/EMConversionBuilderConfig.py
index 6d33afdb040..2739c75ec5b 100644
--- a/Reconstruction/egamma/egammaTools/python/EMConversionBuilderConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/EMConversionBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = "Configure Conversion building"
@@ -36,7 +36,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
Configurable.configurableRun3Behavior = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py b/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
index f41eb61208f..2ded996f17d 100755
--- a/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = "Configure the electron and photon selectors."
@@ -103,7 +103,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
Configurable.configurableRun3Behavior = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/EMShowerBuilderConfig.py b/Reconstruction/egamma/egammaTools/python/EMShowerBuilderConfig.py
index 027f1f3f169..b738a27d7e3 100644
--- a/Reconstruction/egamma/egammaTools/python/EMShowerBuilderConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/EMShowerBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = "Configuration for EMShowerBuilder"
@@ -37,7 +37,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
Configurable.configurableRun3Behavior = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/EMTrackMatchBuilderConfig.py b/Reconstruction/egamma/egammaTools/python/EMTrackMatchBuilderConfig.py
index 6d819e4ff0a..555dd081a33 100644
--- a/Reconstruction/egamma/egammaTools/python/EMTrackMatchBuilderConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/EMTrackMatchBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = "Instantiate EMTrackMatchBuilder with default configuration"
@@ -46,7 +46,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
Configurable.configurableRun3Behavior = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/egammaLargeClusterMakerConfig.py b/Reconstruction/egamma/egammaTools/python/egammaLargeClusterMakerConfig.py
index 21abc16ab6c..e416085933d 100644
--- a/Reconstruction/egamma/egammaTools/python/egammaLargeClusterMakerConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/egammaLargeClusterMakerConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """ Configure egammaLargeClusterMaker,
which chooses cells to store in the AOD"""
@@ -31,7 +31,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
Configurable.configurableRun3Behavior = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/egammaOQFlagsBuilderConfig.py b/Reconstruction/egamma/egammaTools/python/egammaOQFlagsBuilderConfig.py
index ba0c718ea31..d1b17b8681b 100644
--- a/Reconstruction/egamma/egammaTools/python/egammaOQFlagsBuilderConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/egammaOQFlagsBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = "Configure e/gamma object quality"
@@ -31,7 +31,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
Configurable.configurableRun3Behavior = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py b/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py
index 047122ad9ea..0a91f12a798 100644
--- a/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = "Configure cluster correction"
@@ -64,7 +64,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
Configurable.configurableRun3Behavior = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTrackTools/python/GSFTrackFitterConfig.py b/Reconstruction/egamma/egammaTrackTools/python/GSFTrackFitterConfig.py
index 5cbac0ec433..c8a30d5f3c0 100644
--- a/Reconstruction/egamma/egammaTrackTools/python/GSFTrackFitterConfig.py
+++ b/Reconstruction/egamma/egammaTrackTools/python/GSFTrackFitterConfig.py
@@ -77,7 +77,7 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTrackTools/python/egammaTrackToolsConfig.py b/Reconstruction/egamma/egammaTrackTools/python/egammaTrackToolsConfig.py
index c0ddf9c685c..78f8a095479 100644
--- a/Reconstruction/egamma/egammaTrackTools/python/egammaTrackToolsConfig.py
+++ b/Reconstruction/egamma/egammaTrackTools/python/egammaTrackToolsConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
__doc__ = """Tool configuration to instantiate all
egammaCaloTools with default configuration"""
@@ -96,7 +96,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
Configurable.configurableRun3Behavior = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/Simulation/Digitization/test/DigitizationConfigNew_test.py b/Simulation/Digitization/test/DigitizationConfigNew_test.py
index 2d38a429be4..30a80a39145 100755
--- a/Simulation/Digitization/test/DigitizationConfigNew_test.py
+++ b/Simulation/Digitization/test/DigitizationConfigNew_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Test various ComponentAccumulator Digitization configuration modules
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
import sys
from AthenaCommon.Logging import log
@@ -16,7 +16,7 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS_SPECIAL
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-25-02"
ConfigFlags.GeoModel.Align.Dynamic = False
diff --git a/Simulation/Digitization/test/DigitizationPUConfigNew_test.py b/Simulation/Digitization/test/DigitizationPUConfigNew_test.py
index 2a2a074ecf0..5328851e95b 100755
--- a/Simulation/Digitization/test/DigitizationPUConfigNew_test.py
+++ b/Simulation/Digitization/test/DigitizationPUConfigNew_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""ComponentAccumulator PileUp (PU) Digitization configuration test
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
import sys
from AthenaCommon.Logging import log
@@ -18,7 +18,7 @@ Configurable.configurableRun3Behavior = True
ConfigFlags.Exec.MaxEvents = 4
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Output.RDOFileName = "mc16d_ttbar.CA.RDO.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-25-02"
@@ -55,12 +55,12 @@ ConfigFlags.Digitization.PU.NumberOfLowPtMinBias = 80.290021063135
# TODO: temporary
ConfigFlags.Digitization.TruthOutput = True
-cols = generateBackgroundInputCollections(ConfigFlags, defaultTestFiles.HITS_MINBIAS_HIGH,
- ConfigFlags.Digitization.PU.NumberOfHighPtMinBias, True)
+cols = generateBackgroundInputCollections(ConfigFlags, defaultTestFiles.HITS_RUN2_MINBIAS_HIGH,
+ ConfigFlags.Digitization.PU.NumberOfHighPtMinBias, True)
ConfigFlags.Digitization.PU.HighPtMinBiasInputCols = cols
-cols = generateBackgroundInputCollections(ConfigFlags, defaultTestFiles.HITS_MINBIAS_LOW,
- ConfigFlags.Digitization.PU.NumberOfLowPtMinBias, True)
+cols = generateBackgroundInputCollections(ConfigFlags, defaultTestFiles.HITS_RUN2_MINBIAS_LOW,
+ ConfigFlags.Digitization.PU.NumberOfLowPtMinBias, True)
ConfigFlags.Digitization.PU.LowPtMinBiasInputCols = cols
setupPileUpFlags(ConfigFlags, 'RunDependentSimData.BunchTrains_MC20_2017', 'RunDependentSimData.PileUpProfile_run300000_MC20d')
diff --git a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py
index 45f786f2670..0504de6724b 100644
--- a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py
+++ b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
#
# File: FastCaloSim/python/AddNoiseCellBuilderTool.py
# Created: Aug 2019, sss
@@ -43,7 +43,7 @@ if __name__ == "__main__":
ConfigFlags.loadAllDynamicFlags()
flags1 = ConfigFlags.clone()
- flags1.Input.Files = defaultTestFiles.RDO
+ flags1.Input.Files = defaultTestFiles.HITS_RUN2
flags1.lock()
acc1 = AddNoiseCellBuilderToolCfg (flags1)
only = ['AddNoiseCellBuilderTool',
diff --git a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py
index 5e6462c6409..9e26c3f3460 100644
--- a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py
+++ b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
#
# File: FastCaloSim/python/AddNoiseCellBuilderTool_test.py
# Author: scott snyder
@@ -175,7 +175,7 @@ Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.Detector.GeometryLAr = True
ConfigFlags.Detector.GeometryTile = True
diff --git a/Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py b/Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py
index 1a78a80af4b..553445fd04c 100644
--- a/Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py
+++ b/Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -123,7 +123,7 @@ if __name__ == "__main__":
log.setLevel(DEBUG)
ConfigFlags.Input.isMC = True
- ConfigFlags.Input.Files = defaultTestFiles.HITS
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Exec.MaxEvents = 3
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py
index 7a8bc56f7ef..16e1d3a3553 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py
@@ -817,7 +817,7 @@ if __name__ == "__main__":
log.setLevel(DEBUG)
ConfigFlags.Input.isMC = True
- ConfigFlags.Input.Files = defaultTestFiles.HITS
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Exec.MaxEvents = 3
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
diff --git a/Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py b/Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py
index 1098e0c970d..45527134e70 100644
--- a/Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py
+++ b/Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Overlay test helpers
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
from argparse import ArgumentParser
@@ -67,8 +67,8 @@ def defaultTestFlags(configFlags, args):
configFlags.IOVDb.DatabaseInstance = "CONDBR2"
configFlags.Overlay.DataOverlay = True
else:
- configFlags.Input.Files = defaultTestFiles.RDO_BKG
- configFlags.Input.SecondaryFiles = defaultTestFiles.HITS
+ configFlags.Input.Files = defaultTestFiles.RDO_BKG_RUN2
+ configFlags.Input.SecondaryFiles = defaultTestFiles.HITS_RUN2
configFlags.Output.RDOFileName = "mcOverlayRDO.pool.root"
configFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-20-01"
configFlags.Overlay.DataOverlay = False
diff --git a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineMC_test.py b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineMC_test.py
index 95c53157f0f..fc60f1cb42a 100644
--- a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineMC_test.py
+++ b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineMC_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run a test on Tile conditions algorithms configuration on MC offline
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
if __name__ == "__main__":
@@ -17,7 +17,7 @@ if __name__ == "__main__":
# test setup
log.setLevel(DEBUG)
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.Tile.RunType = 'PHY'
ConfigFlags.lock()
diff --git a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineMC_test.py b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineMC_test.py
index 7bfe59b7f27..f861894cab2 100644
--- a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineMC_test.py
+++ b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineMC_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run a test on Tile conditions algorithms configuration on MC online
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
if __name__ == "__main__":
@@ -17,7 +17,7 @@ if __name__ == "__main__":
# test setup
log.setLevel(DEBUG)
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.Tile.RunType = 'PHY'
ConfigFlags.Common.isOnline = True
ConfigFlags.lock()
diff --git a/TileCalorimeter/TileSimAlgs/python/TileDigitizationConfig.py b/TileCalorimeter/TileSimAlgs/python/TileDigitizationConfig.py
index 58bb3649a41..7625aa8b53c 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileDigitizationConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileDigitizationConfig.py
@@ -1,6 +1,6 @@
"""Combined Tile Digitization functions
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.Enums import ProductionStep
@@ -77,7 +77,7 @@ if __name__ == "__main__":
# Test setup
log.setLevel(DEBUG)
- ConfigFlags.Input.Files = defaultTestFiles.HITS
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Tile.RunType = 'PHY'
ConfigFlags.Output.RDOFileName = 'myRDO.pool.root'
ConfigFlags.IOVDb.GlobalTag = 'OFLCOND-MC16-SDR-16'
diff --git a/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py b/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py
index b5f3bf64820..cb667e15bf8 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""Define method to construct configured Tile digits maker algorithm"""
@@ -165,7 +165,7 @@ if __name__ == "__main__":
# Test setup
log.setLevel(DEBUG)
- ConfigFlags.Input.Files = defaultTestFiles.HITS
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Tile.RunType = 'PHY'
ConfigFlags.Output.RDOFileName = 'myRDO.pool.root'
ConfigFlags.IOVDb.GlobalTag = 'OFLCOND-MC16-SDR-16'
diff --git a/TileCalorimeter/TileSimAlgs/python/TileHitToTTL1Config.py b/TileCalorimeter/TileSimAlgs/python/TileHitToTTL1Config.py
index e6d10b49d63..d091093fb81 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileHitToTTL1Config.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileHitToTTL1Config.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""Define method to construct configured Tile hits to TTL1 algorithm"""
@@ -148,7 +148,7 @@ if __name__ == "__main__":
# Test setup
log.setLevel(DEBUG)
- ConfigFlags.Input.Files = defaultTestFiles.HITS
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.IOVDb.GlobalTag = 'OFLCOND-MC16-SDR-16'
ConfigFlags.Digitization.PileUp = False
ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
diff --git a/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py b/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py
index a52f5fb4dfa..e70d36b36ab 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""Define method to construct configured private Tile hit vector to container tool"""
@@ -162,7 +162,7 @@ if __name__ == "__main__":
# Test setup
log.setLevel(DEBUG)
- ConfigFlags.Input.Files = defaultTestFiles.HITS
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Output.RDOFileName = 'myRDO.pool.root'
ConfigFlags.IOVDb.GlobalTag = 'OFLCOND-MC16-SDR-16'
ConfigFlags.Digitization.PileUp = False
diff --git a/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py b/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py
index f5959fc20fa..6358e2f4931 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""Define method to construct configured Tile pulse for muon receiver algorithm"""
@@ -138,7 +138,7 @@ if __name__ == "__main__":
# Test setup
log.setLevel(DEBUG)
- ConfigFlags.Input.Files = defaultTestFiles.HITS
+ ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
ConfigFlags.Output.RDOFileName = 'myRDO.pool.root'
ConfigFlags.IOVDb.GlobalTag = 'OFLCOND-MC16-SDR-16'
ConfigFlags.Digitization.PileUp = False
diff --git a/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverDecisionConfig.py b/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverDecisionConfig.py
index e3ec2bf4f25..0d24cdca01c 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverDecisionConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverDecisionConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
"""Define method to construct configured Tile muon receiver decision algorithm"""
@@ -83,7 +83,7 @@ if __name__ == "__main__":
# Test setup
log.setLevel(DEBUG)
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.Tile.RunType = 'PHY'
ConfigFlags.Output.RDOFileName = 'myRDO.pool.root'
ConfigFlags.IOVDb.GlobalTag = 'OFLCOND-MC16-SDR-16'
diff --git a/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py b/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py
index bc0932e052a..1dc48f7361b 100644
--- a/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py
+++ b/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py
@@ -303,7 +303,7 @@ if __name__ == "__main__":
from AthenaCommon.Logging import logging
Configurable.configurableRun3Behavior = True
- ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
ConfigFlags.dump()
--
GitLab