From a7401299d9837b167337bbf1667bbd66d0934fd6 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 6 Mar 2024 14:29:37 +0100
Subject: [PATCH] MagFieldServices: delete legacy configuration
---
.../python/MagFieldServicesConfigDb.py | 8 ---
.../python/MagFieldServicesSetup.py | 52 -------------------
.../MagFieldServices/python/SetupField.py | 23 --------
3 files changed, 83 deletions(-)
delete mode 100644 MagneticField/MagFieldServices/python/MagFieldServicesConfigDb.py
delete mode 100644 MagneticField/MagFieldServices/python/MagFieldServicesSetup.py
delete mode 100755 MagneticField/MagFieldServices/python/SetupField.py
diff --git a/MagneticField/MagFieldServices/python/MagFieldServicesConfigDb.py b/MagneticField/MagFieldServices/python/MagFieldServicesConfigDb.py
deleted file mode 100644
index bf66b127b071..000000000000
--- a/MagneticField/MagFieldServices/python/MagFieldServicesConfigDb.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# database entries for https://twiki.cern.ch/twiki/bin/view/AtlasComputing/ConfiguredFactory#Factory_functions_vs_derived_cla
-# Valerio Ippolito - Harvard University
-from AthenaCommon.CfgGetter import addAlgorithm
-
-addAlgorithm('MagFieldServices.MagFieldServicesSetup.GetFieldMapCondAlg', 'AtlasFieldMapCondAlg')
-addAlgorithm('MagFieldServices.MagFieldServicesSetup.GetFieldCacheCondAlg', 'AtlasFieldCacheCondAlg')
diff --git a/MagneticField/MagFieldServices/python/MagFieldServicesSetup.py b/MagneticField/MagFieldServices/python/MagFieldServicesSetup.py
deleted file mode 100644
index f4441687f066..000000000000
--- a/MagneticField/MagFieldServices/python/MagFieldServicesSetup.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
-
-# JobOption fragment to set up the magnetic field services and algorithms
-# Valerio Ippolito - Harvard University
-
-# inspired by https://svnweb.cern.ch/trac/atlasoff/browser/MuonSpectrometer/MuonCnv/MuonCnvExample/trunk/python/MuonCalibConfig.py
-
-from AthenaCommon.Logging import logging
-logging.getLogger().info("Importing %s", __name__)
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-from AthenaCommon import CfgMgr
-
-#--------------------------------------------------------------
-
-def AtlasFieldCacheCondAlg(name="AtlasFieldCacheCondAlg",**kwargs):
- if athenaCommonFlags.isOnline():
- kwargs.setdefault( "UseDCS", False )
- # currents for scaling wrt to map currents
- kwargs.setdefault( "UseSoleCurrent", 7730 )
- kwargs.setdefault( "UseToroCurrent", 20400 )
- kwargs.setdefault( "LockMapCurrents", True )
- # consider field off if current is below these values:
- kwargs.setdefault( "SoleMinCurrent", 160 ) # Standby current is 150A
- kwargs.setdefault( "ToroMinCurrent", 210 ) # Standby current is 200A
- else:
- kwargs.setdefault( "UseDCS", True )
- return CfgMgr.MagField__AtlasFieldCacheCondAlg(name,**kwargs)
-
-def AtlasFieldMapCondAlg(name="AtlasFieldMapCondAlg",**kwargs):
- if athenaCommonFlags.isOnline():
- # online does not use DCS
- kwargs.setdefault( "UseMapsFromCOOL", False )
- # load map on start() for HLT
- kwargs.setdefault( "LoadMapOnStart", hasattr(svcMgr, 'HltEventLoopMgr') )
- # consider field off if current is below these values:
- kwargs.setdefault( "SoleMinCurrent", 160 ) # Standby current is 150A
- kwargs.setdefault( "ToroMinCurrent", 210 ) # Standby current is 200A
-
- return CfgMgr.MagField__AtlasFieldMapCondAlg(name,**kwargs)
-
-
-
-def H8FieldSvc(name="H8FieldSvc",**kwargs):
- return CfgMgr.MagField__H8FieldSvc(name,**kwargs)
-
-def GetFieldCacheCondAlg(name="AtlasFieldCacheCondAlg",**kwargs):
- return AtlasFieldCacheCondAlg(name, **kwargs)
-
-def GetFieldMapCondAlg(name="AtlasFieldMapCondAlg",**kwargs):
- return AtlasFieldMapCondAlg(name, **kwargs)
diff --git a/MagneticField/MagFieldServices/python/SetupField.py b/MagneticField/MagFieldServices/python/SetupField.py
deleted file mode 100755
index 0b8bcf4d0dc6..000000000000
--- a/MagneticField/MagFieldServices/python/SetupField.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-# MagFieldServices
-#--------------------------------------------------------------
-
-from AthenaCommon.Logging import logging
-logging.getLogger().info("Importing %s", __name__)
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-
-
-# initialise required conditions DB folders
-from IOVDbSvc.CondDB import conddb
-conddb.addFolderSplitMC('GLOBAL','/GLOBAL/BField/Maps <noover/>','/GLOBAL/BField/Maps <noover/>', className="CondAttrListCollection")
-if not athenaCommonFlags.isOnline():
- conddb.addFolder('DCS_OFL','/EXT/DCS/MAGNETS/SENSORDATA', className="CondAttrListCollection")
-
-from AthenaCommon.CfgGetter import getAlgorithm
-from AthenaCommon.AlgSequence import AthSequencer
-condSequence = AthSequencer("AthCondSeq")
-condSequence += getAlgorithm( "AtlasFieldMapCondAlg" )
-condSequence += getAlgorithm( "AtlasFieldCacheCondAlg" )
-
--
GitLab