From 3c79381346e552b78848f8e172ac69f557c30998 Mon Sep 17 00:00:00 2001 From: Goetz Gaycken Date: Fri, 29 Jul 2022 13:45:01 +0200 Subject: [PATCH 1/2] Rename magnetic field CondAlg configuration method to better reflect what it does. --- DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py | 4 ++-- .../python/ITkPixelLorentzAngleConfig.py | 4 ++-- .../python/ITkStripLorentzAngleConfig.py | 4 ++-- .../SiLorentzAngleTool/python/PixelLorentzAngleConfig.py | 4 ++-- .../SiLorentzAngleTool/python/SCT_LorentzAngleConfig.py | 4 ++-- .../InDetConfig/python/TRTSegmentFindingConfig.py | 4 ++-- InnerDetector/InDetConfig/python/TRTStandaloneConfig.py | 4 ++-- .../InDetConfig/python/TRT_DetElementsRoadToolConfig.py | 4 ++-- .../python/TRT_SeededSpacePointFinderToolConfig.py | 4 ++-- .../InDetConfig/python/TRT_SeededTrackFinderToolConfig.py | 4 ++-- .../InDetConfig/python/TRT_TrackExtensionToolConfig.py | 4 ++-- .../TRT_Digitization/python/TRT_DigitizationConfigNew.py | 4 ++-- .../SCT_Monitoring/python/SCTHitEffMonAlg.py | 4 ++-- .../SCT_Monitoring/python/SCTLorentzMonAlg.py | 4 ++-- .../MagFieldServices/python/MagFieldServicesConfig.py | 7 +++++-- .../MuonConfig/python/MM_DigitizationConfig.py | 6 +++--- .../MuonConfig/python/MuonBytestreamDecodeConfig.py | 4 ++-- .../MuonConfig/python/MuonCalibrationConfig.py | 4 ++-- .../MuonConfig/python/MuonTrackBuildingConfig.py | 4 ++-- .../MuonConfig/test/MdtRdoToPrepDataTool_test.py | 4 ++-- .../RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py | 8 ++++---- .../python/TgcRawDataMonitorAlgorithm.py | 8 ++++---- .../JetTagging/JetTagAlgs/BTagging/python/BTagESD.py | 4 ++-- Reconstruction/MET/METReconstruction/python/METRecCfg.py | 4 ++-- .../python/MuonCombinedRecToolsConfig.py | 4 ++-- Reconstruction/eflowRec/python/PFHLTConfig.py | 4 ++-- Reconstruction/eflowRec/python/PFRun3Config.py | 4 ++-- Reconstruction/tauRec/python/TauToolHolder.py | 4 ++-- .../FastCaloSim/python/FastCaloSimFactoryNew.py | 4 ++-- Tracking/Acts/ActsGeometry/python/ActsGeometryConfig.py | 4 ++-- .../TrkConfig/python/AtlasExtrapolationEngineConfig.py | 4 ++-- Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py | 4 ++-- Tracking/TrkConfig/python/TrkVertexFitterUtilsConfig.py | 8 ++++---- .../TrigL2MuonSA/python/MdtDataPreparator_test.py | 4 ++-- .../TrigTools/TrigInDetConfig/python/TrigInDetConfig.py | 4 ++-- 35 files changed, 80 insertions(+), 77 deletions(-) diff --git a/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py b/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py index acb0429964a..9a3c9c58c4b 100644 --- a/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py +++ b/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py @@ -10,8 +10,8 @@ def DQTDetSynchMonAlgConfig(flags): acc = helper.result() # RPC currently crashes, switch off acc.getEventAlgo('DQTDetSynchMonAlg').doRPC = False - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - acc.merge(MagneticFieldSvcCfg(flags)) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + acc.merge(AtlasFieldCacheCondAlgCfg(flags)) from TileConditions.TileCablingSvcConfig import TileCablingSvcCfg acc.merge(TileCablingSvcCfg(flags)) return acc diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/ITkPixelLorentzAngleConfig.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/ITkPixelLorentzAngleConfig.py index b98f1bcc570..3bbdf660070 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/ITkPixelLorentzAngleConfig.py +++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/ITkPixelLorentzAngleConfig.py @@ -3,7 +3,7 @@ """Define methods to configure ITkPixelLorentzAngleTool """ from AthenaConfiguration.ComponentFactory import CompFactory -from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg +from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg from PixelConditionsAlgorithms.ITkPixelConditionsConfig import ( ITkPixelDCSCondHVAlgCfg, ITkPixelDCSCondTempAlgCfg ) @@ -21,7 +21,7 @@ def ITkPixelLorentzAngleToolCfg(flags, name="ITkPixelLorentzAngleTool", **kwargs return acc def ITkPixelLorentzAngleCondAlgCfg(flags, name="ITkPixelSiLorentzAngleCondAlg", **kwargs): - acc = MagneticFieldSvcCfg(flags) + acc = AtlasFieldCacheCondAlgCfg(flags) acc.merge(ITkPixelReadoutGeometryCfg(flags)) # To produce ITkPixelDetectorElementCollection acc.merge(ITkPixelDCSCondHVAlgCfg(flags)) acc.merge(ITkPixelDCSCondTempAlgCfg(flags)) diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/ITkStripLorentzAngleConfig.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/ITkStripLorentzAngleConfig.py index ea46a6a0971..615ef6734cd 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/ITkStripLorentzAngleConfig.py +++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/ITkStripLorentzAngleConfig.py @@ -3,7 +3,7 @@ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration """ from AthenaConfiguration.ComponentFactory import CompFactory -from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg +from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg from SCT_ConditionsTools.ITkStripConditionsToolsConfig import ITkStripSiliconConditionsCfg from StripGeoModelXml.ITkStripGeoModelConfig import ITkStripReadoutGeometryCfg @@ -21,7 +21,7 @@ def ITkStripLorentzAngleCondAlgCfg(flags, name="ITkStripSiLorentzAngleCondAlg", forceUseGeoModel=False, **kwargs): # Condition algorithm # construct with field services - acc = MagneticFieldSvcCfg(flags) + acc = AtlasFieldCacheCondAlgCfg(flags) # For SCT_ID and SCT_DetectorElementCollection used # in SCTSiLorentzAngleCondAlg and SiLorentzAngleTool acc.merge(ITkStripReadoutGeometryCfg(flags)) diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleConfig.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleConfig.py index 659271730c3..d6c02900227 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleConfig.py +++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleConfig.py @@ -4,7 +4,7 @@ """ from SiPropertiesTool.PixelSiPropertiesConfig import PixelSiPropertiesCfg from AthenaConfiguration.ComponentFactory import CompFactory -from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg +from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg from PixelConditionsAlgorithms.PixelConditionsConfig import ( PixelDCSCondHVAlgCfg, PixelDCSCondTempAlgCfg ) @@ -21,7 +21,7 @@ def PixelLorentzAngleToolCfg(flags, name="PixelLorentzAngleTool", **kwargs): return acc def PixelLorentzAngleCondAlgCfg(flags, name="PixelSiLorentzAngleCondAlg", **kwargs): - acc = MagneticFieldSvcCfg(flags) + acc = AtlasFieldCacheCondAlgCfg(flags) acc.merge(PixelReadoutGeometryCfg(flags)) # To produce PixelDetectorElementCollection acc.merge(PixelDCSCondHVAlgCfg(flags)) acc.merge(PixelDCSCondTempAlgCfg(flags)) diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCT_LorentzAngleConfig.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCT_LorentzAngleConfig.py index d2af0e5e4df..3134d40cc88 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCT_LorentzAngleConfig.py +++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCT_LorentzAngleConfig.py @@ -3,7 +3,7 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration """ from AthenaConfiguration.ComponentFactory import CompFactory -from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg +from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg from SCT_ConditionsTools.SCT_ConditionsToolsConfig import SCT_SiliconConditionsCfg from SCT_GeoModel.SCT_GeoModelConfig import SCT_ReadoutGeometryCfg @@ -20,7 +20,7 @@ def SCT_LorentzAngleCondAlgCfg(flags, name="SCTSiLorentzAngleCondAlg", forceUseGeoModel=False, **kwargs): # Condition algorithm # construct with field services - acc = MagneticFieldSvcCfg(flags) + acc = AtlasFieldCacheCondAlgCfg(flags) # For SCT_ID and SCT_DetectorElementCollection used # in SCTSiLorentzAngleCondAlg and SiLorentzAngleTool acc.merge(SCT_ReadoutGeometryCfg(flags)) diff --git a/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py b/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py index 31e69c9b78a..a1ab5bd29cb 100644 --- a/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py +++ b/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py @@ -85,8 +85,8 @@ def TRT_TrackSegmentsMakerCondAlg_ATLxkCfg(flags, name = 'InDetTRT_SeedsMakerCon return acc def TRT_TrackSegmentsFinderCfg(flags, name = 'InDetTRT_TrackSegmentsFinder', extension = '', BarrelSegments = None, InputCollections =None, **kwargs): - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - acc = MagneticFieldSvcCfg(flags) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + acc = AtlasFieldCacheCondAlgCfg(flags) # --------------------------------------------------------------- # diff --git a/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py b/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py index d1b0c4c4c93..2ca3eb9fc41 100644 --- a/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py +++ b/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py @@ -34,8 +34,8 @@ def InDetTrtTrackScoringToolCfg(flags, name ='InDetTRT_StandaloneScoringTool', e return acc def TRT_SegmentToTrackToolCfg(flags, name ='InDetTRT_SegmentToTrackTool', extension = "", **kwargs): - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - acc = MagneticFieldSvcCfg(flags) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + acc = AtlasFieldCacheCondAlgCfg(flags) # # set up TRT_SegmentToTrackTool diff --git a/InnerDetector/InDetConfig/python/TRT_DetElementsRoadToolConfig.py b/InnerDetector/InDetConfig/python/TRT_DetElementsRoadToolConfig.py index d6c396ec1c4..de6ad4b6068 100644 --- a/InnerDetector/InDetConfig/python/TRT_DetElementsRoadToolConfig.py +++ b/InnerDetector/InDetConfig/python/TRT_DetElementsRoadToolConfig.py @@ -10,8 +10,8 @@ def TRT_DetElementsRoadCondAlgCfg(flags, name="TRT_DetElementsRoadCondAlg_xk", * return acc def TRT_DetElementsRoadMaker_xkCfg(flags, name='InDetTRT_RoadMaker', **kwargs): - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - acc = MagneticFieldSvcCfg(flags) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + acc = AtlasFieldCacheCondAlgCfg(flags) acc.merge(TRT_DetElementsRoadCondAlgCfg(flags)) # To produce the input TRT_DetElementsRoadData_xk CondHandle kwargs.setdefault("RoadWidth", 20.) diff --git a/InnerDetector/InDetConfig/python/TRT_SeededSpacePointFinderToolConfig.py b/InnerDetector/InDetConfig/python/TRT_SeededSpacePointFinderToolConfig.py index ca797d35dbd..c4b45ef9dde 100644 --- a/InnerDetector/InDetConfig/python/TRT_SeededSpacePointFinderToolConfig.py +++ b/InnerDetector/InDetConfig/python/TRT_SeededSpacePointFinderToolConfig.py @@ -6,8 +6,8 @@ from AthenaConfiguration.ComponentFactory import CompFactory from AthenaConfiguration.Enums import BeamType def SimpleTRT_SeededSpacePointFinder_ATLCfg(flags, name='InDetTRT_SeededSpFinder', InputCollections=[], **kwargs): - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - acc = MagneticFieldSvcCfg(flags) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + acc = AtlasFieldCacheCondAlgCfg(flags) # # --- decide if use the association tool diff --git a/InnerDetector/InDetConfig/python/TRT_SeededTrackFinderToolConfig.py b/InnerDetector/InDetConfig/python/TRT_SeededTrackFinderToolConfig.py index c4a1f65a3c7..9b6fad7c150 100644 --- a/InnerDetector/InDetConfig/python/TRT_SeededTrackFinderToolConfig.py +++ b/InnerDetector/InDetConfig/python/TRT_SeededTrackFinderToolConfig.py @@ -5,8 +5,8 @@ from AthenaConfiguration.ComponentFactory import CompFactory from AthenaConfiguration.Enums import BeamType def TRT_SeededTrackFinder_ATLCfg(flags, name='InDetTRT_SeededTrackMaker', InputCollections=[], **kwargs): - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - acc = MagneticFieldSvcCfg(flags) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + acc = AtlasFieldCacheCondAlgCfg(flags) # # --- TRT seeded back tracking tool diff --git a/InnerDetector/InDetConfig/python/TRT_TrackExtensionToolConfig.py b/InnerDetector/InDetConfig/python/TRT_TrackExtensionToolConfig.py index 98a1bc75538..160707a8cc7 100644 --- a/InnerDetector/InDetConfig/python/TRT_TrackExtensionToolConfig.py +++ b/InnerDetector/InDetConfig/python/TRT_TrackExtensionToolConfig.py @@ -46,8 +46,8 @@ def TRT_TrackExtensionToolPhaseCfg(flags, name='TRT_TrackExtensionToolPhase', ** return acc def TRT_TrackExtensionTool_xkCfg(flags, name='TRT_TrackExtensionTool_xk', **kwargs): - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - acc = MagneticFieldSvcCfg(flags) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + acc = AtlasFieldCacheCondAlgCfg(flags) if 'PropagatorTool' not in kwargs: from TrkConfig.TrkExRungeKuttaPropagatorConfig import RungeKuttaPropagatorCfg diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfigNew.py b/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfigNew.py index 80b8cbf399a..8e41d0cfb77 100644 --- a/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfigNew.py +++ b/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfigNew.py @@ -6,7 +6,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory from AthenaConfiguration.Enums import BeamType, ProductionStep from TRT_GeoModel.TRT_GeoModelConfig import TRT_ReadoutGeometryCfg -from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg +from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg from TRT_PAI_Process.TRT_PAI_ProcessConfigNew import TRT_PAI_Process_XeToolCfg from TRT_PAI_Process.TRT_PAI_ProcessConfigNew import TRT_PAI_Process_ArToolCfg from TRT_PAI_Process.TRT_PAI_ProcessConfigNew import TRT_PAI_Process_KrToolCfg @@ -39,7 +39,7 @@ def TRT_RangeCfg(flags, name="TRTRange", **kwargs): def TRT_DigitizationBasicToolCfg(flags, name="TRT_DigitizationBasicTool", **kwargs): """Return ComponentAccumulator with common TRT digitization tool config""" acc = TRT_ReadoutGeometryCfg(flags) - acc.merge(MagneticFieldSvcCfg(flags)) + acc.merge(AtlasFieldCacheCondAlgCfg(flags)) PartPropSvc = CompFactory.PartPropSvc acc.addService(PartPropSvc(InputFile="PDGTABLE.MeV")) # TODO: move this data overlay in a separate place diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTHitEffMonAlg.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTHitEffMonAlg.py index 9ce109ed6bb..c0c416e29d2 100644 --- a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTHitEffMonAlg.py +++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTHitEffMonAlg.py @@ -54,8 +54,8 @@ def SCTHitEffMonAlgConfig(inputFlags): from LumiBlockComps.BunchCrossingCondAlgConfig import BunchCrossingCondAlgCfg result.merge(BunchCrossingCondAlgCfg(inputFlags)) - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - result.merge(MagneticFieldSvcCfg(inputFlags)) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + result.merge(AtlasFieldCacheCondAlgCfg(inputFlags)) ### STEP 4 ### # Add some tools. N.B. Do not use your own trigger decion tool. Use the diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTLorentzMonAlg.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTLorentzMonAlg.py index 6236539d383..0b37e1c9db2 100644 --- a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTLorentzMonAlg.py +++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTLorentzMonAlg.py @@ -59,8 +59,8 @@ def SCTLorentzMonAlgConfig(inputFlags): result.merge(BeamPipeGeometryCfg(inputFlags)) from InDetConfig.InDetGeometryConfig import InDetGeometryCfg result.merge(InDetGeometryCfg(inputFlags)) - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - result.merge(MagneticFieldSvcCfg(inputFlags)) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + result.merge(AtlasFieldCacheCondAlgCfg(inputFlags)) # # Then, add a tool that doesn't have its own configuration function. In # # this example, no accumulator is returned, so no merge is necessary. diff --git a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py index 76a377df91b..808f58f2b8c 100644 --- a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py +++ b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py @@ -3,7 +3,10 @@ from AthenaConfiguration.ComponentFactory import CompFactory from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator -def MagneticFieldSvcCfg(flags, **kwargs): +def AtlasFieldCacheCondAlgCfg(flags, **kwargs): + ''' + Configure the CondAlgsfor the ATLAS magnetic field. + ''' result=ComponentAccumulator() # initialise required conditions DB folders @@ -73,7 +76,7 @@ if __name__=="__main__": cfg=ComponentAccumulator() - acc = MagneticFieldSvcCfg(ConfigFlags) + acc = AtlasFieldCacheCondAlgCfg(ConfigFlags) log.verbose(acc) cfg.merge(acc) diff --git a/MuonSpectrometer/MuonConfig/python/MM_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/MM_DigitizationConfig.py index 0414dbf8c33..ee00dbec966 100644 --- a/MuonSpectrometer/MuonConfig/python/MM_DigitizationConfig.py +++ b/MuonSpectrometer/MuonConfig/python/MM_DigitizationConfig.py @@ -8,7 +8,7 @@ from AthenaConfiguration.Enums import ProductionStep from Digitization.PileUpMergeSvcConfigNew import PileUpMergeSvcCfg, PileUpXingFolderCfg from Digitization.PileUpToolsConfig import PileUpToolsCfg from Digitization.TruthDigitizationOutputConfig import TruthDigitizationOutputCfg -from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg +from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg from MuonConfig.MuonByteStreamCnvTestConfig import MM_DigitToRDOCfg from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg @@ -41,7 +41,7 @@ def MM_DigitizationToolCfg(flags, name="MM_DigitizationTool", **kwargs): result = ComponentAccumulator() kwargs.setdefault("CalibrationTool", result.popToolsAndMerge(NSWCalibToolCfg(flags))) kwargs.setdefault("SmearingTool", result.popToolsAndMerge(MMCalibSmearingToolCfg(flags))) - result.merge(MagneticFieldSvcCfg(flags)) + result.merge(AtlasFieldCacheCondAlgCfg(flags)) if flags.Digitization.PileUp: intervals = [] if flags.Digitization.DoXingByXingPileUp: @@ -71,7 +71,7 @@ def MM_DigitizationToolCfg(flags, name="MM_DigitizationTool", **kwargs): def MM_OverlayDigitizationToolCfg(flags, name="MM_OverlayDigitizationTool", **kwargs): """Return ComponentAccumulator with MM_DigitizationTool configured for Overlay""" - acc = MagneticFieldSvcCfg(flags) + acc = AtlasFieldCacheCondAlgCfg(flags) kwargs.setdefault("CheckSimHits", True) kwargs.setdefault("OnlyUseContainerName", False) if 'MMSimHitCollection#MicromegasSensitiveDetector' in flags.Input.SecondaryTypedCollections: diff --git a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py index 500276e19e9..46c0c07651e 100644 --- a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py +++ b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py @@ -129,8 +129,8 @@ def MdtBytestreamDecodeCfg(flags, name="MdtRawDataProvider"): acc.merge( MDTCablingConfigCfg(flags) ) # need the MagFieldSvc since MdtRdoToMdtPrepData.MdtRdoToMdtPrepDataTool.MdtCalibrationTool wants to retrieve it - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - acc.merge( MagneticFieldSvcCfg(flags) ) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + acc.merge( AtlasFieldCacheCondAlgCfg(flags) ) # Make sure muon geometry is configured from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg diff --git a/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py index afd3646171b..8a4baf58024 100644 --- a/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py +++ b/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py @@ -8,7 +8,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.Enums import BeamType, LHCPeriod from IOVDbSvc.IOVDbSvcConfig import addFoldersSplitOnline -from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg +from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg from AthenaCommon.Logging import logging log = logging.getLogger('MuonCalibConfig') @@ -84,7 +84,7 @@ def MdtCalibrationToolCfg(flags, **kwargs): kwargs.setdefault("DoWireSagCorrection", flags.Muon.Calib.correctMdtRtWireSag) kwargs.setdefault("DoTofCorrection", flags.Beam.Type is BeamType.Collisions) # No TOF correction if not collisions - acc = MagneticFieldSvcCfg(flags) + acc = AtlasFieldCacheCondAlgCfg(flags) result.merge(acc) MdtCalibrationTool = CompFactory.MdtCalibrationTool diff --git a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py index f73b0adc5d7..ba007ff302c 100644 --- a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py +++ b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py @@ -71,7 +71,7 @@ def MooTrackBuilderCfg(flags, name="MooTrackBuilderTemplate", prefix="", **kwarg Muon__MooTrackBuilder=CompFactory.Muon.MooTrackBuilder from MuonConfig.MuonRIO_OnTrackCreatorToolConfig import MdtDriftCircleOnTrackCreatorCfg, TriggerChamberClusterOnTrackCreatorCfg from MuonConfig.MuonRecToolsConfig import MuonTrackToSegmentToolCfg, MuonTrackExtrapolationToolCfg - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg # Based on this: https://gitlab.cern.ch/atlas/athena/blob/release/22.0.3/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MooreTools.py#L221 # ignoring all the name_prefix stuff for the moment, since I'm not sure it's necessary any more. @@ -107,7 +107,7 @@ def MooTrackBuilderCfg(flags, name="MooTrackBuilderTemplate", prefix="", **kwarg kwargs.setdefault("ChamberHoleRecoveryTool", result.popToolsAndMerge(MuonChamberHoleRecoveryToolCfg(flags))) - result.merge(MagneticFieldSvcCfg(flags) ) + result.merge(AtlasFieldCacheCondAlgCfg(flags) ) kwargs.setdefault("TrackToSegmentTool", result.popToolsAndMerge(MuonTrackToSegmentToolCfg(flags))) kwargs.setdefault("Printer", result.popToolsAndMerge(MuonEDMPrinterToolCfg(flags))) diff --git a/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py b/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py index eb984ce2887..e02fa0ae699 100644 --- a/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py +++ b/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py @@ -41,8 +41,8 @@ def testCfg (configFlags): from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg result.merge (MuonGeoModelCfg(configFlags, forceDisableAlignment=True)) - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - result.merge (MagneticFieldSvcCfg(configFlags, UseDCS = False)) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + result.merge (AtlasFieldCacheCondAlgCfg(configFlags, UseDCS = False)) Muon__MdtRdoToPrepDataTool = CompFactory.Muon.MdtRdoToPrepDataTool result.addPublicTool (Muon__MdtRdoToPrepDataTool ('Muon__MdtRdoToPrepDataTool', OutputLevel = 1)) diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py index 814ea05a7c0..5474d938c69 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py @@ -13,9 +13,9 @@ def RpcMonitoringConfig(inputFlags): from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator result = ComponentAccumulator() - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg - result.merge(MagneticFieldSvcCfg(inputFlags)) + result.merge(AtlasFieldCacheCondAlgCfg(inputFlags)) result.merge(AtlasGeometryCfg(inputFlags)) from AthenaMonitoring import AthMonitorCfgHelper @@ -358,9 +358,9 @@ if __name__=="__main__": acc.OutputLevel = INFO cfg.merge(acc) - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg - cfg.merge(MagneticFieldSvcCfg(ConfigFlags)) + cfg.merge(AtlasFieldCacheCondAlgCfg(ConfigFlags)) cfg.merge(AtlasGeometryCfg(ConfigFlags)) if ConfigFlags.DQ.Steering.Muon.doTrackMon: diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py index b37313203ed..dd08dabb6a0 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py @@ -15,9 +15,9 @@ def TgcRawDataMonitoringConfig(inputFlags): from AthenaConfiguration.Enums import Format result = ComponentAccumulator() - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg - result.merge(MagneticFieldSvcCfg(inputFlags)) + result.merge(AtlasFieldCacheCondAlgCfg(inputFlags)) result.merge(AtlasGeometryCfg(inputFlags)) from AthenaMonitoring import AthMonitorCfgHelper @@ -1120,8 +1120,8 @@ if __name__=='__main__': cfg.getEventAlgo('TgcRawDataMonAlg').FillGapByGapHistograms = True - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - cfg.merge(MagneticFieldSvcCfg(ConfigFlags)) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + cfg.merge(AtlasFieldCacheCondAlgCfg(ConfigFlags)) from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg cfg.merge(AtlasGeometryCfg(ConfigFlags)) from TrigConfigSvc.TrigConfigSvcCfg import L1ConfigSvcCfg,generateL1Menu diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py index a390d907b32..a806db0db6f 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py @@ -102,8 +102,8 @@ def PrepareStandAloneBTagCfg(inputFlags): result.merge(acc) # get standard config for magnetic field - map and cache - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - result.merge(MagneticFieldSvcCfg( inputFlags )) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + result.merge(AtlasFieldCacheCondAlgCfg( inputFlags )) #load folders needed for Run2 ID alignment from IOVDbSvc.IOVDbSvcConfig import addFolders diff --git a/Reconstruction/MET/METReconstruction/python/METRecCfg.py b/Reconstruction/MET/METReconstruction/python/METRecCfg.py index 8d2af21ed5c..786efa11ad0 100644 --- a/Reconstruction/MET/METReconstruction/python/METRecCfg.py +++ b/Reconstruction/MET/METReconstruction/python/METRecCfg.py @@ -102,8 +102,8 @@ if __name__=="__main__": modelConfig=GeoModelCfg(ConfigFlags) cfg.merge(modelConfig) - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - cfg.merge(MagneticFieldSvcCfg(ConfigFlags)) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + cfg.merge(AtlasFieldCacheCondAlgCfg(ConfigFlags)) #Configure topocluster algorithmsm, and associated conditions from CaloRec.CaloTopoClusterConfig import CaloTopoClusterCfg diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py index 0c1422dddf2..2f6c327d6eb 100644 --- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py +++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py @@ -565,10 +565,10 @@ def MuidCaloEnergyToolParamCfg(flags, name='MuidCaloEnergyToolParam', **kwargs): def MuidTrackIsolationCfg(flags, name='MuidTrackIsolation', **kwargs): - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg kwargs.setdefault("InDetTracksLocation", "CombinedInDetTracks") # RungeKuttaIntersector requires the magnetic field conditions - result = MagneticFieldSvcCfg(flags) + result = AtlasFieldCacheCondAlgCfg(flags) tool = CompFactory.Rec.MuidTrackIsolation(name, **kwargs) result.setPrivateTools(tool) return result diff --git a/Reconstruction/eflowRec/python/PFHLTConfig.py b/Reconstruction/eflowRec/python/PFHLTConfig.py index 958fb4ccab4..53eb85d4e8d 100644 --- a/Reconstruction/eflowRec/python/PFHLTConfig.py +++ b/Reconstruction/eflowRec/python/PFHLTConfig.py @@ -8,8 +8,8 @@ from AthenaConfiguration.ComponentFactory import CompFactory def TrackingGeoCfg(inputFlags): result = ComponentAccumulator() - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - result.merge(MagneticFieldSvcCfg(inputFlags)) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + result.merge(AtlasFieldCacheCondAlgCfg(inputFlags)) return result diff --git a/Reconstruction/eflowRec/python/PFRun3Config.py b/Reconstruction/eflowRec/python/PFRun3Config.py index 3cfa7fa8ead..b1172537ac1 100644 --- a/Reconstruction/eflowRec/python/PFRun3Config.py +++ b/Reconstruction/eflowRec/python/PFRun3Config.py @@ -17,8 +17,8 @@ def PFFullCfg(inputFlags,**kwargs): result.merge(InputRenameCfg("xAOD::CaloClusterContainer","CaloCalTopoClusters","")) #setup magnetic field service - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - result.merge(MagneticFieldSvcCfg(inputFlags)) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + result.merge(AtlasFieldCacheCondAlgCfg(inputFlags)) #Configure topocluster algorithmsm, and associated conditions from CaloRec.CaloTopoClusterConfig import CaloTopoClusterCfg diff --git a/Reconstruction/tauRec/python/TauToolHolder.py b/Reconstruction/tauRec/python/TauToolHolder.py index 66cac72669e..e991bb42503 100644 --- a/Reconstruction/tauRec/python/TauToolHolder.py +++ b/Reconstruction/tauRec/python/TauToolHolder.py @@ -101,8 +101,8 @@ def InDetTrackSelectorToolCfg(flags): result = ComponentAccumulator() _name = sPrefix + 'InDetTrackSelectorTool' - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - result.merge(MagneticFieldSvcCfg(flags)) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + result.merge(AtlasFieldCacheCondAlgCfg(flags)) from BeamSpotConditions.BeamSpotConditionsConfig import BeamSpotCondAlgCfg result.merge(BeamSpotCondAlgCfg(flags)) diff --git a/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactoryNew.py b/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactoryNew.py index 16cda567081..f2f1460ba4a 100644 --- a/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactoryNew.py +++ b/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactoryNew.py @@ -12,8 +12,8 @@ def NITimedExtrapolatorCfg(flags, name="ISF_NITimedExtrapolator", **kwargs): mlog.debug("Start configuration") # Configure MagneticField (resolve AtlasFieldCacheCondObj dependancy) - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - result.merge(MagneticFieldSvcCfg(flags)) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + result.merge(AtlasFieldCacheCondAlgCfg(flags)) # add LAr calibration (resolve LAr dependancies) from LArConfiguration.LArElecCalibDBConfig import LArElecCalibDbCfg result.merge(LArElecCalibDbCfg(flags, ["fSampl"])) diff --git a/Tracking/Acts/ActsGeometry/python/ActsGeometryConfig.py b/Tracking/Acts/ActsGeometry/python/ActsGeometryConfig.py index ceffc3cb239..5ae67047595 100644 --- a/Tracking/Acts/ActsGeometry/python/ActsGeometryConfig.py +++ b/Tracking/Acts/ActsGeometry/python/ActsGeometryConfig.py @@ -140,11 +140,11 @@ def ActsAlignmentCondAlgCfg(configFlags, name = "ActsAlignmentCondAlg", **kwargs return result -from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg +from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg def ActsExtrapolationToolCfg(configFlags, name="ActsExtrapolationTool", **kwargs) : result=ComponentAccumulator() - acc = MagneticFieldSvcCfg(configFlags) + acc = AtlasFieldCacheCondAlgCfg(configFlags) result.merge(acc) acc = ActsTrackingGeometryToolCfg(configFlags) diff --git a/Tracking/TrkConfig/python/AtlasExtrapolationEngineConfig.py b/Tracking/TrkConfig/python/AtlasExtrapolationEngineConfig.py index 89921e073b5..ba019a31adb 100644 --- a/Tracking/TrkConfig/python/AtlasExtrapolationEngineConfig.py +++ b/Tracking/TrkConfig/python/AtlasExtrapolationEngineConfig.py @@ -6,7 +6,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory -from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg +from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg from InDetRecExample.TrackingCommon import use_tracking_geometry_cond_alg # import the ExtrapolationEngine configurable @@ -15,7 +15,7 @@ ExEngine=CompFactory.Trk.ExtrapolationEngine def AtlasExtrapolationEngineCfg( flags, name = 'Extrapolation', nameprefix='Atlas' ): result=ComponentAccumulator() - acc = MagneticFieldSvcCfg(flags) + acc = AtlasFieldCacheCondAlgCfg(flags) result.merge(acc) # get the correct TrackingGeometry setup diff --git a/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py b/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py index 37d0143cafb..33800649ce8 100644 --- a/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py +++ b/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py @@ -46,7 +46,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory -from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg +from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg import TrkConfig.AtlasExtrapolatorToolsConfig as TC # For debugging comparisons with old-style config it is helpful to have names match @@ -59,7 +59,7 @@ def AtlasExtrapolatorCfg(flags, name='AtlasExtrapolator'): result = ComponentAccumulator() - acc = MagneticFieldSvcCfg(flags) + acc = AtlasFieldCacheCondAlgCfg(flags) result.merge(acc) # PROPAGATOR DEFAULTS diff --git a/Tracking/TrkConfig/python/TrkVertexFitterUtilsConfig.py b/Tracking/TrkConfig/python/TrkVertexFitterUtilsConfig.py index 1de6e2d82c9..352d1cfe79b 100644 --- a/Tracking/TrkConfig/python/TrkVertexFitterUtilsConfig.py +++ b/Tracking/TrkConfig/python/TrkVertexFitterUtilsConfig.py @@ -4,8 +4,8 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory def FullLinearizedTrackFactoryCfg(flags, name='FullLinearizedTrkFactory', **kwargs): - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - acc = MagneticFieldSvcCfg(flags) # To produce AtlasFieldCacheCondObj + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + acc = AtlasFieldCacheCondAlgCfg(flags) # To produce AtlasFieldCacheCondObj if 'Extrapolator' not in kwargs: from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg @@ -15,8 +15,8 @@ def FullLinearizedTrackFactoryCfg(flags, name='FullLinearizedTrkFactory', **kwar return acc def AtlasFullLinearizedTrackFactoryCfg(flags, name='AtlasFullLinearizedTrkFactory', **kwargs): - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - acc = MagneticFieldSvcCfg(flags) # To produce AtlasFieldCacheCondObj + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + acc = AtlasFieldCacheCondAlgCfg(flags) # To produce AtlasFieldCacheCondObj if 'Extrapolator' not in kwargs: from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py index 51dc7aa6637..67e91836e83 100644 --- a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py +++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py @@ -40,8 +40,8 @@ def testCfg (configFlags): from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg result.merge (MuonGeoModelCfg(configFlags, forceDisableAlignment=True)) - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - result.merge (MagneticFieldSvcCfg(configFlags, UseDCS = False)) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + result.merge (AtlasFieldCacheCondAlgCfg(configFlags, UseDCS = False)) TrigL2MuonSA__MdtDataPreparator=CompFactory.TrigL2MuonSA.MdtDataPreparator result.addPublicTool (TrigL2MuonSA__MdtDataPreparator ('TrigL2MuonSA::MdtDataPreparator', OutputLevel = 1)) # noqa: ATL900 diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py index bcab24ee093..ec74cf901fb 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py @@ -107,8 +107,8 @@ def magFieldCfgCfg(flags): acc = ComponentAccumulator() acc.merge(geoModelCfg(flags)) - from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg - acc.merge( MagneticFieldSvcCfg(flags) ) + from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg + acc.merge( AtlasFieldCacheCondAlgCfg(flags) ) return acc -- GitLab From 0f22f1b8658fa3bab8fde961d0fa69ae702a5136 Mon Sep 17 00:00:00 2001 From: Goetz Gaycken Date: Fri, 29 Jul 2022 14:02:19 +0200 Subject: [PATCH 2/2] Configure magnetic field CondAlg when configuring propagators. Configure the magnetic field CondAlg where the conditions data is needed which are the propagators not the extrapolator. --- Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py | 4 ---- .../TrkConfig/python/TrkExRungeKuttaPropagatorConfig.py | 5 ++++- Tracking/TrkConfig/python/TrkExSTEP_PropagatorConfig.py | 8 +++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py b/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py index 33800649ce8..d82a1ed2d05 100644 --- a/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py +++ b/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py @@ -46,7 +46,6 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory -from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg import TrkConfig.AtlasExtrapolatorToolsConfig as TC # For debugging comparisons with old-style config it is helpful to have names match @@ -59,9 +58,6 @@ def AtlasExtrapolatorCfg(flags, name='AtlasExtrapolator'): result = ComponentAccumulator() - acc = AtlasFieldCacheCondAlgCfg(flags) - result.merge(acc) - # PROPAGATOR DEFAULTS from TrkConfig.TrkExRungeKuttaPropagatorConfig import ( diff --git a/Tracking/TrkConfig/python/TrkExRungeKuttaPropagatorConfig.py b/Tracking/TrkConfig/python/TrkExRungeKuttaPropagatorConfig.py index 98e4937ea4e..2946bad9911 100644 --- a/Tracking/TrkConfig/python/TrkExRungeKuttaPropagatorConfig.py +++ b/Tracking/TrkConfig/python/TrkExRungeKuttaPropagatorConfig.py @@ -4,10 +4,13 @@ # for track parameters propagation through magnetic field. from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory - +from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg def RungeKuttaPropagatorCfg(flags, name='AtlasRungeKuttaPropagator', **kwargs): result = ComponentAccumulator() + acc = AtlasFieldCacheCondAlgCfg(flags) + result.merge(acc) + kwargs.setdefault("IncludeBgradients", False) # Just so this doesn't seem unconfigured. Real fix is to use default name. tool = CompFactory.Trk.RungeKuttaPropagator(name, **kwargs) result.setPrivateTools(tool) diff --git a/Tracking/TrkConfig/python/TrkExSTEP_PropagatorConfig.py b/Tracking/TrkConfig/python/TrkExSTEP_PropagatorConfig.py index 5eb49576818..787ffbe0a7b 100644 --- a/Tracking/TrkConfig/python/TrkExSTEP_PropagatorConfig.py +++ b/Tracking/TrkConfig/python/TrkExSTEP_PropagatorConfig.py @@ -11,12 +11,15 @@ # of a particle going through a dense block of material. from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory - +from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg def AtlasSTEP_PropagatorCfg(flags, name='AtlasSTEP_Propagator', **kwargs): result = ComponentAccumulator() + acc = AtlasFieldCacheCondAlgCfg(flags) + result.merge(acc) + kwargs.setdefault("MaterialEffects", True) # Default value, set to allow non-default name for compatibility with legacy config result.setPrivateTools(CompFactory.Trk.STEP_Propagator(name, **kwargs)) return result @@ -33,6 +36,9 @@ def fatrasSTEP_PropagatorCfg(flags, name="ISF_FatrasSTEP_Propagator", **kwargs): result = ComponentAccumulator() + acc = AtlasFieldCacheCondAlgCfg(flags) + result.merge(acc) + kwargs.setdefault("MomentumCutOff", flags.Sim.Fatras.MomCutOffSec) kwargs.setdefault("SimulationMode", True) -- GitLab