From aca080f85d6be91a369b23f7c9262ed314ec426e Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <frank.winklmeier@cern.ch> Date: Thu, 9 Mar 2023 14:48:57 +0100 Subject: [PATCH] TestDefaults: rename RAW test file to RAW_RUN2 Rename `defaultTestFiles.RAW` into `RAW_RUN2` to make it explicit that this is a Run-2 file. --- .../python/CaloBadChanToolConfig.py | 2 +- Calorimeter/CaloClusterCorrection/test/config_t.py | 2 +- .../CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py | 2 +- .../CaloRec/python/CaloBCIDLumiCondAlgConfig.py | 2 +- .../python/CaloCellContainerAliasAlgConfig.py | 2 +- .../python/CaloThinCellsByClusterAlgConfig.py | 2 +- .../python/CaloThinCellsBySamplingAlgConfig.py | 2 +- Control/AthenaConfiguration/python/TestDefaults.py | 4 ++-- .../test/testAllConfigFlags_TRIG.py | 2 +- .../DataQualityTools/python/DQTDetSynchMonAlg.py | 2 +- .../python/BunchGroupCondAlgConfig.py | 6 +++--- .../python/BunchLumisCondAlgConfig.py | 6 +++--- .../python/FillParamsCondAlgConfig.py | 4 ++-- .../python/OnlineLumiCalibrationCondAlgConfig.py | 2 +- Database/IOVDbSvc/python/IOVDbSvcConfig.py | 2 +- Event/ByteStreamCnvSvc/python/ByteStreamConfig.py | 2 +- Event/EventBookkeeperTools/test/test_CutFlowSvc.py | 2 +- ForwardDetectors/ForwardRec/python/LucidRecConfig.py | 2 +- .../python/PixelConditionsConfig.py | 2 +- .../InDetConfig/python/TrackingPassFlags.py | 2 +- LArCalorimeter/LArCabling/python/LArCablingConfig.py | 2 +- .../LArCafJobs/python/LArReadCellsConfig.py | 2 +- .../LArCafJobs/python/LArShapeDumperConfig.py | 2 +- .../LArByteStream/python/LArRawDataReadingConfig.py | 2 +- .../python/LArRawSCDataReadingConfig.py | 2 +- .../LArConfiguration/python/LArElecCalibDBConfig.py | 4 ++-- .../LArConfiguration/python/LArMonitoringConfig.py | 2 +- .../LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py | 2 +- .../LArMonitoring/python/LArAffectedRegionsAlg.py | 2 +- .../LArMonitoring/python/LArCollisionTimeMonAlg.py | 2 +- .../LArMonitoring/python/LArCosmicsMonAlg.py | 2 +- .../LArMonitoring/python/LArCoverageAlg.py | 2 +- .../LArMonitoring/python/LArDigitMonAlg.py | 2 +- LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py | 2 +- .../python/LArNoiseCorrelationMonAlg.py | 2 +- LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py | 2 +- .../LArMonitoring/python/LArRawChannelMonAlg.py | 2 +- .../LArMonitoring/python/LArReco_fromraw_Cfg.py | 2 +- .../LArROD/python/LArFebErrorSummaryMakerConfig.py | 2 +- .../LArROD/python/LArRawChannelBuilderAlgConfig.py | 2 +- .../LArROD/python/LArRawChannelBuilderCrestConfig.py | 2 +- .../LArRecUtils/python/LArADC2MeVCondAlgConfig.py | 2 +- .../LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py | 2 +- .../LumiBlockComps/python/LBDurationCondAlgConfig.py | 2 +- .../LumiBlockComps/python/LumiBlockMuWriterConfig.py | 2 +- .../LumiBlockComps/python/LuminosityCondAlgConfig.py | 12 ++++++------ .../python/TrigLiveFractionCondAlgConfig.py | 4 ++-- .../python/MagFieldServicesConfig.py | 2 +- .../MuonConfig/python/MuonBytestreamDecodeConfig.py | 2 +- .../MuonConfig/python/MuonCablingConfig.py | 2 +- .../MuonConfig/python/MuonRdoDecodeConfig.py | 2 +- .../MuonConfig/test/MdtRdoToPrepDataTool_test.py | 2 +- .../python/CscMonitoringRAW_Alg.py | 2 +- .../python/AnalysisTriggerAlgsCAConfig.py | 2 +- .../RecJobTransforms/test/RecoSteeringTest.py | 2 +- .../TileCalibAlgs/python/TileCisCalibAlgConfig.py | 2 +- .../python/TileDigiNoiseCalibAlgConfig.py | 2 +- .../python/TileRawChNoiseCalibAlgConfig.py | 2 +- .../python/TileTriggerCalibAlgConfig.py | 2 +- .../python/TileAutoCorrelationConfig.py | 2 +- .../TileConditions/python/TileBadChannelsConfig.py | 2 +- .../TileConditions/python/TileCablingSvcConfig.py | 2 +- .../TileConditions/python/TileCondToolsTestConfig.py | 2 +- .../TileConditions/python/TileDCSConfig.py | 2 +- .../TileConditions/python/TileDSPThresholdConfig.py | 2 +- .../TileConditions/python/TileEMScaleConfig.py | 2 +- .../TileConditions/python/TileInfoLoaderConfig.py | 2 +- .../TileConditions/python/TileIntegratorConfig.py | 2 +- .../TileConditions/python/TileMuIDConfig.py | 2 +- .../TileConditions/python/TileOFCConfig.py | 2 +- .../TileConditions/python/TilePulseShapeConfig.py | 2 +- .../TileConditions/python/TileSampleNoiseConfig.py | 2 +- .../TileConditions/python/TileTMDBConfig.py | 2 +- .../TileConditions/python/TileTimingConfig.py | 2 +- .../test/TileCondToolsTestConfig_OfflineData_test.py | 2 +- .../test/TileCondToolsTestConfig_OnlineData_test.py | 2 +- .../TileConfiguration/python/TileConfigFlags.py | 2 +- TileCalorimeter/TileGeoModel/python/TileGMConfig.py | 2 +- TileCalorimeter/TileL2Algs/python/TileL2Config.py | 2 +- .../TileMonitoring/python/RunTileMonitoring.py | 2 +- .../python/TileDQFragMonitorAlgorithm.py | 2 +- .../python/TileDigiNoiseMonitorAlgorithm.py | 2 +- .../python/TileDigitsFlxMonitorAlgorithm.py | 2 +- .../python/TileDigitsMonitorAlgorithm.py | 2 +- .../TileMonitoring/python/TileRODMonitorAlgorithm.py | 2 +- .../python/TileRawChannelFlxMonitorAlgorithm.py | 2 +- .../python/TileRawChannelMonitorAlgorithm.py | 2 +- .../python/TileTMDBDigitsMonitorAlgorithm.py | 2 +- .../python/TileTMDBMonitorAlgorithm.py | 2 +- .../TileRawUtils/python/RegSelCondAlg_TileConfig.py | 2 +- TileCalorimeter/TileRec/python/TileAANtupleConfig.py | 2 +- .../TileRecAlgs/python/TileDigitsFilterConfig.py | 2 +- .../TileRecUtils/python/TileCellBuilderConfig.py | 2 +- .../TileRecUtils/python/TileCellMakerConfig.py | 2 +- .../TileRecUtils/python/TileCellNoiseFilterConfig.py | 2 +- .../TileRecUtils/python/TileDQstatusConfig.py | 2 +- .../python/TileRawChannelBuilderConfig.py | 2 +- .../python/TileRawChannelBuilderFitConfig.py | 2 +- .../python/TileRawChannelBuilderMFConfig.py | 2 +- .../python/TileRawChannelBuilderOptConfig.py | 2 +- .../python/TileRawChannelBuilderWienerConfig.py | 2 +- .../python/TileRawChannelCorrectionConfig.py | 2 +- .../TileRecUtils/python/TileRawChannelMakerConfig.py | 2 +- .../TileByteStream/python/TileHid2RESrcIDConfig.py | 2 +- .../python/AtlasTrackingGeometryCondAlgConfig.py | 2 +- .../python/AtlasTrackingGeometrySvcConfig.py | 2 +- .../TrigL2MuonSA/python/MdtDataPreparator_test.py | 2 +- .../TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py | 2 +- .../TrigAlgorithms/TrigMinBias/python/MbtsConfig.py | 2 +- .../TrigMinBias/python/MinBiasCountersConfig.py | 2 +- .../python/TrigCaloDataAccessConfig.py | 2 +- .../TrigTauRec/python/TrigTauConfigFlags.py | 2 +- .../TrigTauRec/python/TrigTauRecConfig.py | 2 +- .../python/TrigDecisionToolConfig.py | 2 +- .../TrigConfigSvc/python/TrigConfigSvcCfg.py | 4 ++-- .../TrigNavTools/python/NavConverterConfig.py | 2 +- .../python/L1TopoByteStreamConfig.py | 2 +- .../TrigT1CaloCondSvc/python/L1CaloCondConfig.py | 2 +- .../python/TrigMUCTPIConfigFlags.py | 2 +- .../TrigInDetConfig/python/TrigInDetConfig.py | 2 +- .../TriggerJobOpts/python/TriggerRecoConfig.py | 2 +- .../HLT/CommonSequences/EventBuildingSequences.py | 2 +- .../python/HLT/Config/GenerateMenuMT_newJO.py | 2 +- .../python/HLT/Egamma/TrigEgammaConfigFlags.py | 2 +- .../TriggerMenuMT/python/HLT/Tau/generateTau.py | 2 +- .../TriggerMenuMT/scripts/test_menu_CA.py | 2 +- 126 files changed, 140 insertions(+), 140 deletions(-) diff --git a/Calorimeter/CaloBadChannelTool/python/CaloBadChanToolConfig.py b/Calorimeter/CaloBadChannelTool/python/CaloBadChanToolConfig.py index d737af83830..451951fc6ad 100644 --- a/Calorimeter/CaloBadChannelTool/python/CaloBadChanToolConfig.py +++ b/Calorimeter/CaloBadChannelTool/python/CaloBadChanToolConfig.py @@ -40,7 +40,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.fillFromArgs() flags.lock() diff --git a/Calorimeter/CaloClusterCorrection/test/config_t.py b/Calorimeter/CaloClusterCorrection/test/config_t.py index 205c1fa330f..0ec006266d2 100644 --- a/Calorimeter/CaloClusterCorrection/test/config_t.py +++ b/Calorimeter/CaloClusterCorrection/test/config_t.py @@ -1082,7 +1082,7 @@ from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() -flags.Input.Files = defaultTestFiles.RAW +flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-05" test1 (flags) diff --git a/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py b/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py index 05b475d9b11..3b34ae0385c 100644 --- a/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py +++ b/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py @@ -75,7 +75,7 @@ if __name__ == "__main__": print ('--- data') flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = CaloBCIDCoeffsCondAlgCfg (flags1) acc1.printConfig(summariseProps=True, onlyComponents=only) diff --git a/Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py b/Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py index 2d09ec5b988..22a46f0440b 100644 --- a/Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py +++ b/Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py @@ -46,7 +46,7 @@ if __name__ == "__main__": print ('--- data') flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = CaloBCIDLumiCondAlgCfg (flags1) acc1.printConfig(summariseProps=True, onlyComponents=only) diff --git a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py index a8f687190bc..ea5dace533e 100644 --- a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py +++ b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py @@ -27,7 +27,7 @@ if __name__ == "__main__": only = ['CaloCellContainerAliasAlg_myalias'] flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = CaloCellContainerAliasAlgCfg (flags1, 'myalias') acc1.printConfig(summariseProps=True, onlyComponents=only) diff --git a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py index fc3a3691446..a65c85100d9 100644 --- a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py +++ b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py @@ -30,7 +30,7 @@ if __name__ == "__main__": only = ['CaloThinCellsByClusterAlg_myclusters'] flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = CaloThinCellsByClusterAlgCfg(flags1, 'StreamAOD', 'myclusters', ['TileGap3']) diff --git a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py index 7dddd532ed3..afb81a69adf 100644 --- a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py +++ b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py @@ -36,7 +36,7 @@ if __name__ == "__main__": only = ['CaloThinCellsBySamplingAlg_TileGap3'] flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = CaloThinCellsBySamplingAlgCfg (flags1, 'StreamAOD', ['TileGap3']) diff --git a/Control/AthenaConfiguration/python/TestDefaults.py b/Control/AthenaConfiguration/python/TestDefaults.py index 59642781f47..97301d727f6 100644 --- a/Control/AthenaConfiguration/python/TestDefaults.py +++ b/Control/AthenaConfiguration/python/TestDefaults.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration # Files for use in configuration unit tests class defaultTestFiles: @@ -20,8 +20,8 @@ class defaultTestFiles: f"{d}/Tier0ChainTests/mc16_13TeV.900311.Epos_minbias_inelastic_lowjetphoton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106626._000574.pool.root.1", ] HITS_DATA_OVERLAY = [f"{d}/OverlayTests/DataOverlaySimulation/22.0/v1/mc16_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.HITS.pool.root"] - RAW = [f"{d}/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"] RAW_RUN1 = [f"{d}/Tier0ChainTests/data12_8TeV.00209109.physics_JetTauEtmiss.merge.RAW._lb0186._SFO-1._0001.1"] + RAW_RUN2 = [f"{d}/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"] RAW_RUN3 = [f"{d}/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00431493.physics_Main.daq.RAW._lb0525._SFO-16._0001.data"] RAW_BKG = [f"{d}/OverlayTests/mc15_valid.00200010.overlay_streamsAll_2016_pp_1.skim.DRAW.r8381/DRAW.09331084._000146.pool.root.1"] RDO_RUN2 = [f"{d}/CampaignInputs/mc20/RDO/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.recon.AOD.e6337_s3681_r13145/100events.RDO.pool.root"] diff --git a/Control/AthenaConfiguration/test/testAllConfigFlags_TRIG.py b/Control/AthenaConfiguration/test/testAllConfigFlags_TRIG.py index c8675893ccd..9293a80ccc2 100755 --- a/Control/AthenaConfiguration/test/testAllConfigFlags_TRIG.py +++ b/Control/AthenaConfiguration/test/testAllConfigFlags_TRIG.py @@ -18,7 +18,7 @@ class Test(unittest.TestCase): def test_data(self): """For data, trigger always uses dedicated tags.""" - self.flags.Input.Files = defaultTestFiles.RAW + self.flags.Input.Files = defaultTestFiles.RAW_RUN2 self.assertEqual(self.flags.GeoModel.AtlasVersion, trigGeoTag(self.flags)) self.assertEqual(self.flags.IOVDb.GlobalTag, trigGlobalTag(self.flags)) diff --git a/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py b/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py index 9a3c9c58c4b..7bd6a18e369 100644 --- a/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py +++ b/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py @@ -160,7 +160,7 @@ if __name__ == '__main__': from AthenaConfiguration.AllConfigFlags import ConfigFlags nightly = '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/' file = 'data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1' - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 #ConfigFlags.Input.isMC = False ConfigFlags.Output.HISTFileName = 'ExampleMonitorOutput.root' diff --git a/Database/CoolLumiUtilities/python/BunchGroupCondAlgConfig.py b/Database/CoolLumiUtilities/python/BunchGroupCondAlgConfig.py index 0d5b37b077f..f4c414b3614 100644 --- a/Database/CoolLumiUtilities/python/BunchGroupCondAlgConfig.py +++ b/Database/CoolLumiUtilities/python/BunchGroupCondAlgConfig.py @@ -36,12 +36,12 @@ if __name__ == "__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() print ('--- data') flags1 = flags.clone() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.Input.ProjectName = 'data12_8TeV' flags1.lock() acc1 = BunchGroupCondAlgCfg (flags1) @@ -51,7 +51,7 @@ if __name__ == "__main__": print ('--- default') flags2 = flags.clone() - flags2.Input.Files = defaultTestFiles.RAW + flags2.Input.Files = defaultTestFiles.RAW_RUN2 flags2.lock() acc2 = BunchGroupCondAlgCfg (flags2) acc2.printCondAlgs(summariseProps=True) diff --git a/Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py b/Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py index c02f03b4198..8a632d8596b 100644 --- a/Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py +++ b/Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py @@ -48,7 +48,7 @@ if __name__ == "__main__": print ('--- data') flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.Input.ProjectName = 'data12_8TeV' flags1.lock() acc1 = BunchLumisCondAlgCfg (flags1) @@ -58,7 +58,7 @@ if __name__ == "__main__": print ('--- data+overlay') flags2 = initConfigFlags() - flags2.Input.Files = defaultTestFiles.RAW + flags2.Input.Files = defaultTestFiles.RAW_RUN2 flags2.Input.ProjectName = 'data12_8TeV' flags2.Common.ProductionStep = ProductionStep.Overlay flags2.lock() @@ -69,7 +69,7 @@ if __name__ == "__main__": print ('--- default') flags3 = initConfigFlags() - flags3.Input.Files = defaultTestFiles.RAW + flags3.Input.Files = defaultTestFiles.RAW_RUN2 flags3.lock() acc3 = BunchLumisCondAlgCfg (flags3) acc3.printCondAlgs(summariseProps=True) diff --git a/Database/CoolLumiUtilities/python/FillParamsCondAlgConfig.py b/Database/CoolLumiUtilities/python/FillParamsCondAlgConfig.py index f3cb847dd3d..a39656e7626 100644 --- a/Database/CoolLumiUtilities/python/FillParamsCondAlgConfig.py +++ b/Database/CoolLumiUtilities/python/FillParamsCondAlgConfig.py @@ -37,7 +37,7 @@ if __name__ == "__main__": print ('--- data') flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.Input.ProjectName = 'data12_8TeV' flags1.lock() acc1 = FillParamsCondAlgCfg (flags1) @@ -47,7 +47,7 @@ if __name__ == "__main__": print ('--- default') flags2 = initConfigFlags() - flags2.Input.Files = defaultTestFiles.RAW + flags2.Input.Files = defaultTestFiles.RAW_RUN2 flags2.lock() acc2 = FillParamsCondAlgCfg (flags2) acc2.printCondAlgs(summariseProps=True) diff --git a/Database/CoolLumiUtilities/python/OnlineLumiCalibrationCondAlgConfig.py b/Database/CoolLumiUtilities/python/OnlineLumiCalibrationCondAlgConfig.py index 21fe128d4fb..4569406a58a 100644 --- a/Database/CoolLumiUtilities/python/OnlineLumiCalibrationCondAlgConfig.py +++ b/Database/CoolLumiUtilities/python/OnlineLumiCalibrationCondAlgConfig.py @@ -37,7 +37,7 @@ if __name__ == "__main__": print ('--- data') flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = OnlineLumiCalibrationCondAlgCfg (flags1) acc1.printCondAlgs(summariseProps=True) diff --git a/Database/IOVDbSvc/python/IOVDbSvcConfig.py b/Database/IOVDbSvc/python/IOVDbSvcConfig.py index d97a94f863e..202cab8b805 100644 --- a/Database/IOVDbSvc/python/IOVDbSvcConfig.py +++ b/Database/IOVDbSvc/python/IOVDbSvcConfig.py @@ -257,7 +257,7 @@ if __name__ == '__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = IOVDbSvcCfg(flags) diff --git a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py index f3e0cee5f37..9316518af0a 100644 --- a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py +++ b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py @@ -237,7 +237,7 @@ if __name__ == "__main__": log = logging.getLogger('ByteStreamConfig') flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Output.doWriteBS = True flags.lock() diff --git a/Event/EventBookkeeperTools/test/test_CutFlowSvc.py b/Event/EventBookkeeperTools/test/test_CutFlowSvc.py index c2cef89bf09..b9f328a2fda 100755 --- a/Event/EventBookkeeperTools/test/test_CutFlowSvc.py +++ b/Event/EventBookkeeperTools/test/test_CutFlowSvc.py @@ -33,7 +33,7 @@ flags = initConfigFlags() if args.input: flags.Input.Files = [args.input] elif args.data: - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 else: flags.Input.Files = defaultTestFiles.AOD_RUN2_MC diff --git a/ForwardDetectors/ForwardRec/python/LucidRecConfig.py b/ForwardDetectors/ForwardRec/python/LucidRecConfig.py index d4acf9581fa..d4241e7bdc2 100644 --- a/ForwardDetectors/ForwardRec/python/LucidRecConfig.py +++ b/ForwardDetectors/ForwardRec/python/LucidRecConfig.py @@ -30,7 +30,7 @@ if __name__=="__main__": from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = MainServicesCfg(flags) diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py index 6236cb41a70..3f45b38e570 100644 --- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py +++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py @@ -423,7 +423,7 @@ if __name__ == '__main__': flags.fillFromArgs() from AthenaConfiguration.TestDefaults import defaultTestFiles - flags.Input.Files = defaultTestFiles.RAW # need to update this depending on EDMversion + flags.Input.Files = defaultTestFiles.RAW_RUN2 # need to update this depending on EDMversion flags.Exec.MaxEvents=5 flags.lock() diff --git a/InnerDetector/InDetConfig/python/TrackingPassFlags.py b/InnerDetector/InDetConfig/python/TrackingPassFlags.py index edeefd975df..de406604f34 100644 --- a/InnerDetector/InDetConfig/python/TrackingPassFlags.py +++ b/InnerDetector/InDetConfig/python/TrackingPassFlags.py @@ -1085,7 +1085,7 @@ if __name__ == "__main__": flags = initConfigFlags() from AthenaConfiguration.TestDefaults import defaultTestFiles - flags.Input.Files=defaultTestFiles.RAW + flags.Input.Files=defaultTestFiles.RAW_RUN2 from AthenaCommon.Logging import logging l = logging.getLogger('TrackingPassFlags') diff --git a/LArCalorimeter/LArCabling/python/LArCablingConfig.py b/LArCalorimeter/LArCabling/python/LArCablingConfig.py index 2b31546b536..c30ab34e4e0 100644 --- a/LArCalorimeter/LArCabling/python/LArCablingConfig.py +++ b/LArCalorimeter/LArCabling/python/LArCablingConfig.py @@ -107,7 +107,7 @@ if __name__ == "__main__": from AthenaConfiguration.TestDefaults import defaultTestFiles flags=initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = LArOnOffIdMappingCfg( flags ) diff --git a/LArCalorimeter/LArCafJobs/python/LArReadCellsConfig.py b/LArCalorimeter/LArCafJobs/python/LArReadCellsConfig.py index f7e017116e3..9bd2e75a873 100644 --- a/LArCalorimeter/LArCafJobs/python/LArReadCellsConfig.py +++ b/LArCalorimeter/LArCafJobs/python/LArReadCellsConfig.py @@ -47,7 +47,7 @@ if __name__=="__main__": addShapeDumpFlags(flags) from AthenaConfiguration.TestDefaults import defaultTestFiles - flags.Input.Files=defaultTestFiles.RAW + flags.Input.Files=defaultTestFiles.RAW_RUN2 flags.LAr.ROD.forceIter=True flags.LArShapeDump.outputNtup="SPLASH" flags.lock() diff --git a/LArCalorimeter/LArCafJobs/python/LArShapeDumperConfig.py b/LArCalorimeter/LArCafJobs/python/LArShapeDumperConfig.py index 9b22c405769..4afcadea5db 100644 --- a/LArCalorimeter/LArCafJobs/python/LArShapeDumperConfig.py +++ b/LArCalorimeter/LArCafJobs/python/LArShapeDumperConfig.py @@ -98,7 +98,7 @@ if __name__=="__main__": addShapeDumpFlags(flags) from AthenaConfiguration.TestDefaults import defaultTestFiles - flags.Input.Files=defaultTestFiles.RAW + flags.Input.Files=defaultTestFiles.RAW_RUN2 flags.LAr.ROD.forceIter=True flags.lock() diff --git a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py index ef5bcaf3fee..660aa9ab5e2 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py +++ b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py @@ -36,7 +36,7 @@ if __name__=="__main__": from AthenaConfiguration.TestDefaults import defaultTestFiles flags.LAr.doAlign=False flags.Exec.OutputLevel=DEBUG - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = MainServicesCfg( flags ) diff --git a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawSCDataReadingConfig.py b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawSCDataReadingConfig.py index 2956fc72c8e..d48d0c67b55 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawSCDataReadingConfig.py +++ b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawSCDataReadingConfig.py @@ -31,7 +31,7 @@ if __name__=="__main__": from AthenaConfiguration.TestDefaults import defaultTestFiles flags.LAr.doAlign=False flags.Exec.OutputLevel=DEBUG - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = MainServicesCfg( flags ) diff --git a/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py b/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py index e80cf61a2c4..e65d6b2fe15 100644 --- a/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py +++ b/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py @@ -258,7 +258,7 @@ if __name__ == "__main__": print ('--- run2') flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = LArElecCalibDbCfg (flags1, ['Ramp', 'Pedestal']) acc1.printCondAlgs(summariseProps=True) @@ -267,7 +267,7 @@ if __name__ == "__main__": print ('--- run1') flags2 = initConfigFlags() - flags2.Input.Files = defaultTestFiles.RAW + flags2.Input.Files = defaultTestFiles.RAW_RUN2 from AthenaConfiguration.Enums import LHCPeriod flags2.GeoModel.Run=LHCPeriod.Run1 flags2.lock() diff --git a/LArCalorimeter/LArConfiguration/python/LArMonitoringConfig.py b/LArCalorimeter/LArConfiguration/python/LArMonitoringConfig.py index 0824273e555..a318141f21e 100644 --- a/LArCalorimeter/LArConfiguration/python/LArMonitoringConfig.py +++ b/LArCalorimeter/LArConfiguration/python/LArMonitoringConfig.py @@ -56,7 +56,7 @@ if __name__=='__main__': from AthenaConfiguration.TestDefaults import defaultTestFiles - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Output.HISTFileName = 'LArMonitoringOutput.root' flags.DQ.enableLumiAccess = True diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py index b637d90f119..6e20d89db60 100644 --- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py +++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py @@ -79,7 +79,7 @@ if __name__ == "__main__": from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.lock() acc = LArGMCfg(ConfigFlags) diff --git a/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py b/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py index c973283d9dd..67d83489331 100644 --- a/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py +++ b/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py @@ -384,7 +384,7 @@ if __name__=='__main__': createLArMonConfigFlags() from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.Output.HISTFileName = 'LArAffectedRegionsOutput.root' ConfigFlags.DQ.enableLumiAccess = False diff --git a/LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py index 5fd257a9351..1b60ee03b36 100644 --- a/LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py +++ b/LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py @@ -257,7 +257,7 @@ if __name__=='__main__': from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.DQ.enableLumiAccess = False #copied from LArRecoFromRaw flags.DQ.useTrigger = False #copied from LArRecoFromRaw flags.Output.HISTFileName = 'LArCollTimeMonitoringOutput.root' diff --git a/LArCalorimeter/LArMonitoring/python/LArCosmicsMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArCosmicsMonAlg.py index e12bbda6d59..1d4f2c4e058 100644 --- a/LArCalorimeter/LArMonitoring/python/LArCosmicsMonAlg.py +++ b/LArCalorimeter/LArMonitoring/python/LArCosmicsMonAlg.py @@ -91,7 +91,7 @@ if __name__=='__main__': createLArMonConfigFlags() from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.Output.HISTFileName = 'LArCosmicsMonOutput.root' ConfigFlags.DQ.enableLumiAccess = False diff --git a/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py b/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py index d034ba1290d..07c434b66b7 100644 --- a/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py +++ b/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py @@ -511,7 +511,7 @@ if __name__=='__main__': createLArMonConfigFlags() from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.DQ.useTrigger = False ConfigFlags.Output.HISTFileName = 'LArCoverageOutput.root' diff --git a/LArCalorimeter/LArMonitoring/python/LArDigitMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArDigitMonAlg.py index 75f547126a7..3208ae9b473 100644 --- a/LArCalorimeter/LArMonitoring/python/LArDigitMonAlg.py +++ b/LArCalorimeter/LArMonitoring/python/LArDigitMonAlg.py @@ -202,7 +202,7 @@ if __name__=='__main__': createLArMonConfigFlags() from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.Output.HISTFileName = 'LArDigitsMonOutput.root' ConfigFlags.DQ.enableLumiAccess = False diff --git a/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py index bd3efd8a4e3..a37d83887d9 100644 --- a/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py +++ b/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py @@ -430,7 +430,7 @@ if __name__=='__main__': createLArMonConfigFlags() from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.Output.HISTFileName = 'LArFEBMonOutput.root' ConfigFlags.DQ.enableLumiAccess = True diff --git a/LArCalorimeter/LArMonitoring/python/LArNoiseCorrelationMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArNoiseCorrelationMonAlg.py index 4fe34b118a7..073a64f5fe6 100644 --- a/LArCalorimeter/LArMonitoring/python/LArNoiseCorrelationMonAlg.py +++ b/LArCalorimeter/LArMonitoring/python/LArNoiseCorrelationMonAlg.py @@ -207,7 +207,7 @@ if __name__=='__main__': createLArMonConfigFlags() from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.Output.HISTFileName = 'LArNoiseCorrMonOutput.root' ConfigFlags.DQ.enableLumiAccess = False diff --git a/LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py index 4e51f4e7d33..e777c778ea3 100644 --- a/LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py +++ b/LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py @@ -231,7 +231,7 @@ if __name__=='__main__': createLArMonConfigFlags() from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.Output.HISTFileName = 'LArRODMonOutput.root' ConfigFlags.DQ.enableLumiAccess = False diff --git a/LArCalorimeter/LArMonitoring/python/LArRawChannelMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArRawChannelMonAlg.py index ace2402f101..238065e6793 100644 --- a/LArCalorimeter/LArMonitoring/python/LArRawChannelMonAlg.py +++ b/LArCalorimeter/LArMonitoring/python/LArRawChannelMonAlg.py @@ -334,7 +334,7 @@ if __name__=='__main__': from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.Enums import BeamType - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.Output.HISTFileName = 'LArRawChannelMonOutput.root' ConfigFlags.DQ.enableLumiAccess = False ConfigFlags.DQ.useTrigger = False diff --git a/LArCalorimeter/LArMonitoring/python/LArReco_fromraw_Cfg.py b/LArCalorimeter/LArMonitoring/python/LArReco_fromraw_Cfg.py index 4b6b494e3eb..93075ee91eb 100644 --- a/LArCalorimeter/LArMonitoring/python/LArReco_fromraw_Cfg.py +++ b/LArCalorimeter/LArMonitoring/python/LArReco_fromraw_Cfg.py @@ -12,7 +12,7 @@ if __name__=="__main__": createLArMonConfigFlags() from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.Output.HISTFileName = 'LArMonitoringOutput.root' ConfigFlags.DQ.enableLumiAccess = False diff --git a/LArCalorimeter/LArROD/python/LArFebErrorSummaryMakerConfig.py b/LArCalorimeter/LArROD/python/LArFebErrorSummaryMakerConfig.py index 6fafba9788e..67377e7c103 100644 --- a/LArCalorimeter/LArROD/python/LArFebErrorSummaryMakerConfig.py +++ b/LArCalorimeter/LArROD/python/LArFebErrorSummaryMakerConfig.py @@ -65,7 +65,7 @@ if __name__=="__main__": log.setLevel(DEBUG) from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.lock() diff --git a/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py b/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py index 773b1eebc9a..7d3ba441051 100644 --- a/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py +++ b/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py @@ -92,7 +92,7 @@ if __name__=="__main__": log.setLevel(DEBUG) from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 # in case of testing iterative OFC: #ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_1beam/data15_1beam.00260466.physics_L1Calo.merge.RAW._lb1380._SFO-ALL._0001.1'] ConfigFlags.Input.isMC = False diff --git a/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py b/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py index 309e6f862b0..29bd2ded7b5 100644 --- a/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py +++ b/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py @@ -92,7 +92,7 @@ if __name__=="__main__": log.setLevel(DEBUG) from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 # in case of testing iterative OFC: #ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_1beam/data15_1beam.00260466.physics_L1Calo.merge.RAW._lb1380._SFO-ALL._0001.1'] ConfigFlags.Input.isMC = False diff --git a/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py b/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py index 4498f31bf1d..7f28a9d2ec4 100644 --- a/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py +++ b/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py @@ -45,7 +45,7 @@ if __name__ == "__main__": print ('--- data') flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = LArADC2MeVCondAlgCfg (flags1) acc1.printCondAlgs(summariseProps=True) diff --git a/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py b/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py index f726290082e..b74128f9fc3 100644 --- a/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py +++ b/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py @@ -45,7 +45,7 @@ if __name__ == "__main__": print ('--- data') flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = LArADC2MeVSCCondAlgCfg (flags1) acc1.printCondAlgs(summariseProps=True) diff --git a/LumiBlock/LumiBlockComps/python/LBDurationCondAlgConfig.py b/LumiBlock/LumiBlockComps/python/LBDurationCondAlgConfig.py index b8b2398e352..a51309559cc 100644 --- a/LumiBlock/LumiBlockComps/python/LBDurationCondAlgConfig.py +++ b/LumiBlock/LumiBlockComps/python/LBDurationCondAlgConfig.py @@ -32,7 +32,7 @@ if __name__ == "__main__": print ('--- data') flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = LBDurationCondAlgCfg (flags1) acc1.printCondAlgs(summariseProps=True) diff --git a/LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py b/LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py index 92244cfec40..e8e19cc26cf 100644 --- a/LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py +++ b/LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py @@ -38,7 +38,7 @@ if __name__ == "__main__": print ('--- collisions') flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = LumiBlockMuWriterCfg (flags1) acc1.printCondAlgs (summariseProps=True) diff --git a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py index 295bcfe9e00..f65b449f680 100644 --- a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py +++ b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py @@ -200,7 +200,7 @@ if __name__ == "__main__": print ('--- run2') flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = LuminosityCondAlgCfg (flags1) acc1.printCondAlgs(summariseProps=True) @@ -209,7 +209,7 @@ if __name__ == "__main__": print ('--- run2/express') flags2 = initConfigFlags() - flags2.Input.Files = defaultTestFiles.RAW + flags2.Input.Files = defaultTestFiles.RAW_RUN2 flags2.Common.doExpressProcessing = True flags2.lock() acc2 = LuminosityCondAlgCfg (flags2) @@ -219,7 +219,7 @@ if __name__ == "__main__": print ('--- run1') flags3 = initConfigFlags() - flags3.Input.Files = defaultTestFiles.RAW + flags3.Input.Files = defaultTestFiles.RAW_RUN2 flags3.Input.ProjectName = 'data12_8TeV' flags3.lock() acc3 = LuminosityCondAlgCfg (flags3) @@ -229,7 +229,7 @@ if __name__ == "__main__": print ('--- run1/express') flags4 = initConfigFlags() - flags4.Input.Files = defaultTestFiles.RAW + flags4.Input.Files = defaultTestFiles.RAW_RUN2 flags4.Input.ProjectName = 'data12_8TeV' flags4.Common.doExpressProcessing = True flags4.lock() @@ -248,7 +248,7 @@ if __name__ == "__main__": print ('--- online') flags6 = initConfigFlags() - flags6.Input.Files = defaultTestFiles.RAW + flags6.Input.Files = defaultTestFiles.RAW_RUN2 flags6.Common.useOnlineLumi = True flags6.lock() acc6 = LuminosityCondAlgCfg (flags6) @@ -257,7 +257,7 @@ if __name__ == "__main__": print ('--- forced online') flags7 = initConfigFlags() - flags7.Input.Files = defaultTestFiles.RAW + flags7.Input.Files = defaultTestFiles.RAW_RUN2 flags7.lock() acc7 = LuminosityCondAlgCfg (flags7, useOnlineLumi=True, suffix='Online') acc7.printCondAlgs(summariseProps=True) diff --git a/LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py b/LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py index 1191c1c8234..c923651fc0b 100644 --- a/LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py +++ b/LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py @@ -48,7 +48,7 @@ if __name__ == "__main__": print ('--- run2') flags1 = initConfigFlags() - flags1.Input.Files = defaultTestFiles.RAW + flags1.Input.Files = defaultTestFiles.RAW_RUN2 flags1.lock() acc1 = TrigLiveFractionCondAlgCfg (flags1) acc1.printCondAlgs(summariseProps=True) @@ -56,7 +56,7 @@ if __name__ == "__main__": print ('--- run1') flags3 = initConfigFlags() - flags3.Input.Files = defaultTestFiles.RAW + flags3.Input.Files = defaultTestFiles.RAW_RUN2 flags3.Input.ProjectName = 'data12_8TeV' flags3.lock() acc3 = TrigLiveFractionCondAlgCfg (flags3) diff --git a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py index 7601160a5e1..781c9ef2622 100644 --- a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py +++ b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py @@ -78,7 +78,7 @@ if __name__=="__main__": log.setLevel(VERBOSE) from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Input.isMC = False flags.lock() diff --git a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py index 3b0af41099f..e9076c1c217 100644 --- a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py +++ b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py @@ -377,7 +377,7 @@ if __name__=="__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 # Set global tag by hand for now flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-13"#"CONDBR2-BLKPA-2015-17" flags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"#"ATLAS-R2-2015-03-01-00" diff --git a/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py index e0ac3692347..ca87d6644d0 100644 --- a/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py +++ b/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py @@ -160,7 +160,7 @@ if __name__ == '__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = ComponentAccumulator() diff --git a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py index 6d1a78d608a..eaf7432218e 100644 --- a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py +++ b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py @@ -348,7 +348,7 @@ def muonRdoDecodeTestData( forTrigger = False ): from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 # Set global tag by hand for now flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-13"#"CONDBR2-BLKPA-2015-17" diff --git a/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py b/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py index 5a0125fe0f5..cf9075c0974 100644 --- a/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py +++ b/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py @@ -55,7 +55,7 @@ from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() -flags.Input.Files = defaultTestFiles.RAW +flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() from AthenaConfiguration.MainServicesConfig import MainServicesCfg acc=MainServicesCfg(flags) diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitoringRAW_Alg.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitoringRAW_Alg.py index 7e27c5a8b08..a6df7f647f4 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitoringRAW_Alg.py +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitoringRAW_Alg.py @@ -143,7 +143,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Output.HISTFileName = 'CscRDOMonitorOutput.root' flags.Detector.GeometryMuon=False diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsCAConfig.py b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsCAConfig.py index 9a14b75453d..4b0a6bc37ec 100644 --- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsCAConfig.py +++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsCAConfig.py @@ -69,7 +69,7 @@ if __name__ == "__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Exec.MaxEvents = 20 flags.fillFromArgs() flags.lock() diff --git a/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py b/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py index dd3c91784a2..a2dea7e74eb 100755 --- a/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py +++ b/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py @@ -24,7 +24,7 @@ def _run(input): from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.Enums import ProductionStep if input == "RAW": - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Common.ProductionStep=ProductionStep.Reconstruction if input == "ESD": flags.Input.Files = defaultTestFiles.ESD diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileCisCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileCisCalibAlgConfig.py index e9144017d7e..6ef7273a488 100644 --- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileCisCalibAlgConfig.py +++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileCisCalibAlgConfig.py @@ -70,7 +70,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.doFit = True flags.Exec.MaxEvents = 3 flags.Tile.RunType = 'CIS' diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileDigiNoiseCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileDigiNoiseCalibAlgConfig.py index e76a6e59c56..54bddcc1343 100644 --- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileDigiNoiseCalibAlgConfig.py +++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileDigiNoiseCalibAlgConfig.py @@ -44,7 +44,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Exec.MaxEvents = 3 flags.fillFromArgs() flags.lock() diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileRawChNoiseCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileRawChNoiseCalibAlgConfig.py index d7773fbd75e..b89fb0db514 100644 --- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileRawChNoiseCalibAlgConfig.py +++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileRawChNoiseCalibAlgConfig.py @@ -57,7 +57,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Exec.MaxEvents = 3 flags.fillFromArgs() flags.lock() diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileTriggerCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileTriggerCalibAlgConfig.py index d3c69c2d1aa..75fe2a9d37e 100644 --- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileTriggerCalibAlgConfig.py +++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileTriggerCalibAlgConfig.py @@ -81,7 +81,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.doFit = True flags.Exec.MaxEvents = 3 flags.Tile.RunType = 'CIS' diff --git a/TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py b/TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py index 5e5f9405d33..564b7520147 100644 --- a/TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py +++ b/TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py @@ -96,7 +96,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = ComponentAccumulator() diff --git a/TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py b/TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py index 24ec09a2b1b..a8093465766 100644 --- a/TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py +++ b/TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py @@ -113,7 +113,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = ComponentAccumulator() diff --git a/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py b/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py index 186ecd5ee60..0eb3203e59d 100644 --- a/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py +++ b/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py @@ -84,7 +84,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = ComponentAccumulator() diff --git a/TileCalorimeter/TileConditions/python/TileCondToolsTestConfig.py b/TileCalorimeter/TileConditions/python/TileCondToolsTestConfig.py index c36d6a09ead..d9d22a6ca9f 100644 --- a/TileCalorimeter/TileConditions/python/TileCondToolsTestConfig.py +++ b/TileCalorimeter/TileConditions/python/TileCondToolsTestConfig.py @@ -102,7 +102,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = ComponentAccumulator() diff --git a/TileCalorimeter/TileConditions/python/TileDCSConfig.py b/TileCalorimeter/TileConditions/python/TileDCSConfig.py index 1c4bb576cf5..807233ea322 100644 --- a/TileCalorimeter/TileConditions/python/TileDCSConfig.py +++ b/TileCalorimeter/TileConditions/python/TileDCSConfig.py @@ -104,7 +104,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = ComponentAccumulator() diff --git a/TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py b/TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py index 6eece036999..5c1e176211d 100644 --- a/TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py +++ b/TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py @@ -92,7 +92,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = ComponentAccumulator() diff --git a/TileCalorimeter/TileConditions/python/TileEMScaleConfig.py b/TileCalorimeter/TileConditions/python/TileEMScaleConfig.py index 28941c885a7..d0be135bc97 100644 --- a/TileCalorimeter/TileConditions/python/TileEMScaleConfig.py +++ b/TileCalorimeter/TileConditions/python/TileEMScaleConfig.py @@ -193,7 +193,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = ComponentAccumulator() diff --git a/TileCalorimeter/TileConditions/python/TileInfoLoaderConfig.py b/TileCalorimeter/TileConditions/python/TileInfoLoaderConfig.py index c1db1b3c8f9..734917aa626 100644 --- a/TileCalorimeter/TileConditions/python/TileInfoLoaderConfig.py +++ b/TileCalorimeter/TileConditions/python/TileInfoLoaderConfig.py @@ -57,7 +57,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = ComponentAccumulator() diff --git a/TileCalorimeter/TileConditions/python/TileIntegratorConfig.py b/TileCalorimeter/TileConditions/python/TileIntegratorConfig.py index e8c85fac147..64c45994e1b 100644 --- a/TileCalorimeter/TileConditions/python/TileIntegratorConfig.py +++ b/TileCalorimeter/TileConditions/python/TileIntegratorConfig.py @@ -92,7 +92,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = ComponentAccumulator() diff --git a/TileCalorimeter/TileConditions/python/TileMuIDConfig.py b/TileCalorimeter/TileConditions/python/TileMuIDConfig.py index b687dff6bdd..028fdd4eeb2 100644 --- a/TileCalorimeter/TileConditions/python/TileMuIDConfig.py +++ b/TileCalorimeter/TileConditions/python/TileMuIDConfig.py @@ -89,7 +89,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = ComponentAccumulator() diff --git a/TileCalorimeter/TileConditions/python/TileOFCConfig.py b/TileCalorimeter/TileConditions/python/TileOFCConfig.py index 0209c62dac2..be5ce04367f 100644 --- a/TileCalorimeter/TileConditions/python/TileOFCConfig.py +++ b/TileCalorimeter/TileConditions/python/TileOFCConfig.py @@ -162,7 +162,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.lock() diff --git a/TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py b/TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py index 3c61190d358..00bd19428fc 100644 --- a/TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py +++ b/TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py @@ -142,7 +142,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.lock() diff --git a/TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py b/TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py index 548375a0438..03f15e126f4 100644 --- a/TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py +++ b/TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py @@ -123,7 +123,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Common.isOnline = True flags.lock() diff --git a/TileCalorimeter/TileConditions/python/TileTMDBConfig.py b/TileCalorimeter/TileConditions/python/TileTMDBConfig.py index 1f08729214a..8beb67294e5 100644 --- a/TileCalorimeter/TileConditions/python/TileTMDBConfig.py +++ b/TileCalorimeter/TileConditions/python/TileTMDBConfig.py @@ -129,7 +129,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.lock() diff --git a/TileCalorimeter/TileConditions/python/TileTimingConfig.py b/TileCalorimeter/TileConditions/python/TileTimingConfig.py index eda3b080e0c..6f532f8ed05 100644 --- a/TileCalorimeter/TileConditions/python/TileTimingConfig.py +++ b/TileCalorimeter/TileConditions/python/TileTimingConfig.py @@ -128,7 +128,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.lock() diff --git a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineData_test.py b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineData_test.py index 6406ac13be3..6c51344d541 100644 --- a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineData_test.py +++ b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineData_test.py @@ -16,7 +16,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.lock() diff --git a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineData_test.py b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineData_test.py index f822ef2aef4..6cba826e69c 100644 --- a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineData_test.py +++ b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineData_test.py @@ -16,7 +16,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Common.isOnline = True flags.Tile.RunType = 'PHY' flags.lock() diff --git a/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py b/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py index 6e204293b5a..94de51b766f 100644 --- a/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py +++ b/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py @@ -187,7 +187,7 @@ if __name__=="__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 if len(sys.argv) > 1: flags.fillFromArgs() diff --git a/TileCalorimeter/TileGeoModel/python/TileGMConfig.py b/TileCalorimeter/TileGeoModel/python/TileGMConfig.py index 4b555258954..a216df697c1 100644 --- a/TileCalorimeter/TileGeoModel/python/TileGMConfig.py +++ b/TileCalorimeter/TileGeoModel/python/TileGMConfig.py @@ -32,7 +32,7 @@ if __name__ == "__main__": from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = TileGMCfg( flags ) diff --git a/TileCalorimeter/TileL2Algs/python/TileL2Config.py b/TileCalorimeter/TileL2Algs/python/TileL2Config.py index ab37055dde6..135b03e52ca 100644 --- a/TileCalorimeter/TileL2Algs/python/TileL2Config.py +++ b/TileCalorimeter/TileL2Algs/python/TileL2Config.py @@ -99,7 +99,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.fillFromArgs() flags.Output.ESDFileName = "myESD.pool.root" flags.lock() diff --git a/TileCalorimeter/TileMonitoring/python/RunTileMonitoring.py b/TileCalorimeter/TileMonitoring/python/RunTileMonitoring.py index 87e7b8d5bc9..b231a253f8e 100755 --- a/TileCalorimeter/TileMonitoring/python/RunTileMonitoring.py +++ b/TileCalorimeter/TileMonitoring/python/RunTileMonitoring.py @@ -205,7 +205,7 @@ if __name__=='__main__': flags.Input.Files = [os.path.join(inputDirectory, inputFile)] else: from AthenaConfiguration.TestDefaults import defaultTestFiles - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 runNumber = flags.Input.RunNumber[0] flags.GeoModel.AtlasVersion = 'ATLAS-R3S-2021-03-01-00' if not flags.Input.isMC and runNumber >= 411938 else 'ATLAS-R2-2016-01-00-01' diff --git a/TileCalorimeter/TileMonitoring/python/TileDQFragMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileDQFragMonitorAlgorithm.py index 5f05449d088..7544ba20a6e 100644 --- a/TileCalorimeter/TileMonitoring/python/TileDQFragMonitorAlgorithm.py +++ b/TileCalorimeter/TileMonitoring/python/TileDQFragMonitorAlgorithm.py @@ -255,7 +255,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Output.HISTFileName = 'TileDQFragMonitorOutput.root' flags.DQ.useTrigger = False flags.DQ.enableLumiAccess = False diff --git a/TileCalorimeter/TileMonitoring/python/TileDigiNoiseMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileDigiNoiseMonitorAlgorithm.py index 7e0d5fa2b54..71d7488c21c 100644 --- a/TileCalorimeter/TileMonitoring/python/TileDigiNoiseMonitorAlgorithm.py +++ b/TileCalorimeter/TileMonitoring/python/TileDigiNoiseMonitorAlgorithm.py @@ -93,7 +93,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Output.HISTFileName = 'TileDigiNoiseMonitorOutput.root' flags.DQ.useTrigger = False flags.DQ.enableLumiAccess = False diff --git a/TileCalorimeter/TileMonitoring/python/TileDigitsFlxMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileDigitsFlxMonitorAlgorithm.py index b696df7a76c..5b9853f1ff6 100644 --- a/TileCalorimeter/TileMonitoring/python/TileDigitsFlxMonitorAlgorithm.py +++ b/TileCalorimeter/TileMonitoring/python/TileDigitsFlxMonitorAlgorithm.py @@ -167,7 +167,7 @@ if __name__=='__main__': fragIDs = [int(fragID, base=16) for fragID in args.fragIDs] from AthenaConfiguration.TestDefaults import defaultTestFiles - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Output.HISTFileName = 'TileDigitsFlxMonitorOutput.root' flags.DQ.useTrigger = False flags.DQ.enableLumiAccess = False diff --git a/TileCalorimeter/TileMonitoring/python/TileDigitsMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileDigitsMonitorAlgorithm.py index 3a8353337a8..5392d2e84b8 100644 --- a/TileCalorimeter/TileMonitoring/python/TileDigitsMonitorAlgorithm.py +++ b/TileCalorimeter/TileMonitoring/python/TileDigitsMonitorAlgorithm.py @@ -255,7 +255,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Output.HISTFileName = 'TileDigitsMonitorOutput2.root' flags.DQ.useTrigger = False flags.DQ.enableLumiAccess = False diff --git a/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py index 146833a8dde..7eeff666eb9 100644 --- a/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py +++ b/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py @@ -177,7 +177,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Output.HISTFileName = 'TileRODMonitorOutput.root' flags.DQ.useTrigger = False flags.DQ.enableLumiAccess = False diff --git a/TileCalorimeter/TileMonitoring/python/TileRawChannelFlxMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileRawChannelFlxMonitorAlgorithm.py index 98aa3e872fb..84ee937e3de 100644 --- a/TileCalorimeter/TileMonitoring/python/TileRawChannelFlxMonitorAlgorithm.py +++ b/TileCalorimeter/TileMonitoring/python/TileRawChannelFlxMonitorAlgorithm.py @@ -104,7 +104,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.Output.HISTFileName = 'TileRawChannelFlxMonitorOutput.root' ConfigFlags.DQ.useTrigger = False ConfigFlags.DQ.enableLumiAccess = False diff --git a/TileCalorimeter/TileMonitoring/python/TileRawChannelMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileRawChannelMonitorAlgorithm.py index fd12e1f4963..c0a1da53954 100644 --- a/TileCalorimeter/TileMonitoring/python/TileRawChannelMonitorAlgorithm.py +++ b/TileCalorimeter/TileMonitoring/python/TileRawChannelMonitorAlgorithm.py @@ -227,7 +227,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Output.HISTFileName = 'TileRawChannelMonitorOutput.root' flags.DQ.useTrigger = False flags.DQ.enableLumiAccess = False diff --git a/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py index 3cf351a04fd..ed32f300c08 100644 --- a/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py +++ b/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py @@ -76,7 +76,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Output.HISTFileName = 'TileTMDBDigitsMonitorOutput.root' flags.DQ.useTrigger = False flags.DQ.enableLumiAccess = False diff --git a/TileCalorimeter/TileMonitoring/python/TileTMDBMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileTMDBMonitorAlgorithm.py index 142f6ec5bff..64fbadfa9af 100644 --- a/TileCalorimeter/TileMonitoring/python/TileTMDBMonitorAlgorithm.py +++ b/TileCalorimeter/TileMonitoring/python/TileTMDBMonitorAlgorithm.py @@ -132,7 +132,7 @@ if __name__=='__main__': from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Output.HISTFileName = 'TileTMDBMonitorOutput.root' flags.DQ.useTrigger = False flags.DQ.enableLumiAccess = False diff --git a/TileCalorimeter/TileRawUtils/python/RegSelCondAlg_TileConfig.py b/TileCalorimeter/TileRawUtils/python/RegSelCondAlg_TileConfig.py index 8dc060a96a0..beccfb33944 100644 --- a/TileCalorimeter/TileRawUtils/python/RegSelCondAlg_TileConfig.py +++ b/TileCalorimeter/TileRawUtils/python/RegSelCondAlg_TileConfig.py @@ -35,7 +35,7 @@ if __name__ == "__main__": # Test setup log.setLevel(INFO) - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.lock() # Initialize configuration object, add accumulator, merge, and run. diff --git a/TileCalorimeter/TileRec/python/TileAANtupleConfig.py b/TileCalorimeter/TileRec/python/TileAANtupleConfig.py index 9677cf1f894..cd75bb19bfd 100644 --- a/TileCalorimeter/TileRec/python/TileAANtupleConfig.py +++ b/TileCalorimeter/TileRec/python/TileAANtupleConfig.py @@ -100,7 +100,7 @@ if __name__=='__main__': log.setLevel(INFO) from AthenaConfiguration.TestDefaults import defaultTestFiles - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Exec.MaxEvents = 3 flags.fillFromArgs(parser=parser) diff --git a/TileCalorimeter/TileRecAlgs/python/TileDigitsFilterConfig.py b/TileCalorimeter/TileRecAlgs/python/TileDigitsFilterConfig.py index 566bbf58421..1cc669060f9 100644 --- a/TileCalorimeter/TileRecAlgs/python/TileDigitsFilterConfig.py +++ b/TileCalorimeter/TileRecAlgs/python/TileDigitsFilterConfig.py @@ -69,7 +69,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Output.ESDFileName = "myESD.pool.root" flags.Tile.RunType = 'PHY' flags.lock() diff --git a/TileCalorimeter/TileRecUtils/python/TileCellBuilderConfig.py b/TileCalorimeter/TileRecUtils/python/TileCellBuilderConfig.py index 2b8fbd0acc2..9ef96dbe4a2 100644 --- a/TileCalorimeter/TileRecUtils/python/TileCellBuilderConfig.py +++ b/TileCalorimeter/TileRecUtils/python/TileCellBuilderConfig.py @@ -79,7 +79,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.fillFromArgs() flags.lock() diff --git a/TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py b/TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py index 2f70f61a2c3..3e50ba536ca 100644 --- a/TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py +++ b/TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py @@ -117,7 +117,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.Tile.doOptATLAS = True flags.Tile.correctTimeJumps = True diff --git a/TileCalorimeter/TileRecUtils/python/TileCellNoiseFilterConfig.py b/TileCalorimeter/TileRecUtils/python/TileCellNoiseFilterConfig.py index b3a298bbdaf..0c8e9283ba2 100644 --- a/TileCalorimeter/TileRecUtils/python/TileCellNoiseFilterConfig.py +++ b/TileCalorimeter/TileRecUtils/python/TileCellNoiseFilterConfig.py @@ -55,7 +55,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.Tile.NoiseFilter = 111 flags.fillFromArgs() diff --git a/TileCalorimeter/TileRecUtils/python/TileDQstatusConfig.py b/TileCalorimeter/TileRecUtils/python/TileDQstatusConfig.py index ce93c5e9add..22f5f04ba30 100644 --- a/TileCalorimeter/TileRecUtils/python/TileDQstatusConfig.py +++ b/TileCalorimeter/TileRecUtils/python/TileDQstatusConfig.py @@ -98,7 +98,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.lock() diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderConfig.py index 3511d7b85da..6304ce893df 100644 --- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderConfig.py +++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderConfig.py @@ -75,7 +75,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.Tile.NoiseFilter = 1 flags.lock() diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderFitConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderFitConfig.py index ee81a09fa21..2171a507918 100644 --- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderFitConfig.py +++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderFitConfig.py @@ -54,7 +54,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.Tile.NoiseFilter = 1 flags.lock() diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderMFConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderMFConfig.py index e14aeebd387..8b6e5d963dc 100644 --- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderMFConfig.py +++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderMFConfig.py @@ -66,7 +66,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.Tile.NoiseFilter = 1 flags.lock() diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderOptConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderOptConfig.py index 16584d4804c..234bad4b872 100644 --- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderOptConfig.py +++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderOptConfig.py @@ -94,7 +94,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.Tile.NoiseFilter = 1 flags.lock() diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderWienerConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderWienerConfig.py index 144657d96d1..7068dbaafc9 100644 --- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderWienerConfig.py +++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderWienerConfig.py @@ -56,7 +56,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.Tile.NoiseFilter = 1 flags.lock() diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelCorrectionConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelCorrectionConfig.py index 0ad278a6a59..7856c1090e3 100644 --- a/TileCalorimeter/TileRecUtils/python/TileRawChannelCorrectionConfig.py +++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelCorrectionConfig.py @@ -184,7 +184,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.Tile.correctPedestalDifference = True flags.Tile.zeroAmplitudeWithoutDigits = True diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelMakerConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelMakerConfig.py index 69e047a3a9a..8df4aeafe63 100644 --- a/TileCalorimeter/TileRecUtils/python/TileRawChannelMakerConfig.py +++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelMakerConfig.py @@ -166,7 +166,7 @@ if __name__ == "__main__": log.setLevel(DEBUG) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Tile.RunType = 'PHY' flags.Tile.doFit = True flags.Tile.doOF1 = True diff --git a/TileCalorimeter/TileSvc/TileByteStream/python/TileHid2RESrcIDConfig.py b/TileCalorimeter/TileSvc/TileByteStream/python/TileHid2RESrcIDConfig.py index a61942e93c7..a144e164981 100644 --- a/TileCalorimeter/TileSvc/TileByteStream/python/TileHid2RESrcIDConfig.py +++ b/TileCalorimeter/TileSvc/TileByteStream/python/TileHid2RESrcIDConfig.py @@ -51,7 +51,7 @@ if __name__ == "__main__": log.setLevel(INFO) flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() # Initialize configuration object, add accumulator, merge, and run. diff --git a/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py b/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py index 6bfe9f87e78..8c33166e307 100644 --- a/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py +++ b/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py @@ -189,7 +189,7 @@ if __name__ == '__main__': from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles - ConfigFlags.Input.Files = defaultTestFiles.RAW + ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.lock() acc = TrackingGeometryCondAlgCfg(ConfigFlags) diff --git a/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py b/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py index 329ab0dc996..793b89f2db1 100644 --- a/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py +++ b/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py @@ -72,7 +72,7 @@ if __name__ == '__main__': from AthenaConfiguration.TestDefaults import defaultTestFiles - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = TrackingGeometrySvcCfg(flags) diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py index 67e91836e83..636882e19af 100644 --- a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py +++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py @@ -53,7 +53,7 @@ def testCfg (configFlags): from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles -ConfigFlags.Input.Files = defaultTestFiles.RAW +ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2 ConfigFlags.lock() from AthenaConfiguration.MainServicesConfig import MainServicesCfg diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py index a0cc98378be..7d982e867d6 100644 --- a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py +++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py @@ -379,7 +379,7 @@ if __name__ == "__main__": from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() cfg = l2MuFastAlgCfg(flags, roisKey="MURoIs") diff --git a/Trigger/TrigAlgorithms/TrigMinBias/python/MbtsConfig.py b/Trigger/TrigAlgorithms/TrigMinBias/python/MbtsConfig.py index 1da77a7794a..e3832ed6fd0 100644 --- a/Trigger/TrigAlgorithms/TrigMinBias/python/MbtsConfig.py +++ b/Trigger/TrigAlgorithms/TrigMinBias/python/MbtsConfig.py @@ -29,7 +29,7 @@ if __name__ == '__main__': from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files=defaultTestFiles.RAW # or ESD or AOD or ... + flags.Input.Files=defaultTestFiles.RAW_RUN2 # or ESD or AOD or ... flags.lock() acc=ComponentAccumulator() diff --git a/Trigger/TrigAlgorithms/TrigMinBias/python/MinBiasCountersConfig.py b/Trigger/TrigAlgorithms/TrigMinBias/python/MinBiasCountersConfig.py index ad19f8a4847..7c39d723576 100644 --- a/Trigger/TrigAlgorithms/TrigMinBias/python/MinBiasCountersConfig.py +++ b/Trigger/TrigAlgorithms/TrigMinBias/python/MinBiasCountersConfig.py @@ -35,7 +35,7 @@ if __name__ == '__main__': from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files=defaultTestFiles.RAW # or ESD or AOD or ... + flags.Input.Files=defaultTestFiles.RAW_RUN2 # or ESD or AOD or ... flags.lock() acc = ComponentAccumulator() diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py index 88bf44b2367..a12e3c8a894 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py @@ -106,7 +106,7 @@ if __name__ == "__main__": import sys flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Input.isMC=False flags.lock() diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauConfigFlags.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauConfigFlags.py index d5e1c157050..9baf9d2b1df 100644 --- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauConfigFlags.py +++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauConfigFlags.py @@ -50,7 +50,7 @@ if __name__ == "__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() flags.Tau.CalibrateLCConfig diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py index b1ab39265c9..7d1fd26f70f 100644 --- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py +++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py @@ -167,7 +167,7 @@ if __name__ == "__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = trigTauRecMergedCaloOnlyMVACfg(flags) diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/python/TrigDecisionToolConfig.py b/Trigger/TrigAnalysis/TrigDecisionTool/python/TrigDecisionToolConfig.py index 16126027d07..87e0c8829b6 100644 --- a/Trigger/TrigAnalysis/TrigDecisionTool/python/TrigDecisionToolConfig.py +++ b/Trigger/TrigAnalysis/TrigDecisionTool/python/TrigDecisionToolConfig.py @@ -97,7 +97,7 @@ if __name__ == '__main__': flags = initConfigFlags() if '--RAWRUN2' in sys.argv: - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 else: flags.Input.Files = defaultTestFiles.AOD_RUN2_DATA #TODO expand the test scope Run3 AODs and RAWs diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py index c531a07f433..e7c625aab81 100644 --- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py +++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py @@ -380,7 +380,7 @@ if __name__ == "__main__": flags = initConfigFlags() flags.Trigger.EDMVersion = 3 from AthenaConfiguration.TestDefaults import defaultTestFiles - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() TrigConfigSvcCfg( flags ) L1PrescaleCondAlgCfg( flags ) @@ -391,7 +391,7 @@ if __name__ == "__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() from AthenaConfiguration.TestDefaults import defaultTestFiles - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() TrigConfigSvcCfg( flags ) L1PrescaleCondAlgCfg( flags ) diff --git a/Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py b/Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py index 326df596310..1f6b8848a96 100644 --- a/Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py +++ b/Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py @@ -57,7 +57,7 @@ if __name__ == "__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = NavConverterCfg(flags) diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/python/L1TopoByteStreamConfig.py b/Trigger/TrigT1/L1Topo/L1TopoByteStream/python/L1TopoByteStreamConfig.py index 0c614adbc53..4768c6e0a52 100644 --- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/python/L1TopoByteStreamConfig.py +++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/python/L1TopoByteStreamConfig.py @@ -52,7 +52,7 @@ if __name__ == '__main__': flags = initConfigFlags() flags.Exec.OutputLevel = DEBUG # noqa: ATL900 - fine for short unit test - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() acc = MainServicesCfg(flags) diff --git a/Trigger/TrigT1/TrigT1CaloCondSvc/python/L1CaloCondConfig.py b/Trigger/TrigT1/TrigT1CaloCondSvc/python/L1CaloCondConfig.py index c919e46c595..1e9538dd096 100644 --- a/Trigger/TrigT1/TrigT1CaloCondSvc/python/L1CaloCondConfig.py +++ b/Trigger/TrigT1/TrigT1CaloCondSvc/python/L1CaloCondConfig.py @@ -65,7 +65,7 @@ if __name__=="__main__": from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Exec.MaxEvents = 1 flags.IOVDb.GlobalTag = 'CONDBR2-BLKPA-2022-02' flags.GeoModel.AtlasVersion="ATLAS-R2-2015-03-01-00" diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigMUCTPIConfigFlags.py b/Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigMUCTPIConfigFlags.py index bc7b94588a0..aeb1fa8cb22 100644 --- a/Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigMUCTPIConfigFlags.py +++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigMUCTPIConfigFlags.py @@ -26,7 +26,7 @@ if __name__ == "__main__": from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() flags.dump("MUCTPI|Trigger") diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py index 844aed0e85e..152f952c171 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py @@ -412,7 +412,7 @@ if __name__ == "__main__": from AthenaConfiguration.TestDefaults import defaultTestFiles ComponentAccumulator.debugMode = "trackCA trackPublicTool trackEventAlgo trackCondAlgo trackPrivateTool" flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() # this configuration is not runable, the test checks if there is no mistake in python scripts above # output can be used by experts to check actual configuration (e.g. here we configure to run on RAW and it should be reflected in settings) diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py index e7454facdb1..eaf1480caa6 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py @@ -365,7 +365,7 @@ if __name__ == '__main__': if flags.Trigger.EDMVersion==1: flags.Input.Files = defaultTestFiles.RAW_RUN1 elif flags.Trigger.EDMVersion==2: - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 elif flags.Trigger.EDMVersion==3: flags.Input.Files = defaultTestFiles.RAW_RUN3 diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py index e7ce773d89e..3406c72abe0 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py @@ -332,7 +332,7 @@ if __name__ == "__main__": from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() failures = 0 for eb_identifier in EventBuildingInfo.getAllEventBuildingIdentifiers(): diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/GenerateMenuMT_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/GenerateMenuMT_newJO.py index 8cf4d5b9a62..63bf7a2f3a1 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/GenerateMenuMT_newJO.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/GenerateMenuMT_newJO.py @@ -146,7 +146,7 @@ if __name__ == "__main__": from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Trigger.triggerMenuSetup = "Dev_pp_run3_v1" flags.lock() diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaConfigFlags.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaConfigFlags.py index f9480fac8f1..6e8828214b0 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaConfigFlags.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaConfigFlags.py @@ -29,7 +29,7 @@ if __name__ == "__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() flags.dump("Egamma|Trigger") diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py index b28143600b9..35a685bfc87 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py @@ -179,7 +179,7 @@ if __name__ == "__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles flags = initConfigFlags() - flags.Input.Files = defaultTestFiles.RAW + flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.lock() from TriggerMenuMT.HLT.Config.Utility.DictFromChainName import dictFromChainName chain = generateChains(flags, dictFromChainName(flags, 'HLT_tau0_perf_ptonly_L1TAU8')) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_menu_CA.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_menu_CA.py index 6f292ce132e..5a04a477649 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_menu_CA.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_menu_CA.py @@ -27,7 +27,7 @@ flags.Trigger.enabledSignatures = ['Muon', 'Photon','Electron', 'MinBias', 'Heav flags.Trigger.generateMenuDiagnostics = True from AthenaConfiguration.TestDefaults import defaultTestFiles -flags.Input.Files = defaultTestFiles.RAW +flags.Input.Files = defaultTestFiles.RAW_RUN2 flags.Trigger.triggerMenuSetup="Dev_pp_run3_v1" flags.Trigger.EDMVersion=3 -- GitLab