diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py b/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py
index 22fccb9d3d1c05e53409654b8d293909b254c5d2..9c7a665a2a7277381d2d93e3704956abe55d5f1d 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py
@@ -10,7 +10,7 @@ from PixelConditionsTools.PixelDCSConditionsConfig import PixelDCSConditionsCfg
from PixelConditionsAlgorithms.PixelConditionsConfig import PixelConfigCondAlgCfg
def PixelConditionsSummaryCfg(flags, name="PixelConditionsSummary", **kwargs):
- """Return configured ComponentAccumulator and tool for PixelDCSConditions"""
+ """Return configured ComponentAccumulator with tool for Pixel Conditions"""
acc = ComponentAccumulator()
kwargs.setdefault("UseDCSState", False)
kwargs.setdefault("UseByteStream", False)
@@ -18,7 +18,7 @@ def PixelConditionsSummaryCfg(flags, name="PixelConditionsSummary", **kwargs):
kwargs.setdefault("UseDeadMap", True)
PixelDeadMapFolder = "/PIXEL/PixMapOverlay"
if kwargs["UseDCSState"]:
- acc.merge(PixelDCSConditionsCfg(flags, DCSConditionsTool=DCSTool))
+ acc.merge(PixelDCSConditionsCfg(flags))
if kwargs["UseTDAQ"]:
PixelTDAQFolder = "/TDAQ/Resources/ATLAS/PIXEL/Modules"
acc.merge(addFolders(flags, PixelTDAQFolder, "TDAQ_ONL", "CondAttrListCollection"))
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
index eae6c80e1d10a7992d47e751fd9d807ebe1052d3..4a114ead970e52b78c9016013cddf20be0a306da 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
@@ -63,7 +63,7 @@ def SensorSim3DToolCfg(flags, name="SensorSim3DTool", **kwargs):
"""Return ComponentAccumulator with configured SensorSim3DTool"""
acc = PixelSiPropertiesCfg(flags)
SiTool = acc.popPrivateTools()
- LorentzTool = acc.popToolsAndMerge(PixelLorentzAngleCfg(flags))
+ acc.popToolsAndMerge(PixelLorentzAngleCfg(flags))
kwargs.setdefault("SiPropertiesTool", SiTool)
acc.setPrivateTools(SensorSim3DTool(name, **kwargs))
return acc
diff --git a/LArCalorimeter/LArCabling/python/LArCablingConfig.py b/LArCalorimeter/LArCabling/python/LArCablingConfig.py
index 1a8ddf0bfb8a3d2d4a532417650d144008383979..c11e5193da032015239cf8d11e2c8afd61b6fdab 100644
--- a/LArCalorimeter/LArCabling/python/LArCablingConfig.py
+++ b/LArCalorimeter/LArCabling/python/LArCablingConfig.py
@@ -1,9 +1,8 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from __future__ import print_function
-
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from IOVDbSvc.IOVDbSvcConfig import IOVDbSvcCfg,addFolders
+from IOVDbSvc.IOVDbSvcConfig import IOVDbSvcCfg, addFolders
from LArRecUtils.LArRecUtilsConf import LArOnOffMappingAlg, LArFebRodMappingAlg, LArCalibLineMappingAlg
def _larCablingCfg(configFlags,algo,folder):
@@ -55,7 +54,6 @@ def LArIdMapCfg(configFlags):
if __name__ == "__main__":
- from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaCommon.Configurable import Configurable
Configurable.configurableRun3Behavior=1
diff --git a/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py b/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py
index d8ac1c03e3a6b35e7c1d449c020bc77649b94ee1..c0c714d742c392bea2d8d58107d52faf4950f30d 100644
--- a/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py
+++ b/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator,ConfigurationError
-from IOVDbSvc.IOVDbSvcConfig import IOVDbSvcCfg,addFolderList,addFolders
+from IOVDbSvc.IOVDbSvcConfig import IOVDbSvcCfg,addFolderList
from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArDAC2uAMC_LArDAC2uASym_ as LArDAC2uASymAlg
from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArMinBiasAverageMC_LArMinBiasAverageSym_ as LArMinBiasAverageSymAlg
@@ -11,8 +11,6 @@ from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArRampMC_LArRampSym
from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArfSamplMC_LArfSamplSym_ as LArfSamplSymAlg
from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LAruA2MeVMC_LAruA2MeVSym_ as LAruA2MeVSymAlg
from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArAutoCorrMC_LArAutoCorrSym_ as LArAutoCorrSymAlg
-from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArShape32MC_LArShape32Sym_ as LArShapeSymAlg
-from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArMphysOverMcalMC_LArMphysOverMcalSym_ as LArMPhysOverMcalSymAlg
from LArCabling.LArCablingConfig import LArOnOffIdMappingCfg
@@ -34,7 +32,7 @@ def LArElecCalibDbCfg(ConfigFlags,condObjs):
return LArElecCalibDBMCCfg(ConfigFlags,condObjs)
#Check run 1 case:
- if ConfigFlags.IOVDb.DatabaseInstance is "COMP200":
+ if ConfigFlags.IOVDb.DatabaseInstance == "COMP200":
return LArElecCalibDBRun1Cfg(ConfigFlags,condObjs)
#Everything else, eg run 2 (and 3?) data
@@ -100,7 +98,7 @@ def LArElecCalibDBRun1Cfg(ConfigFlags,condObjs):
"Shape":("/LAR/ElecCalibOfl/Shape/RTM/"+ ConfigFlags.LAr.OFCShapeFolder if len(ConfigFlags.LAr.OFCShapeFolder)>0 else "5samples1phase","LAr_OFL","LArShapeComplete",None),
}
-
+ result=ComponentAccumulator()
folderlist=[]
for condData in condObjs:
@@ -110,7 +108,7 @@ def LArElecCalibDBRun1Cfg(ConfigFlags,condObjs):
except KeyError:
raise ConfigurationError("No conditions data %s found for Run-1 data" % condData)
if (calg):
- result.addCondAlgo(calg(ReadKey="LAr"+condObj,WriteKey="LAr"+condObj+"Sym"))
+ result.addCondAlgo(calg(ReadKey="LAr"+obj,WriteKey="LAr"+obj+"Sym"))
result.merge(addFolderList(ConfigFlags,folderlist))
return result
@@ -131,7 +129,6 @@ def LArElecCalibDBMCCfg(ConfigFlags,folders):
result=ComponentAccumulator()
#Add cabling
- from LArCabling.LArCablingCongif import LArOnOffIdMappingCfg
result.merge(LArOnOffIdMappingCfg(ConfigFlags))
from LArRecUtils.LArRecUtilsConf import LArMCSymCondAlg
result.addCondAlgo(LArMCSymCondAlg(ReadKey="LArOnOffIdMap"))
@@ -160,7 +157,6 @@ if __name__ == "__main__":
ConfigFlags.Input.Files = defaultTestFiles.RAW
ConfigFlags.lock()
- from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
acc = LArElecCalibDbCfg(ConfigFlags,("Ramp",))#,"OFC","uA2MeV","MphysOverMcal"))
f=open('test.pkl','w')
diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py
index e09712c13456da17f34e7d43ed6d290a407225f8..0d17f04d064aa2b73c88a9b4316cf3277ae66cf1 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py
@@ -1,4 +1,3 @@
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AtlasGeoModel.GeoModelConfig import GeoModelCfg
from IOVDbSvc.IOVDbSvcConfig import addFolders
@@ -33,7 +32,6 @@ if __name__ == "__main__":
ConfigFlags.Input.Files = defaultTestFiles.RAW
ConfigFlags.lock()
- from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
acc = LArGMCfg(ConfigFlags)
f=open('LArGMCfg.pkl','w')
acc.store(f)
diff --git a/LArCalorimeter/LArRawConditions/python/LArRawConditionsConfig.py b/LArCalorimeter/LArRawConditions/python/LArRawConditionsConfig.py
index 9bad4f6e6eabf389b00fdf5d1ccbf7b2dd166fd3..956da8961c199686da544628908b38e015b77699 100644
--- a/LArCalorimeter/LArRawConditions/python/LArRawConditionsConfig.py
+++ b/LArCalorimeter/LArRawConditions/python/LArRawConditionsConfig.py
@@ -2,7 +2,6 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
"""
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from IOVDbSvc.IOVDbSvcConfig import addFolders
from LArCabling.LArCablingConfig import LArIdMapCfg
from LArBadChannelTool.LArBadChannelConfig import LArBadChannelCfg, LArBadFebCfg
diff --git a/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py b/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
index 8dde42b4548b4220d2216a4a69c8bc55fda4e987..6d417eedbf4b4b859981a3db67a9c2599cd2a36e 100644
--- a/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
@@ -18,13 +18,13 @@ def LArADC2MeVCondAlgCfg(configFlags):
if isMC:
requiredConditons=["Ramp","DAC2uA","uA2MeV"]
- if not configFlags.LAr.hasMphys():
+ if not configFlags.LAr.HasMphys:
theADC2MeVCondAlg.LArMphysOverMcalKey="" #No MphysOVerMcal
else:
theADC2MeVCondAlg.LArMphysOverMcalKey="LArMphysOverMcalSym"
requiredConditons+=["MphysOverMcal",]
- if not larCondFlags.hasHVCorr():
+ if not configFlags.LAr.HasHVCorr:
theADC2MeVCondAlg.LArHVScaleCorrKey=""
else:
requiredConditons+=["HVScale",]
diff --git a/LArCalorimeter/LArRecUtils/python/LArFebConfigCondAlgConfig.py b/LArCalorimeter/LArRecUtils/python/LArFebConfigCondAlgConfig.py
index 0ebe0ee66096049a962f7a68d83bbc0ea98cfecb..cd09e132cef5c8c6208023c881af1c1b91d75774 100644
--- a/LArCalorimeter/LArRecUtils/python/LArFebConfigCondAlgConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArFebConfigCondAlgConfig.py
@@ -1,5 +1,4 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from IOVDbSvc.IOVDbSvcConfig import addFolders
from LArRecUtils.LArRecUtilsConf import LArFEBConfigCondAlg
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigNew.py b/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigNew.py
index f97223be9e4569669d2990bef522ee86ce446a76..7fa527d20fd73c5f747ed5ea586c3ff28451b719 100644
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigNew.py
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigNew.py
@@ -7,7 +7,6 @@ from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
from RPC_Digitization.RPC_DigitizationConf import RpcDigitizationTool, RPC_Digitizer
from PileUpComps.PileUpCompsConf import PileUpXingFolder
-from IOVDbSvc.IOVDbSvcConfig import addFolders
# The earliest and last bunch crossing times for which interactions will be sent
# to the RpcDigitizationTool.
@@ -37,8 +36,6 @@ def RPC_DigitizationToolCfg(flags, name="RPC_DigitizationTool", **kwargs):
kwargs.setdefault("OutputSDOName", flags.Overlay.BkgPrefix + "RPC_SDO")
else:
kwargs.setdefault("OutputSDOName", "RPC_SDO")
- # folder for RPCCondSummarySvc
- #acc.merge(addFolders(flags, "/RPC/DQMF/ELEMENT_STATUS", "RPC_OFL")) ## already in RpcCondDbAlgCfg
# config
kwargs.setdefault("DeadTime", 100)
kwargs.setdefault("PatchForRpcTime", True)
diff --git a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
index c94e0699ec6190c5b900d3d68321746dcef30ce6..ade1fecbd2bf452c2dece6014e6b1700f990184a 100755
--- a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
+++ b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
@@ -8,7 +8,6 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
# for documentation of method X, see Simulation__X._propertyDocDct
from BeamEffects.BeamEffectsConf import Simulation__GenEventValidityChecker
from BeamEffects.BeamEffectsConf import Simulation__GenEventRotator
-from BeamEffects.BeamEffectsConf import Simulation__GenEventBeamEffectBooster
from BeamEffects.BeamEffectsConf import Simulation__GenEventVertexPositioner
from BeamEffects.BeamEffectsConf import Simulation__VertexBeamCondPositioner
from BeamEffects.BeamEffectsConf import Simulation__VertexPositionFromFile
@@ -65,7 +64,7 @@ def makeVertexBeamCondPositioner(ConfigFlags,name="VertexBeamCondPositioner", **
#from BeamEffectsConfigFlagsTest import ConfigFlags
from IOVDbSvc.IOVDbSvcConfig import addFoldersSplitOnline
from BeamSpotConditions.BeamSpotConditionsConf import BeamSpotCondAlg
- from RngComps.RandomServices import RNG, AthEngines
+ from RngComps.RandomServices import AthEngines
result = ComponentAccumulator()
diff --git a/Simulation/Digitization/python/DigitizationConfigFlags.py b/Simulation/Digitization/python/DigitizationConfigFlags.py
index 4a59080a826b1ae574865e7c4d9c19088f1befe2..26dff75b9d08184963f71ac66661ee176d1f68a9 100644
--- a/Simulation/Digitization/python/DigitizationConfigFlags.py
+++ b/Simulation/Digitization/python/DigitizationConfigFlags.py
@@ -10,7 +10,7 @@ def getSpecialConfiguration(flags):
"""Return a dict of Special configuration as parsed from flags.Input.Files"""
if len(flags.Input.Files) > 1:
log.info("Multiple input files. Using the first for Digitization special configuration.")
- log.info("Obtaining Digitization special configuration from %s." % flags.Input.Files[0])
+ log.info("Obtaining Digitization special configuration from %s", flags.Input.Files[0])
File = AthFile.fopen(flags.Input.Files[0])
# extract the special config list
tag_info = File.infos.get("tag_info", {})