Update configuration for magField map for online

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) 

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)