From 9066a5b40bd3a31a69cfb33e51d9258046db0aa9 Mon Sep 17 00:00:00 2001
From: R D Schaffer <r.d.schaffer@cern.ch>
Date: Fri, 28 Aug 2020 13:21:00 +0000
Subject: [PATCH] Update configuration for magField map for online
---
.../python/MagFieldServicesConfig.py | 12 +++++++-----
.../python/MagFieldServicesSetup.py | 15 ++++-----------
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
index 9bf7287549b1..6183fb6b4db1 100644
--- a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
+++ b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
@@ -40,12 +40,13 @@ def MagneticFieldSvcCfg(flags, **kwargs):
"name": "AtlasFieldMapCondAlg",
}
if flags.Common.isOnline:
- # Set UseMapsFromCOOL for online to force the map creation at start
- afmArgs.update( UseMapsFromCOOL = False )
- else:
- # Otherwise read from cool
- afmArgs.update( UseMapsFromCOOL = True )
+ # online has the map loaded at start
+ afmArgs.update( LoadMapOnStart = True )
+
+ # UseMapsFromCOOL is default for standard running
afmArgs.update( UseMapsFromCOOL = True )
+ # However, for tests, this must be turned off. It is detected
+ # when UseDCS is set to False - UseDCS is directly an option for the field cache alg
if 'UseDCS' in kwargs and not kwargs['UseDCS']:
afmArgs['UseMapsFromCOOL'] = False
mag_field_map_cond_alg = CompFactory.MagField.AtlasFieldMapCondAlg(**afmArgs)
@@ -62,6 +63,7 @@ def MagneticFieldSvcCfg(flags, **kwargs):
afcArgs.update( LockMapCurrents = True )
else:
afcArgs.update( UseDCS = True )
+ # For test, UseDCS is set to False
if 'UseDCS' in kwargs:
afcArgs['UseDCS'] = kwargs['UseDCS']
mag_field_cache_cond_alg = CompFactory.MagField.AtlasFieldCacheCondAlg(**afcArgs)
diff --git a/MagneticField/MagFieldServices/python/MagFieldServicesSetup.py b/MagneticField/MagFieldServices/python/MagFieldServicesSetup.py
index dc86e0845f83..832602411d1d 100644
--- a/MagneticField/MagFieldServices/python/MagFieldServicesSetup.py
+++ b/MagneticField/MagFieldServices/python/MagFieldServicesSetup.py
@@ -34,22 +34,15 @@ def AtlasFieldCacheCondAlg(name="AtlasFieldCacheCondAlg",**kwargs):
kwargs.setdefault( "LockMapCurrents", True )
else:
kwargs.setdefault( "UseDCS", True )
- # kwargs.setdefault( "UseDCS", False )
- # kwargs.setdefault( "UseSoleCurrent", 12000 )
- # kwargs.setdefault( "UseToroCurrent", 20400 )
return CfgMgr.MagField__AtlasFieldCacheCondAlg(name,**kwargs)
def AtlasFieldMapCondAlg(name="AtlasFieldMapCondAlg",**kwargs):
if athenaCommonFlags.isOnline():
- # The following are the defaults - added here to be clear
+ # For old tests, must update field from defautl jobOpt
kwargs.setdefault( "UseMapsFromCOOL", False )
- # kwargs.setdefault( "MapSoleCurrent", 7730 )
- # kwargs.setdefault( "MapToroCurrent", 20400 )
- else:
- # The following are the defaults - added here to be clear
- kwargs.setdefault( "UseMapsFromCOOL", True )
- # kwargs.setdefault( "MapSoleCurrent", 7730 )
- # kwargs.setdefault( "MapToroCurrent", 20400 )
+ # online has the map loaded at start (for the future - uncomment if needed)
+ # kwargs.setdefault( "LoadMapOnStart", True )
+
return CfgMgr.MagField__AtlasFieldMapCondAlg(name,**kwargs)
--
GitLab