From c0edc832f34c861de6cdaef128966e8c0267c7cb Mon Sep 17 00:00:00 2001
From: Walter Lampl <Walter.Lampl@cern.ch>
Date: Thu, 9 Apr 2020 09:51:24 +0200
Subject: [PATCH] Synatx adjustments for GaudiConfig2: Calorimeters
---
.../CaloMonitoring/python/LArCellMonAlg.py | 3 +-
.../CaloRec/python/CaloBCIDAvgAlgConfig.py | 8 +--
.../python/CaloBCIDCoeffsCondAlgConfig.py | 7 +-
.../python/CaloCellContainerAliasAlgConfig.py | 4 +-
.../python/CaloCellContainerAliasAlg_test.py | 3 +-
.../python/CaloThinCellsByClusterAlgConfig.py | 3 +-
.../python/CaloThinCellsByClusterAlg_test.py | 3 +-
.../CaloThinCellsBySamplingAlgConfig.py | 4 +-
.../python/CaloThinCellsBySamplingAlg_test.py | 3 +-
.../CaloRec/python/CaloTopoClusterConfig.py | 5 +-
.../CaloEstimatedGainToolConfig_test.ref | 72 +------------------
.../python/LArElecCalibDBConfig.py | 43 +++++------
.../python/LArG4BarrelConfigNew.py | 16 ++---
.../LArG4/LArG4EC/python/LArG4ECConfigNew.py | 20 +++---
.../LArG4FCAL/python/LArG4FCALConfigNew.py | 2 +-
.../LArG4HEC/python/LArG4HECConfigNew.py | 8 +--
.../LArG4/LArG4SD/python/LArG4SDToolConfig.py | 18 ++---
.../LArMonitoring/python/LArNoisyROMonAlg.py | 4 +-
.../LArROD/python/LArDigitThinnerConfig.py | 4 +-
.../python/LArADC2MeVCondAlgConfig.py | 4 +-
.../python/TileAutoCorrelationConfig.py | 6 +-
.../python/TileBadChannelsConfig.py | 5 +-
.../python/TileCablingSvcConfig.py | 4 +-
.../python/TileConditionsConfig.py | 12 ++--
.../python/TileDSPThresholdConfig.py | 6 +-
.../python/TileEMScaleConfig.py | 5 +-
.../python/TileIntegratorConfig.py | 6 +-
.../TileConditions/python/TileMuIDConfig.py | 6 +-
.../TileConditions/python/TileOFCConfig.py | 4 +-
.../python/TilePulseShapeConfig.py | 6 +-
.../python/TileSampleNoiseConfig.py | 6 +-
.../TileConditions/python/TileTMDBConfig.py | 5 +-
.../TileConditions/python/TileTimingConfig.py | 6 +-
.../TileL2Algs/python/TileL2Config.py | 6 +-
.../python/TileJetMonitorAlgorithm.py | 20 +++---
.../python/TileMBTSMonitorAlgorithm.py | 5 +-
.../python/TileDigitsFilterConfig.py | 12 ++--
.../python/TileRawChannelBuilderFitConfig.py | 6 +-
.../python/TileRawChannelBuilderMFConfig.py | 3 +-
.../python/TileRawChannelBuilderOptConfig.py | 7 +-
.../python/TileRawChannelMakerConfig.py | 8 +--
.../python/TileDigitsMakerConfig.py | 6 +-
.../python/TileMuonReceiverConfig.py | 2 +-
43 files changed, 165 insertions(+), 221 deletions(-)
diff --git a/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py b/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
index 74fe923be63..4d5335fb59d 100644
--- a/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
+++ b/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
@@ -40,7 +40,8 @@ def LArCellMonConfig(inputFlags):
isCosmics = ( inputFlags.Beam.Type == 'cosmics' ) #will use this switch many times later
- from CaloMonitoring.CaloMonitoringConf import LArCellMonAlg
+ from AthenaConfiguration.ComponentFactory import CompFactory
+ LArCellMonAlg=CompFactory.LArCellMonAlg
algname='LArCellMonAlg'
if isCosmics:
algname=algname+'Cosmics'
diff --git a/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py b/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
index b92ee8e046a..be16b0f5ad8 100644
--- a/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
@@ -34,10 +34,11 @@ def CaloBCIDAvgAlgCfg (flags):
result.merge(addFolderList(flags, (('/LAR/ElecCalibOfl/LArPileupShape<key>LArShape32</key>','LAR_OFL','LArShape32MC'),
('/LAR/ElecCalibOfl/LArPileupAverage','LAR_OFL','LArMinBiasAverageMC')) ))
- from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArMinBiasAverageMC_LArMinBiasAverageSym_ as LArMinBiasAverageSymAlg
+
+ LArMinBiasAverageSymAlg=CompFactory.getComp("LArSymConditionsAlg<LArMinBiasAverageMC, LArMinBiasAverageSym>")
result.addCondAlgo(LArMinBiasAverageSymAlg("LArPileUpAvgSymCondAlg",ReadKey="LArPileupAverage",WriteKey="LArPileupAverageSym"))
- from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArShape32MC_LArShape32Sym_ as LArShapeSymAlg
+ LArShapeSymAlg=CompFactory.getComp("LArSymConditionsAlg<LArShape32MC, LArShape32Sym>")
result.addCondAlgo(LArShapeSymAlg("LArPileUpShapeSymCondAlg",ReadKey="LArShape32",WriteKey="LArShape32Sym"))
alg = CaloBCIDAvgAlg (isMC = False,
@@ -56,8 +57,7 @@ def CaloBCIDAvgAlgCfg (flags):
result.merge(addFolderList(flags, (('/LAR/ElecCalibMC/Shape','LAR_OFL','LArShape32MC'),
('/LAR/ElecCalibMC/LArPileupAverage', 'LAR_OFL', 'LArMinBiasAverageMC')) ))
-
- from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArMinBiasAverageMC_LArMinBiasAverageSym_ as LArMinBiasAverageSymAlg
+ LArMinBiasAverageSymAlg=CompFactory.getComp("LArSymConditionsAlg<LArMinBiasAverageMC, LArMinBiasAverageSym>")
result.addCondAlgo(LArMinBiasAverageSymAlg("LArPileUpAvgSymCondAlg",ReadKey="LArPileupAverage",WriteKey="LArPileupAverageSym"))
alg = CaloBCIDAvgAlg (isMC = True,
diff --git a/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py b/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py
index 972582d2d02..3cede4d4b81 100644
--- a/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py
@@ -28,10 +28,10 @@ def CaloBCIDCoeffsCondAlgCfg (flags):
result.merge(addFolderList(flags, (('/LAR/ElecCalibOfl/LArPileupShape<key>LArShape32</key>','LAR_OFL','LArShape32MC'),
('/LAR/ElecCalibOfl/LArPileupAverage','LAR_OFL','LArMinBiasAverageMC')) ))
- from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArMinBiasAverageMC_LArMinBiasAverageSym_ as LArMinBiasAverageSymAlg
+ LArMinBiasAverageSymAlg=CompFactory.getComp("LArSymConditionsAlg<LArMinBiasAverageMC,LArMinBiasAverageSym>")
result.addCondAlgo(LArMinBiasAverageSymAlg("LArPileUpAvgSymCondAlg",ReadKey="LArPileupAverage",WriteKey="LArPileupAverageSym"))
- from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArShape32MC_LArShape32Sym_ as LArShapeSymAlg
+ LArShapeSymAlg=CompFactory.getComp("LArSymConditionsAlg<LArShape32MC,LArShape32Sym>")
result.addCondAlgo(LArShapeSymAlg("LArPileUpShapeSymCondAlg",ReadKey="LArShape32",WriteKey="LArShape32Sym"))
ShapeKey = 'LArShape32Sym'
@@ -46,8 +46,7 @@ def CaloBCIDCoeffsCondAlgCfg (flags):
result.merge(addFolderList(flags, (('/LAR/ElecCalibMC/Shape','LAR_OFL','LArShape32MC'),
('/LAR/ElecCalibMC/LArPileupAverage', 'LAR_OFL', 'LArMinBiasAverageMC')) ))
-
- from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArMinBiasAverageMC_LArMinBiasAverageSym_ as LArMinBiasAverageSymAlg
+ LArMinBiasAverageSymAlg=CompFactory.getComp("LArSymConditionsAlg<LArMinBiasAverageMC,LArMinBiasAverageSym>")
result.addCondAlgo(LArMinBiasAverageSymAlg("LArPileUpAvgSymCondAlg",ReadKey="LArPileupAverage",WriteKey="LArPileupAverageSym"))
ShapeKey = 'LArShapeSym'
diff --git a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py
index b703e79953b..cad7da2b3ca 100644
--- a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py
@@ -5,14 +5,14 @@
# Purpose: Configure CaloCellContainerAliasAlg.
from __future__ import print_function
-
+from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
def CaloCellContainerAliasAlgCfg (flags, alias, cells = 'AllCalo'):
result = ComponentAccumulator()
- from CaloRec.CaloRecConf import CaloCellContainerAliasAlg
+ CaloCellContainerAliasAlg=CompFactory.CaloCellContainerAliasAlg
alg = CaloCellContainerAliasAlg ('CaloCellContainerAliasAlg_' + alias,
Alias = alias,
Cells = cells)
diff --git a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
index 302aec1dae7..5db4f6291ef 100644
--- a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
+++ b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
@@ -11,6 +11,7 @@ from __future__ import print_function
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaPython.PyAthenaComps import Alg, StatusCode
import ROOT
@@ -43,7 +44,7 @@ def testCfg (configFlags):
result.addEventAlgo (CreateDataAlg ('CreateDataAlg'))
- from CaloRec.CaloRecConf import CaloCellContainerAliasAlg
+ CaloCellContainerAliasAlg=CompFactory.CaloCellContainerAliasAlg
result.addEventAlgo (CaloCellContainerAliasAlg ('aliasAlg',
Cells = 'AllCalo',
Alias = 'CellAlias'))
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py
index 2c7b7c2be27..4ad68bcbf3f 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py
@@ -6,6 +6,7 @@
from __future__ import print_function
+from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -14,7 +15,7 @@ def CaloThinCellsByClusterAlgCfg (flags, streamName, clusters,
cells = 'AllCalo'):
result = ComponentAccumulator()
- from CaloRec.CaloRecConf import CaloThinCellsByClusterAlg
+ CaloThinCellsByClusterAlg=CompFactory.CaloThinCellsByClusterAlg
alg = CaloThinCellsByClusterAlg ('CaloThinCellsByClusterAlg_' + clusters,
StreamName = streamName,
Clusters = clusters,
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
index a134b044e44..faa5e5ed87b 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
@@ -11,6 +11,7 @@ from __future__ import print_function
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaPython.PyAthenaComps import Alg, StatusCode
from math import pi
import ROOT
@@ -123,7 +124,7 @@ def testCfg (configFlags):
result.addEventAlgo (CreateDataAlg ('CreateDataAlg'))
- from CaloRec.CaloRecConf import CaloThinCellsByClusterAlg
+ CaloThinCellsByClusterAlg=CompFactory.CaloThinCellsByClusterAlg
result.addEventAlgo (CaloThinCellsByClusterAlg ('thinAlg',
StreamName = 'StreamAOD',
Clusters = 'Clusters',
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py
index 428315edfd3..ad967036be5 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py
@@ -5,7 +5,7 @@
# Purpose: Configure CaloThinCellsBySamplingAlg.
from __future__ import print_function
-
+from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -14,7 +14,7 @@ def CaloThinCellsBySamplingAlgCfg (flags, streamName,
cells = 'AllCalo'):
result = ComponentAccumulator()
- from CaloRec.CaloRecConf import CaloThinCellsBySamplingAlg
+ CaloThinCellsBySamplingAlg=CompFactory.CaloThinCellsBySamplingAlg
alg = CaloThinCellsBySamplingAlg ('CaloThinCellsBySamplingAlg_' + '_'.join (samplings),
StreamName = streamName,
SamplingCellsName = samplings,
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
index aaad18e891e..a446fd63102 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
@@ -11,6 +11,7 @@ from __future__ import print_function
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaPython.PyAthenaComps import Alg, StatusCode
import ROOT
@@ -63,7 +64,7 @@ def testCfg (configFlags):
result.addEventAlgo (CreateDataAlg ('CreateDataAlg'))
- from CaloRec.CaloRecConf import CaloThinCellsBySamplingAlg
+ CaloThinCellsBySamplingAlg=CompFactory.CaloThinCellsBySamplingAlg
result.addEventAlgo (CaloThinCellsBySamplingAlg ('thinAlg',
StreamName = 'StreamAOD',
SamplingCellsName = ['EMB3',
diff --git a/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py b/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py
index ae53e28c525..652e36fccc5 100644
--- a/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py
+++ b/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py
@@ -236,8 +236,9 @@ def getTopoCalibMoments(configFlags):
def CaloTopoClusterCfg(configFlags,cellsname="AllCalo",clustersname="",doLCCalib=None,sequenceName='AthAlgSeq'):
result=ComponentAccumulator()
if (sequenceName != 'AthAlgSeq'):
- from AthenaCommon.AlgSequence import AthSequencer
- result.addSequence(AthSequencer(sequenceName))
+ from AthenaCommon.CFElements import seqAND
+ #result.mainSeq( seqAND( sequenceName ) )
+ result.addSequence( seqAND(sequenceName) )
if not clustersname:
clustersname = "CaloTopoClusters"
diff --git a/Calorimeter/CaloTools/share/CaloEstimatedGainToolConfig_test.ref b/Calorimeter/CaloTools/share/CaloEstimatedGainToolConfig_test.ref
index 5406baed800..fd653625454 100644
--- a/Calorimeter/CaloTools/share/CaloEstimatedGainToolConfig_test.ref
+++ b/Calorimeter/CaloTools/share/CaloEstimatedGainToolConfig_test.ref
@@ -1,77 +1,11 @@
-Py:Athena INFO using release [WorkDir-22.0.5] [x86_64-centos7-gcc8-opt] [atlas-work3/af41e7f170b] -- built on [2019-09-20T1552]
+Py:Athena INFO using release [WorkDir-22.0.12] [x86_64-centos7-gcc8-opt] [GaudiConfig2_CA/b8a12fd] -- built on [2020-04-01T1621]
Py:AutoConfigFlags INFO Obtaining metadata of auto-configuration by peeking into /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.0/v1/myRDO.pool.root
Py:MetaReader INFO Current mode used: peeker
+Py:MetaReader INFO Current filenames: ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.0/v1/myRDO.pool.root']
Py:MetaReader INFO MetaReader is called with the parameter "unique_tag_info_values" set to True. This is a workaround to remove all duplicate values from "/TagInfo" key
Py:TileCablingSvc INFO Forcing RUN2 (2014-2017) cabling for run 284500 with geometry ATLAS-R2-2016-01-00-01
Py:TileInfoLoaderCfg INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileCablingSvc INFO Forcing RUN2 (2014-2017) cabling for run 284500 with geometry ATLAS-R2-2016-01-00-01
Py:TileCablingSvc INFO Forcing RUN2 (2014-2017) cabling for run 284500 with geometry ATLAS-R2-2016-01-00-01
Py:ComponentAccumulator INFO Condition Algorithms
-ComponentAccumulator: /***** Private AlgTool CaloEstimatedGainTool/CaloEstimatedGainTool *********************************
-|-ADC2MeVKey = 'LArADC2MeV' (default: 'ConditionStore+LArADC2MeV')
-|-AuditFinalize = False
-|-AuditInitialize = False
-|-AuditReinitialize = False
-|-AuditRestart = False
-|-AuditStart = False
-|-AuditStop = False
-|-AuditTools = False
-|-DetStore = ServiceHandle('StoreGateSvc/DetectorStore')
-|-EvtStore = ServiceHandle('StoreGateSvc')
-|-ExtraInputs = [] (default: [])
-|-ExtraOutputs = [] (default: [])
-|-MonitorService = 'MonitorSvc'
-|-OutputLevel = 0
-|-TileCondIdTransforms = PrivateToolHandle('TileCondIdTransforms/TileCondIdTransforms')
-|-TileCondToolEmscale = PrivateToolHandle('TileCondToolEmscale/TileCondToolEmscale')
-|-TileCondToolNoiseSample = PrivateToolHandle('TileCondToolNoiseSample/TileCondToolNoiseSample')
-|=/***** Private AlgTool TileCondIdTransforms/TileCondIdTransforms ***********************************
-| |-AuditFinalize = False
-| |-AuditInitialize = False
-| |-AuditReinitialize = False
-| |-AuditRestart = False
-| |-AuditStart = False
-| |-AuditStop = False
-| |-AuditTools = False
-| |-DetStore = ServiceHandle('StoreGateSvc/DetectorStore')
-| |-EvtStore = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs = [] (default: [])
-| |-ExtraOutputs = [] (default: [])
-| |-MonitorService = 'MonitorSvc'
-| |-OutputLevel = 0
-| \----- (End of Private AlgTool TileCondIdTransforms/TileCondIdTransforms) --------------------------
-|=/***** Private AlgTool TileCondToolEmscale/TileCondToolEmscale *************************************
-| |-AuditFinalize = False
-| |-AuditInitialize = False
-| |-AuditReinitialize = False
-| |-AuditRestart = False
-| |-AuditStart = False
-| |-AuditStop = False
-| |-AuditTools = False
-| |-DetStore = ServiceHandle('StoreGateSvc/DetectorStore')
-| |-EvtStore = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs = [] (default: [])
-| |-ExtraOutputs = [] (default: [])
-| |-MonitorService = 'MonitorSvc'
-| |-OutputLevel = 0
-| |-TileEMScale = 'TileEMScale' (default: 'ConditionStore+TileEMScale')
-| \----- (End of Private AlgTool TileCondToolEmscale/TileCondToolEmscale) ----------------------------
-|=/***** Private AlgTool TileCondToolNoiseSample/TileCondToolNoiseSample *****************************
-| |-AuditFinalize = False
-| |-AuditInitialize = False
-| |-AuditReinitialize = False
-| |-AuditRestart = False
-| |-AuditStart = False
-| |-AuditStop = False
-| |-AuditTools = False
-| |-DetStore = ServiceHandle('StoreGateSvc/DetectorStore')
-| |-EvtStore = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs = [] (default: [])
-| |-ExtraOutputs = [] (default: [])
-| |-MonitorService = 'MonitorSvc'
-| |-OutputLevel = 0
-| |-TileEMScale = 'ConditionStore+TileEMScale'
-| |-TileOnlineSampleNoise = '' (default: 'ConditionStore+TileOnlineSampleNoise')
-| |-TileSampleNoise = 'TileSampleNoise' (default: 'ConditionStore+TileSampleNoise')
-| \----- (End of Private AlgTool TileCondToolNoiseSample/TileCondToolNoiseSample) --------------------
-\----- (End of Private AlgTool CaloEstimatedGainTool/CaloEstimatedGainTool) ------------------------
+ComponentAccumulator: CaloEstimatedGainTool('CaloEstimatedGainTool', TileCondIdTransforms=TileCondIdTransforms('TileCondIdTransforms'), TileCondToolNoiseSample=TileCondToolNoiseSample('TileCondToolNoiseSample', TileOnlineSampleNoise='', TileSampleNoise='TileSampleNoise'), ADC2MeVKey='LArADC2MeV', TileCondToolEmscale=TileCondToolEmscale('TileCondToolEmscale', TileEMScale='TileEMScale'))
diff --git a/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py b/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py
index a16c6c0c3da..02863937b2b 100644
--- a/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py
+++ b/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py
@@ -6,26 +6,29 @@ from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator,ConfigurationError
from IOVDbSvc.IOVDbSvcConfig import IOVDbSvcCfg,addFolderList
-from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArDAC2uAMC_LArDAC2uASym_ as LArDAC2uASymAlg
-from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArMinBiasAverageMC_LArMinBiasAverageSym_ as LArMinBiasAverageSymAlg
-from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArMinBiasMC_LArMinBiasSym_ as LArMinBiasSymAlg
-from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArNoiseMC_LArNoiseSym_ as LArNoiseSymAlg
-from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArRampMC_LArRampSym_ as LArRampSymAlg
-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 LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArHVScaleCorrFlat_ as LArHVScaleCorrCondFlatAlg
-from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LAruA2MeVFlat_ as LAruA2MeVCondAlg
-from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArDAC2uAFlat_ as LArDAC2uACondAlg
-from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArPedestalFlat_ as LArPedestalCondAlg
-from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArRampFlat_ as LArRampCondAlg
-from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArMphysOverMcalFlat_ as LArMphysOverMcalCondAlg
-from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArOFCFlat_ as LArOFCCondAlg
-from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArShapeFlat_ as LArShapeCondAlg
+
+#Import LArSymConditionsAlgs: Templated on the payload-type they handle
+#These algs are mostly needed for MC processing
+LArDAC2uASymAlg = CompFactory.getComp("LArSymConditionsAlg<LArDAC2uAMC, LArDAC2uASym>")
+LArMinBiasAverageSymAlg = CompFactory.getComp("LArSymConditionsAlg<LArMinBiasAverageMC, LArMinBiasAverageSym>")
+LArMinBiasSymAlg = CompFactory.getComp("LArSymConditionsAlg<LArMinBiasMC, LArMinBiasSym>")
+LArNoiseSymAlg = CompFactory.getComp("LArSymConditionsAlg<LArNoiseMC, LArNoiseSym>")
+LArRampSymAlg = CompFactory.getComp("LArSymConditionsAlg<LArRampMC, LArRampSym>")
+LArfSamplSymAlg = CompFactory.getComp("LArSymConditionsAlg<LArfSamplMC, LArfSamplSym>")
+LArAutoCorrSymAlg = CompFactory.getComp("LArSymConditionsAlg<LArAutoCorrMC, LArAutoCorrSym>")
+LAruA2MeVSymAlg = CompFactory.getComp("LArSymConditionsAlg<LAruA2MeVMC, LAruA2MeVSym>")
+LArShapeSymAlg = CompFactory.getComp("LArSymConditionsAlg<LArShape32MC, LArShape32Sym>")
+LArMPhysOverMcalSymAlg = CompFactory.getComp("LArSymConditionsAlg<LArMphysOverMcalMC, LArMphysOverMcalSym>")
+
+
+LArHVScaleCorrCondFlatAlg = CompFactory.getComp("LArFlatConditionsAlg<LArHVScaleCorrFlat>")
+LAruA2MeVCondAlg = CompFactory.getComp("LArFlatConditionsAlg<LAruA2MeVFlat>")
+LArDAC2uACondAlg = CompFactory.getComp("LArFlatConditionsAlg<LArDAC2uAFlat>")
+LArPedestalCondAlg = CompFactory.getComp("LArFlatConditionsAlg<LArPedestalFlat>")
+LArRampCondAlg = CompFactory.getComp("LArFlatConditionsAlg<LArRampFlat>")
+LArMphysOverMcalCondAlg = CompFactory.getComp("LArFlatConditionsAlg<LArMphysOverMcalFlat>")
+LArOFCCondAlg = CompFactory.getComp("LArFlatConditionsAlg<LArOFCFlat>")
+LArShapeCondAlg = CompFactory.getComp("LArFlatConditionsAlg<LArShapeFlat>")
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/python/LArG4BarrelConfigNew.py b/LArCalorimeter/LArG4/LArG4Barrel/python/LArG4BarrelConfigNew.py
index e5504e9339b..7e22a628cf9 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/python/LArG4BarrelConfigNew.py
+++ b/LArCalorimeter/LArG4/LArG4Barrel/python/LArG4BarrelConfigNew.py
@@ -1,16 +1,16 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-LArG4__BarrelCryostat__CalibrationCalculator=CompFactory.LArG4__BarrelCryostat__CalibrationCalculator
-LArG4__BarrelCryostat__CalibrationLArCalculator=CompFactory.LArG4__BarrelCryostat__CalibrationLArCalculator
-LArG4__BarrelCryostat__CalibrationMixedCalculator=CompFactory.LArG4__BarrelCryostat__CalibrationMixedCalculator
-LArG4__DM__CalibrationCalculator=CompFactory.LArG4__DM__CalibrationCalculator
-LArG4__Barrel__CalibrationCalculator=CompFactory.LArG4__Barrel__CalibrationCalculator
-LArG4__BarrelPresampler__CalibrationCalculator=CompFactory.LArG4__BarrelPresampler__CalibrationCalculator
+LArG4__BarrelCryostat__CalibrationCalculator=CompFactory.LArG4.BarrelCryostat.CalibrationCalculator
+LArG4__BarrelCryostat__CalibrationLArCalculator=CompFactory.LArG4.BarrelCryostat.CalibrationLArCalculator
+LArG4__BarrelCryostat__CalibrationMixedCalculator=CompFactory.LArG4.BarrelCryostat.CalibrationMixedCalculator
+LArG4__DM__CalibrationCalculator=CompFactory.LArG4.DM.CalibrationCalculator
+LArG4__Barrel__CalibrationCalculator=CompFactory.LArG4.Barrel.CalibrationCalculator
+LArG4__BarrelPresampler__CalibrationCalculator=CompFactory.LArG4.BarrelPresampler.CalibrationCalculator
LArBarrelCalculator=CompFactory.LArBarrelCalculator
LArBarrelPresamplerCalculator=CompFactory.LArBarrelPresamplerCalculator
-LArG4__Barrel__Geometry=CompFactory.LArG4__Barrel__Geometry
-LArG4__BarrelPresampler__Geometry=CompFactory.LArG4__BarrelPresampler__Geometry
+LArG4__Barrel__Geometry=CompFactory.LArG4.Barrel.Geometry
+LArG4__BarrelPresampler__Geometry=CompFactory.LArG4.BarrelPresampler.Geometry
def BarrelCryostatCalibrationCalculatorCfg(ConfigFlags, name="BarrelCryostatCalibrationCalculator", **kwargs):
result = ComponentAccumulator()
diff --git a/LArCalorimeter/LArG4/LArG4EC/python/LArG4ECConfigNew.py b/LArCalorimeter/LArG4/LArG4EC/python/LArG4ECConfigNew.py
index aaccd31ca63..b51a5b116ab 100644
--- a/LArCalorimeter/LArG4/LArG4EC/python/LArG4ECConfigNew.py
+++ b/LArCalorimeter/LArG4/LArG4EC/python/LArG4ECConfigNew.py
@@ -1,11 +1,11 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from AthenaCommon import CfgMgr
+from AthenaConfiguration.ComponentFactory import CompFactory
from LArG4EC import LArWheelCalculatorEnum
def CalibrationCalculatorCfg(name="CalibrationCalculator", **kwargs):
result = ComponentAccumulator()
- result.addService(CfgMgr.LArG4__EC__CalibrationCalculator(name, **kwargs))
+ result.addService(CompFactory.LArG4.EC.CalibrationCalculator(name, **kwargs))
return result
def EMECPosInnerWheelCalibrationCalculatorCfg(ConfigFlags, name="EMECPosInnerWheelCalibrationCalculator", **kwargs):
@@ -45,26 +45,26 @@ def EMECNegBackOuterBarretteCalibrationCalculatorCfg(ConfigFlags, name="EMECNegB
return CalibrationCalculatorCfg(name, **kwargs)
def EMECPresamplerCalibrationCalculatorCfg(ConfigFlags, name="EMECPresamplerCalibrationCalculator", **kwargs):
- return CfgMgr.LArG4__EC__PresamplerCalibrationCalculator(name, **kwargs)
+ return CompFactory.LArG4.EC.PresamplerCalibrationCalculator(name, **kwargs)
def EndcapCryostatCalibrationCalculatorCfg(ConfigFlags, name="EndcapCryostatCalibrationCalculator", **kwargs):
result = ComponentAccumulator()
- result.addService( CfgMgr.LArG4__EndcapCryostat__CalibrationCalculator(name, **kwargs) )
+ result.addService( CompFactory.LArG4.EndcapCryostat.CalibrationCalculator(name, **kwargs) )
return result
def EndcapCryostatCalibrationLArCalculatorCfg(ConfigFlags, name="EndcapCryostatCalibrationLArCalculator", **kwargs):
result = ComponentAccumulator()
- result.addService( CfgMgr.LArG4__EndcapCryostat__CalibrationLArCalculator(name, **kwargs) )
+ result.addService( CompFactory.LArG4.EndcapCryostat.CalibrationLArCalculator(name, **kwargs) )
return result
def EndcapCryostatCalibrationMixedCalculatorCfg(ConfigFlags, name="EndcapCryostatCalibrationMixedCalculator", **kwargs):
result = ComponentAccumulator()
- result.addService( CfgMgr.LArG4__EndcapCryostat__CalibrationMixedCalculator(name, **kwargs) )
+ result.addService( CompFactory.LArG4.EndcapCryostat.CalibrationMixedCalculator(name, **kwargs) )
return result
def EMECSupportCalibrationCalculatorCfg(ConfigFlags, name="EMECSupportCalibrationCalculator", **kwargs):
result = ComponentAccumulator()
- result.addService( CfgMgr.LArG4__EMECSupportCalibrationCalculator(name, **kwargs))
+ result.addService( CompFactory.LArG4.EMECSupportCalibrationCalculator(name, **kwargs))
return result
def EnergyCalculatorCfg(name="EnergyCalculator", **kwargs):
@@ -72,7 +72,7 @@ def EnergyCalculatorCfg(name="EnergyCalculator", **kwargs):
from AthenaCommon.SystemOfUnits import ns
kwargs.setdefault("OOTcut", 300.0*ns)
- result.addService(CfgMgr.LArG4__EC__EnergyCalculator(name, **kwargs))
+ result.addService(CompFactory.LArG4.EC.EnergyCalculator(name, **kwargs))
return result
def EMECPosInnerWheelCalculatorCfg(ConfigFlags, name="EMECPosInnerWheelCalculator", **kwargs):
@@ -139,8 +139,8 @@ def EMECPresamplerCalculatorCfg(ConfigFlags, name="EMECPresamplerCalculator", **
result.addService(EMECPresamplerGeometryCfg(ConfigFlags))
kwargs.setdefault("GeometryCalculator",result.getService("EMECPresamplerGeometry"))
- result.addService(CfgMgr.LArEndcapPresamplerCalculator(name, **kwargs))
+ result.addService(CompFactory.LArEndcapPresamplerCalculator(name, **kwargs))
return result
def EMECPresamplerGeometryCfg(ConfigFlags, name="EMECPresamplerGeometry", **kwargs):
- return CfgMgr.LArG4__EC__PresamplerGeometry(name, **kwargs)
+ return CompFactory.LArG4.EC.PresamplerGeometry(name, **kwargs)
diff --git a/LArCalorimeter/LArG4/LArG4FCAL/python/LArG4FCALConfigNew.py b/LArCalorimeter/LArG4/LArG4FCAL/python/LArG4FCALConfigNew.py
index 28c56dd14c0..90f1447cf90 100644
--- a/LArCalorimeter/LArG4/LArG4FCAL/python/LArG4FCALConfigNew.py
+++ b/LArCalorimeter/LArG4/LArG4FCAL/python/LArG4FCALConfigNew.py
@@ -3,7 +3,7 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
LArFCALCalculatorBase=CompFactory.LArFCALCalculatorBase
-LArG4__FCAL__LArFCALCalibCalculatorBase=CompFactory.LArG4__FCAL__LArFCALCalibCalculatorBase
+LArG4__FCAL__LArFCALCalibCalculatorBase=CompFactory.LArG4.FCAL.LArFCALCalibCalculatorBase
from AthenaCommon.SystemOfUnits import mm,deg,ns
import math
diff --git a/LArCalorimeter/LArG4/LArG4HEC/python/LArG4HECConfigNew.py b/LArCalorimeter/LArG4/LArG4HEC/python/LArG4HECConfigNew.py
index e11db00354d..3f1d1413ab3 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/python/LArG4HECConfigNew.py
+++ b/LArCalorimeter/LArG4/LArG4HEC/python/LArG4HECConfigNew.py
@@ -3,11 +3,11 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
LArHECLocalCalculator=CompFactory.LArHECLocalCalculator
-LArG4__HEC__LocalCalibrationCalculator=CompFactory.LArG4__HEC__LocalCalibrationCalculator
-LArG4__HEC__LArHECCalibrationWheelCalculator=CompFactory.LArG4__HEC__LArHECCalibrationWheelCalculator
-LArG4__HEC__LocalGeometry=CompFactory.LArG4__HEC__LocalGeometry
+LArG4__HEC__LocalCalibrationCalculator=CompFactory.LArG4.HEC.LocalCalibrationCalculator
+LArG4__HEC__LArHECCalibrationWheelCalculator=CompFactory.LArG4.HEC.LArHECCalibrationWheelCalculator
+LArG4__HEC__LocalGeometry=CompFactory.LArG4.HEC.LocalGeometry
LArHECWheelCalculator=CompFactory.LArHECWheelCalculator
-LArG4__HEC__HECGeometry=CompFactory.LArG4__HEC__HECGeometry
+LArG4__HEC__HECGeometry=CompFactory.LArG4.HEC.HECGeometry
from LArG4HEC import HECGeometryType
def LArHECLocalCalculatorCfg(ConfigFlags, name="LArHECLocalCalculator", **kwargs):
diff --git a/LArCalorimeter/LArG4/LArG4SD/python/LArG4SDToolConfig.py b/LArCalorimeter/LArG4/LArG4SD/python/LArG4SDToolConfig.py
index 11fddbc338d..71b53300cbc 100644
--- a/LArCalorimeter/LArG4/LArG4SD/python/LArG4SDToolConfig.py
+++ b/LArCalorimeter/LArG4/LArG4SD/python/LArG4SDToolConfig.py
@@ -4,15 +4,15 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from ISF_Algorithms.collection_merger_helpersNew import CollectionMergerCfg
-LArG4__EMBSDTool=CompFactory.LArG4__EMBSDTool
-LArG4__EMECSDTool=CompFactory.LArG4__EMECSDTool
-LArG4__FCALSDTool=CompFactory.LArG4__FCALSDTool
-LArG4__HECSDTool=CompFactory.LArG4__HECSDTool
-LArG4__MiniFCALSDTool=CompFactory.LArG4__MiniFCALSDTool
-LArG4__DeadSDTool=CompFactory.LArG4__DeadSDTool
-LArG4__ActiveSDTool=CompFactory.LArG4__ActiveSDTool
-LArG4__InactiveSDTool=CompFactory.LArG4__InactiveSDTool
-LArG4__CalibrationDefaultCalculator=CompFactory.LArG4__CalibrationDefaultCalculator
+LArG4__EMBSDTool=CompFactory.LArG4.EMBSDTool
+LArG4__EMECSDTool=CompFactory.LArG4.EMECSDTool
+LArG4__FCALSDTool=CompFactory.LArG4.FCALSDTool
+LArG4__HECSDTool=CompFactory.LArG4.HECSDTool
+LArG4__MiniFCALSDTool=CompFactory.LArG4.MiniFCALSDTool
+LArG4__DeadSDTool=CompFactory.LArG4.DeadSDTool
+LArG4__ActiveSDTool=CompFactory.LArG4.ActiveSDTool
+LArG4__InactiveSDTool=CompFactory.LArG4.InactiveSDTool
+LArG4__CalibrationDefaultCalculator=CompFactory.LArG4.CalibrationDefaultCalculator
#to be migrated: getCalibrationDefaultCalculator, getDeadMaterialCalibrationHitMerger
diff --git a/LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py
index 8e7d569971e..520ad91cacf 100644
--- a/LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py
@@ -252,13 +252,13 @@ def LArNoisyROMonConfigCore(helper,algoinstance,inputFlags,
darray.defineHistogram('Triggers;NoisyEventTrigger',type='TH1I',
title='Trigger fired for RNB flagged events - {0} ; Special trigger fired',
xbins=siz+1,xmin=0.5,xmax=siz+1.5,
- xlabels=larNoisyROMonAlg.EFNoiseBurstTriggers+["NONE"])
+ xlabels=larNoisyROMonAlg.EFNoiseBurstTriggers.append("NONE"))
l1siz=len(larNoisyROMonAlg.L1NoiseBurstTriggers)
darray.defineHistogram('L1Triggers;NoisyEventL1Term',type='TH1I',
title='L1 term fired for RNB flagged events - {0} ; Special trigger fired',
xbins=l1siz+1,xmin=0.5,xmax=l1siz+1.5,
- xlabels=larNoisyROMonAlg.L1NoiseBurstTriggers+["NONE"])
+ xlabels=larNoisyROMonAlg.L1NoiseBurstTriggers.append("NONE"))
pass
diff --git a/LArCalorimeter/LArROD/python/LArDigitThinnerConfig.py b/LArCalorimeter/LArROD/python/LArDigitThinnerConfig.py
index 9d71e5e273e..7bd2641aa24 100644
--- a/LArCalorimeter/LArROD/python/LArDigitThinnerConfig.py
+++ b/LArCalorimeter/LArROD/python/LArDigitThinnerConfig.py
@@ -3,7 +3,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from LArROD.LArRODConf import LArDigitThinner
+from AthenaConfiguration.ComponentFactory import CompFactory
from LArByteStream.LArByteStreamConf import LArRawDataReadingAlg
from LArCabling.LArCablingConfig import LArOnOffIdMappingCfg
@@ -29,5 +29,5 @@ def LArDigitThinnerCfg(flags, **kwargs):
kwargs.setdefault("EnergyCut_HEC", 5000)
kwargs.setdefault("EnergyCut_FCAL", 20000)
- acc.addEventAlgo(LArDigitThinner(**kwargs))
+ acc.addEventAlgo(CompFactory.LArDigitThinner(**kwargs))
return acc
diff --git a/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py b/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
index 715b49439ba..9858b1d1f7a 100644
--- a/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
@@ -3,10 +3,10 @@
from __future__ import print_function
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
def LArADC2MeVCondAlgCfg(configFlags):
from LArCabling.LArCablingConfig import LArOnOffIdMappingCfg
- from LArRecUtils.LArRecUtilsConf import LArADC2MeVCondAlg
from LArConfiguration.LArElecCalibDBConfig import LArElecCalibDbCfg
from LArGeoAlgsNV.LArGMConfig import LArGMCfg
@@ -14,7 +14,7 @@ def LArADC2MeVCondAlgCfg(configFlags):
result.merge(LArOnOffIdMappingCfg(configFlags))
result.merge(LArGMCfg(configFlags)) #Needed for identifier helpers
- theADC2MeVCondAlg=LArADC2MeVCondAlg(LArADC2MeVKey = 'LArADC2MeV')
+ theADC2MeVCondAlg=CompFactory.LArADC2MeVCondAlg(LArADC2MeVKey = 'LArADC2MeV')
isMC=configFlags.Input.isMC
diff --git a/TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py b/TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py
index 2765caf4819..0a86c58b222 100644
--- a/TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py
@@ -36,7 +36,7 @@ def TileAutoCorrelationCondAlgCfg(flags, **kwargs):
else:
autoCorrelationFolder = folders.addSplitOnline('/TILE/OFL01/NOISE/AUTOCR', '/TILE/OFL02/NOISE/AUTOCR')
- from TileConditions.TileConditionsConf import TileCondProxyCool_TileCalibDrawerFlt_ as TileCondProxyCoolFlt
+ TileCondProxyCoolFlt=CompFactory.getComp("TileCondProxyCool<TileCalibDrawerFlt>")
autoCorrelationProxy = TileCondProxyCoolFlt('TileCondProxyCool_NoiseAutoCr', Source = autoCorrelationFolder)
from IOVDbSvc.IOVDbSvcConfig import addFolderList
@@ -44,13 +44,13 @@ def TileAutoCorrelationCondAlgCfg(flags, **kwargs):
elif source == 'FILE':
# Connect FILE Tile conditions proxies to the algorithm
- from TileConditions.TileConditionsConf import TileCondProxyFile_TileCalibDrawerFlt_ as TileCondProxyFileFlt
+ TileCondProxyFileFlt=CompFactory.getComp("TileCondProxyFile<TileCalibDrawerFlt>")
autoCorrelationProxy = TileCondProxyFileFlt('TileCondProxyFile_NoiseAutoCr', Source = 'TileDefault.acr')
else:
raise(Exception("Invalid source: %s" % source))
- from TileConditions.TileConditionsConf import TileCalibCondAlg_TileCalibDrawerFlt_ as TileCalibFltCondAlg
+ TileCalibFltCondAlg=CompFactory.getComp("TileCalibCondAlg<TileCalibDrawerFlt>")
autoCorrelationCondAlg = TileCalibFltCondAlg( name = name,
ConditionsProxy = autoCorrelationProxy,
TileCalibData = autoCorrelation)
diff --git a/TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py b/TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py
index 8143f36b332..3b87de1f5b5 100644
--- a/TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py
@@ -33,8 +33,7 @@ def TileBadChannelsCondAlgCfg(flags, **kwargs):
from TileConditions.TileFolders import TileFolders
folders = TileFolders(isMC = flags.Input.isMC, isOnline = flags.Common.isOnline)
- from TileConditions.TileConditionsConf import TileCondProxyCool_TileCalibDrawerBch_ as TileCondProxyCoolBch
-
+ TileCondProxyCoolBch=CompFactory.getComp("TileCondProxyCool<TileCalibDrawerBch>")
onlineFolder = folders.addSplitMC('/TILE/ONL01/STATUS/ADC', '/TILE/ONL01/STATUS/ADC')
onlineBadChannelsProxy = TileCondProxyCoolBch('TileCondProxyCool_OnlBch', Source = onlineFolder)
@@ -53,7 +52,7 @@ def TileBadChannelsCondAlgCfg(flags, **kwargs):
else:
# Connect FILE Tile conditions proxies to the algorithm
- from TileConditions.TileConditionsConf import TileCondProxyFile_TileCalibDrawerBch_ as TileCondProxyFileBch
+ TileCondProxyFileBch=CompFactory.getComp("TileCondProxyFile<TileCalibDrawerBch>")
onlineBadChannelsProxy = TileCondProxyFileBch('TileCondProxyFile_OnlBch', Source = 'TileDefault.onlBch')
offlineBadChannelsProxy = TileCondProxyFileBch('TileCondProxyFile_OflBch', Source = 'TileDefault.oflBch')
diff --git a/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py b/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py
index 0b1ddebcba1..616059a8e49 100644
--- a/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py
@@ -2,6 +2,7 @@
"""Define method to construct configured Tile cabling service"""
+from AthenaConfiguration.ComponentFactory import CompFactory
def TileCablingSvcCfg(flags):
"""Return component accumulator with configured Tile cabling service
@@ -19,8 +20,7 @@ def TileCablingSvcCfg(flags):
from TileGeoModel.TileGMConfig import TileGMCfg
acc.merge( TileGMCfg(flags) )
- from TileConditions.TileConditionsConf import TileCablingSvc
- tileCablingSvc = TileCablingSvc()
+ tileCablingSvc = CompFactory.TileCablingSvc()
geometry = flags.GeoModel.AtlasVersion
runNumber = flags.Input.RunNumber[0]
diff --git a/TileCalorimeter/TileConditions/python/TileConditionsConfig.py b/TileCalorimeter/TileConditions/python/TileConditionsConfig.py
index 9a0eaf9f6b3..39020d50af2 100644
--- a/TileCalorimeter/TileConditions/python/TileConditionsConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileConditionsConfig.py
@@ -11,11 +11,11 @@ def tileCondCfg( flags ):
def __addFolder(f):
acc.merge( addFolders( flags, '%s <key>%s</key>' %(f,f), 'TILE_OFL' if '/OFL' in f else 'TILE_ONL', className="CondAttrListCollection") )
- #TileCondProxyFileFlt=CompFactory.TileCondProxyFile_TileCalibDrawerFlt_
- #TileCondProxyFileBch=CompFactory.TileCondProxyFile_TileCalibDrawerBch_
- TileCondProxyCoolFlt=CompFactory.TileCondProxyFile_TileCalibDrawerFlt_
- TileCondProxyCoolBch=CompFactory.TileCondProxyCool_TileCalibDrawerBch_
- #TileCondProxyCoolOfc=CompFactory.TileCondProxyCool_TileCalibDrawerOfc_
+ #TileCondProxyFileFlt=CompFactory.getComp("TileCondProxyFile<TileCalibDrawerFlt>")
+ #TileCondProxyFileBch=CompFactory.getComp("TileCondProxyFile<TileCalibDrawerBch>")
+ TileCondProxyCoolFlt=CompFactory.getComp("TileCondProxyFile<TileCalibDrawerFlt>")
+ TileCondProxyCoolBch=CompFactory.getComp("TileCondProxyCool<TileCalibDrawerBch>")
+ #TileCondProxyCoolOfc=CompFactory.getComp("TileCondProxyCool<TileCalibDrawerOfc>")
emScale = 'TileEMScale'
TileEMScaleCondAlg=CompFactory.TileEMScaleCondAlg
@@ -50,7 +50,7 @@ def tileCondCfg( flags ):
emScaleTool = TileCondToolEmscale(name = 'TileCondToolEmscale', TileEMScale = emScale)
acc.addPublicTool( emScaleTool )
- TileCalibFltCondAlg=CompFactory.TileCalibCondAlg_TileCalibDrawerFlt_
+ TileCalibFltCondAlg=CompFactory.getComp("TileCalibCondAlg<TileCalibDrawerFlt>")
def __addCondAlg(calibData, proxy):
calibCondAlg = calibData + 'CondAlg'
condAlg = TileCalibFltCondAlg( name = calibCondAlg, ConditionsProxy = proxy, TileCalibData = calibData)
diff --git a/TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py b/TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py
index 7e1e761e53d..2ef7929ee96 100644
--- a/TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py
@@ -34,7 +34,7 @@ def TileDSP_ThresholdCondAlgCfg(flags, **kwargs):
else:
raise(Exception("No Tile DSP threshold folder in %s" % flags.IOVDb.DatabaseInstancea))
- from TileConditions.TileConditionsConf import TileCondProxyCool_TileCalibDrawerFlt_ as TileCondProxyCoolFlt
+ TileCondProxyCoolFlt=CompFactory.getComp("TileCondProxyCool<TileCalibDrawerFlt>")
dspThresholdProxy = TileCondProxyCoolFlt('TileCondProxyCool_DspThreshold', Source = dspThresholdFolder)
from IOVDbSvc.IOVDbSvcConfig import addFolderList
@@ -42,12 +42,12 @@ def TileDSP_ThresholdCondAlgCfg(flags, **kwargs):
elif source == 'FILE':
# Connect FILE Tile conditions proxies to the algorithm
- from TileConditions.TileConditionsConf import TileCondProxyFile_TileCalibDrawerFlt_ as TileCondProxyFileFlt
+ TileCondProxyFileFlt=CompFactory.getComp("TileCondProxyFile<TileCalibDrawerFlt>")
dspThresholdProxy = TileCondProxyFileFlt('TileCondProxyFile_DspThreshold', Source = 'TileDefault.dspThreshold')
else:
raise(Exception("Invalid source: %s" % source))
- from TileConditions.TileConditionsConf import TileCalibCondAlg_TileCalibDrawerFlt_ as TileCalibFltCondAlg
+ TileCalibFltCondAlg=CompFactory.getComp("TileCalibCondAlg<TileCalibDrawerFlt>")
dspThresholdCondAlg = TileCalibFltCondAlg( name = name,
ConditionsProxy = dspThresholdProxy,
TileCalibData = dspThreshold)
diff --git a/TileCalorimeter/TileConditions/python/TileEMScaleConfig.py b/TileCalorimeter/TileConditions/python/TileEMScaleConfig.py
index cd39943ea75..137fc40e3b8 100644
--- a/TileCalorimeter/TileConditions/python/TileEMScaleConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileEMScaleConfig.py
@@ -19,6 +19,7 @@ def TileEMScaleCondAlgCfg(flags, **kwargs):
acc = ComponentAccumulator()
from TileConditions.TileCablingSvcConfig import TileCablingSvcCfg
+
acc.merge( TileCablingSvcCfg(flags) )
source = kwargs.get('Source', 'COOL')
@@ -65,7 +66,7 @@ def TileEMScaleCondAlgCfg(flags, **kwargs):
from IOVDbSvc.IOVDbSvcConfig import addFolderList
acc.merge( addFolderList(flags, folders.get()) )
- from TileConditions.TileConditionsConf import TileCondProxyCool_TileCalibDrawerFlt_ as TileCondProxyCoolFlt
+ TileCondProxyCoolFlt = CompFactory.getComp("TileCondProxyCool<TileCalibDrawerFlt>")
if not oflLasFibFolder:
oflLasFibProxy = None
else:
@@ -84,7 +85,7 @@ def TileEMScaleCondAlgCfg(flags, **kwargs):
else:
# Connect FILE Tile conditions proxies to the tool
# Undoing "online" calibrations makes no sense here and is disabled
- from TileConditions.TileConditionsConf import TileCondProxyFile_TileCalibDrawerFlt_ as TileCondProxyFileFlt
+ TileCondProxyFileFlt = CompFactory.getComp("TileCondProxyFile<TileCalibDrawerFlt>")
oflCisLinProxy = TileCondProxyFileFlt('TileCondProxyFile_OflCisLin', Source = 'TileDefault.cisFitLin')
oflCisNlnProxy = TileCondProxyFileFlt('TileCondProxyFile_OflCisNln', Source = 'TileDefault.cisFitNln')
oflLasLinProxy = TileCondProxyFileFlt('TileCondProxyFile_OflLasLin', Source = 'TileDefault.lasLin')
diff --git a/TileCalorimeter/TileConditions/python/TileIntegratorConfig.py b/TileCalorimeter/TileConditions/python/TileIntegratorConfig.py
index 7f41812debe..e756c408005 100644
--- a/TileCalorimeter/TileConditions/python/TileIntegratorConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileIntegratorConfig.py
@@ -33,7 +33,7 @@ def TileIntegratorCondAlgCfg(flags, **kwargs):
else:
integratorFolder = folders.addSplitOnline('/TILE/OFL01/INTEGRATOR', '/TILE/OFL02/INTEGRATOR')
- from TileConditions.TileConditionsConf import TileCondProxyCool_TileCalibDrawerFlt_ as TileCondProxyCoolFlt
+ TileCondProxyCoolFlt=CompFactory.getComp("TileCondProxyCool<TileCalibDrawerFlt>")
integratorProxy = TileCondProxyCoolFlt('TileCondProxyCool_Integrator', Source = integratorFolder)
from IOVDbSvc.IOVDbSvcConfig import addFolderList
@@ -41,12 +41,12 @@ def TileIntegratorCondAlgCfg(flags, **kwargs):
elif source == 'FILE':
# Connect FILE Tile conditions proxies to the algorithm
- from TileConditions.TileConditionsConf import TileCondProxyFile_TileCalibDrawerFlt_ as TileCondProxyFileFlt
+ TileCondProxyFileFlt=CompFactory.getComp("TileCondProxyFile<TileCalibDrawerFlt>")
integratorProxy = TileCondProxyFileFlt('TileCondProxyFile_Integrator', Source = 'TileDefault.int')
else:
raise(Exception("Invalid source: %s" % source))
- from TileConditions.TileConditionsConf import TileCalibCondAlg_TileCalibDrawerFlt_ as TileCalibFltCondAlg
+ TileCalibFltCondAlg=CompFactory.getComp("TileCalibCondAlg<TileCalibDrawerFlt>")
integratorCondAlg = TileCalibFltCondAlg( name = name,
ConditionsProxy = integratorProxy,
TileCalibData = integrator)
diff --git a/TileCalorimeter/TileConditions/python/TileMuIDConfig.py b/TileCalorimeter/TileConditions/python/TileMuIDConfig.py
index b1151996747..00668c76246 100644
--- a/TileCalorimeter/TileConditions/python/TileMuIDConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileMuIDConfig.py
@@ -30,7 +30,7 @@ def TileMuIDCondAlgCfg(flags, **kwargs):
muIDFolder = folders.addSplitMC('/TILE/ONL01/MUID', '/TILE/ONL01/MUID')
- from TileConditions.TileConditionsConf import TileCondProxyCool_TileCalibDrawerFlt_ as TileCondProxyCoolFlt
+ TileCondProxyCoolFlt=CompFactory.getComp("TileCondProxyCool<TileCalibDrawerFlt>")
muIDProxy = TileCondProxyCoolFlt('TileCondProxyCool_MuID', Source = muIDFolder)
from IOVDbSvc.IOVDbSvcConfig import addFolderList
@@ -38,12 +38,12 @@ def TileMuIDCondAlgCfg(flags, **kwargs):
elif source == 'FILE':
# Connect FILE Tile conditions proxies to the algorithm
- from TileConditions.TileConditionsConf import TileCondProxyFile_TileCalibDrawerFlt_ as TileCondProxyFileFlt
+ TileCondProxyFileFlt=CompFactory.getComp("TileCondProxyFile<TileCalibDrawerFlt>")
muIDProxy = TileCondProxyFileFlt('TileCondProxyFile_MuID', Source = 'TileDefault.muid')
else:
raise(Exception("Invalid source: %s" % source))
- from TileConditions.TileConditionsConf import TileCalibCondAlg_TileCalibDrawerFlt_ as TileCalibFltCondAlg
+ TileCalibFltCondAlg=CompFactory.getComp("TileCalibCondAlg<TileCalibDrawerFlt>")
muIDCondAlg = TileCalibFltCondAlg( name = name,
ConditionsProxy = muIDProxy,
TileCalibData = muID)
diff --git a/TileCalorimeter/TileConditions/python/TileOFCConfig.py b/TileCalorimeter/TileConditions/python/TileOFCConfig.py
index d21361d0ca7..2d45dc9b50f 100644
--- a/TileCalorimeter/TileConditions/python/TileOFCConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileOFCConfig.py
@@ -54,7 +54,7 @@ def TileOFCCondAlgCfg(flags, **kwargs):
else:
ofcFolder = folders.addSplitMC('/TILE/ONL01/FILTER/' + ofcType, '/TILE/ONL01/FILTER/' + ofcType)
- from TileConditions.TileConditionsConf import TileCondProxyCool_TileCalibDrawerOfc_ as TileCondProxyCoolOfc
+ TileCondProxyCoolOfc=CompFactory.getComp("TileCondProxyCool<TileCalibDrawerOfc>")
ofcProxy = TileCondProxyCoolOfc('TileCondProxyCool_Ofc', Source = ofcFolder)
from IOVDbSvc.IOVDbSvcConfig import addFolderList
@@ -63,7 +63,7 @@ def TileOFCCondAlgCfg(flags, **kwargs):
else:
raise(Exception("Invalid source: %s" % source))
- from TileConditions.TileConditionsConf import TileCalibCondAlg_TileCalibDrawerOfc_ as TileCalibOfcCondAlg
+ TileCalibOfcCondAlg=CompFactory.getComp("TileCalibCondAlg<TileCalibDrawerOfc>")
ofcCondAlg = TileCalibOfcCondAlg( name = name, ConditionsProxy = ofcProxy, TileCalibData = ofc)
acc.addCondAlgo(ofcCondAlg)
diff --git a/TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py b/TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py
index 310685ca043..54f6f2a0ca5 100644
--- a/TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py
+++ b/TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py
@@ -57,7 +57,7 @@ def TilePulseShapeCondAlgCfg(flags, **kwargs):
else:
pulseFolder = folders.addSplitOnline('/TILE/OFL01/PULSESHAPE/' + pulse, '/TILE/OFL02/PULSESHAPE/' + pulse)
- from TileConditions.TileConditionsConf import TileCondProxyCool_TileCalibDrawerFlt_ as TileCondProxyCoolFlt
+ TileCondProxyCoolFlt=CompFactory.getComp("TileCondProxyCool<TileCalibDrawerFlt>")
pulseProxy = TileCondProxyCoolFlt('TileCondProxyCool_PulseShape', Source = pulseFolder)
from IOVDbSvc.IOVDbSvcConfig import addFolderList
@@ -69,13 +69,13 @@ def TilePulseShapeCondAlgCfg(flags, **kwargs):
'CIS/PULSE100' : 'plsCisPulse100', 'CIS/PULSE5P2' : 'plsCisPulse5p2',
'CIS/LEAK100' : 'plsCisLeak100', 'CIS/LEAK5P2' : 'plsCisLeak5p2'}
- from TileConditions.TileConditionsConf import TileCondProxyFile_TileCalibDrawerFlt_ as TileCondProxyFileFlt
+ TileCondProxyFileFlt=CompFactory.getComp("TileCondProxyFile<TileCalibDrawerFlt>")
pulseProxy = TileCondProxyFileFlt('TileCondProxyFile_PulseShape',
Source = 'TileDefault.' + fileExtention[pulse])
else:
raise(Exception("Invalid source: %s" % source))
- from TileConditions.TileConditionsConf import TileCalibCondAlg_TileCalibDrawerFlt_ as TileCalibFltCondAlg
+ TileCalibFltCondAlg=CompFactory.getComp("TileCalibCondAlg<TileCalibDrawerFlt>")
pulseShapeCondAlg = TileCalibFltCondAlg( name = name,
ConditionsProxy = pulseProxy,
TileCalibData = pulseShape)
diff --git a/TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py b/TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py
index fc427713eb7..4a804804c19 100644
--- a/TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py
@@ -41,7 +41,7 @@ def TileSampleNoiseCondAlgCfg(flags, **kwargs):
else:
sampleNoiseFolder = folders.addSplitOnline(onlineSampleNoiseFolder, '/TILE/OFL02/NOISE/SAMPLE')
- from TileConditions.TileConditionsConf import TileCondProxyCool_TileCalibDrawerFlt_ as TileCondProxyCoolFlt
+ TileCondProxyCoolFlt=CompFactory.getComp("TileCondProxyCool<TileCalibDrawerFlt>")
sampleNoiseProxy = TileCondProxyCoolFlt('TileCondProxyCool_NoiseSample', Source = sampleNoiseFolder)
from IOVDbSvc.IOVDbSvcConfig import addFolderList
@@ -49,14 +49,14 @@ def TileSampleNoiseCondAlgCfg(flags, **kwargs):
elif source == 'FILE':
# Connect FILE Tile conditions proxies to the algorithm
- from TileConditions.TileConditionsConf import TileCondProxyFile_TileCalibDrawerFlt_ as TileCondProxyFileFlt
+ TileCondProxyFileFlt=CompFactory.getComp("TileCondProxyFile<TileCalibDrawerFlt>")
sampleNoiseProxy = TileCondProxyFileFlt('TileCondProxyFile_NoiseSample', Source = 'TileDefault.ped')
else:
raise(Exception("Invalid source: %s" % source))
- from TileConditions.TileConditionsConf import TileCalibCondAlg_TileCalibDrawerFlt_ as TileCalibFltCondAlg
+ TileCalibFltCondAlg=CompFactory.getComp("TileCalibCondAlg<TileCalibDrawerFlt>")
sampleNoiseCondAlg = TileCalibFltCondAlg( name = name,
ConditionsProxy = sampleNoiseProxy,
TileCalibData = sampleNoise)
diff --git a/TileCalorimeter/TileConditions/python/TileTMDBConfig.py b/TileCalorimeter/TileConditions/python/TileTMDBConfig.py
index e629a07fe86..9f8ba6e6274 100644
--- a/TileCalorimeter/TileConditions/python/TileTMDBConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileTMDBConfig.py
@@ -26,8 +26,7 @@ def TileTMDBCondAlgCfg(flags, **kwargs):
tmf = kwargs.get('TileTMDBTMF', 'TileTMDBTMF')
calib = kwargs.get('TileTMDBCalib', 'TileTMDBCalib')
- from TileConditions.TileConditionsConf import TileCalibCondAlg_TileCalibDrawerFlt_ as TileCalibFltCondAlg
-
+ TileCalibFltCondAlg=CompFactory.getComp("TileCalibCondAlg<TileCalibDrawerFlt>")
def __addCondAlg(calibData, proxy):
condAlg = TileCalibFltCondAlg( name = calibData + 'CondAlg',
ConditionsProxy = proxy,
@@ -60,7 +59,7 @@ def TileTMDBCondAlgCfg(flags, **kwargs):
else:
raise(Exception("No Tile TMDB folders in %s" % flags.IOVDb.DatabaseInstancea))
- from TileConditions.TileConditionsConf import TileCondProxyCool_TileCalibDrawerFlt_ as TileCondProxyCoolFlt
+ TileCondProxyCoolFlt=CompFactory.getComp("TileCondProxyCool<TileCalibDrawerFlt>")
thrProxy = TileCondProxyCoolFlt('TileCondProxyCool_TMDBThreshold', Source = thrFolder)
delayProxy = TileCondProxyCoolFlt('TileCondProxyCool_TMDBDelay', Source = delayFolder)
tmfProxy = TileCondProxyCoolFlt('TileCondProxyCool_TMDBTmf', Source = tmfFolder)
diff --git a/TileCalorimeter/TileConditions/python/TileTimingConfig.py b/TileCalorimeter/TileConditions/python/TileTimingConfig.py
index bb900225069..1a9795bed90 100644
--- a/TileCalorimeter/TileConditions/python/TileTimingConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileTimingConfig.py
@@ -53,7 +53,7 @@ def TileTimingCondAlgCfg(flags, **kwargs):
else:
timingFolder = folders.addSplitOnline(onlineTimingFolder, '/TILE/OFL02/TIME/CHANNELOFFSET/' + timingType)
- from TileConditions.TileConditionsConf import TileCondProxyCool_TileCalibDrawerFlt_ as TileCondProxyCoolFlt
+ TileCondProxyCoolFlt=CompFactory.getComp("TileCondProxyCool<TileCalibDrawerFlt>")
timingProxy = TileCondProxyCoolFlt('TileCondProxyCool_AdcOffset', Source = timingFolder)
from IOVDbSvc.IOVDbSvcConfig import addFolderList
@@ -63,13 +63,13 @@ def TileTimingCondAlgCfg(flags, **kwargs):
# Connect FILE Tile conditions proxies to the algorithm
fileExtention = {'PHY' : 'tcphy', 'LAS' : 'tclas', 'CIS' : 'tccis'}
- from TileConditions.TileConditionsConf import TileCondProxyFile_TileCalibDrawerFlt_ as TileCondProxyFileFlt
+ TileCondProxyFileFlt=CompFactory.getComp("TileCondProxyFile<TileCalibDrawerFlt>")
timingProxy = TileCondProxyFileFlt('TileCondProxyFile_AdcOffset',
Source = 'TileDefault.' + fileExtention[timingType])
else:
raise(Exception("Invalid source: %s" % source))
- from TileConditions.TileConditionsConf import TileCalibCondAlg_TileCalibDrawerFlt_ as TileCalibFltCondAlg
+ TileCalibFltCondAlg=CompFactory.getComp("TileCalibCondAlg<TileCalibDrawerFlt>")
timingCondAlg = TileCalibFltCondAlg( name = name,
ConditionsProxy = timingProxy,
TileCalibData = timing)
diff --git a/TileCalorimeter/TileL2Algs/python/TileL2Config.py b/TileCalorimeter/TileL2Algs/python/TileL2Config.py
index 6660de703c6..ed77fde171b 100644
--- a/TileCalorimeter/TileL2Algs/python/TileL2Config.py
+++ b/TileCalorimeter/TileL2Algs/python/TileL2Config.py
@@ -79,10 +79,10 @@ def TileRawChannelToL2OutputCfg(flags, streamName = 'RDO', **kwargs):
acc = TileRawChannelToL2Cfg(flags, **kwargs)
tileRawChanToL2Alg = acc.getPrimary()
- if 'TileL2Container' in tileRawChanToL2Alg.getValuedProperties():
- tileL2Container = tileRawChanToL2Alg.getValuedProperties()['TileL2Container']
+ if 'TileL2Container' in tileRawChanToL2Alg._properties:
+ tileL2Container = tileRawChanToL2Alg._properties['TileL2Container']
else:
- tileL2Container = tileRawChanToL2Alg.getDefaultProperty('TileL2Container')
+ tileL2Container = tileRawChanToL2Alg._descriptors['TileL2Container'].default
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
diff --git a/TileCalorimeter/TileMonitoring/python/TileJetMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileJetMonitorAlgorithm.py
index c507daaeff5..d9fe89315e5 100644
--- a/TileCalorimeter/TileMonitoring/python/TileJetMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileJetMonitorAlgorithm.py
@@ -12,9 +12,6 @@ def TileJetMonitoringConfig(flags, **kwargs):
''' Function to configure TileJetMonitorAlgorithm algorithm in the monitoring system.'''
-
- from AthenaCommon import CfgMgr
-
# Define one top-level monitoring algorithm. The new configuration
# framework uses a component accumulator.
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -47,19 +44,20 @@ def TileJetMonitoringConfig(flags, **kwargs):
for k, v in kwargs.items():
setattr(tileJetMonAlg, k, v)
- DoEnergyProfiles = kwargs.get('DoEnergyProfiles', tileJetMonAlg.getDefaultProperty('DoEnergyProfiles'))
- Do1DHistograms = kwargs.get('Do1DHistograms', tileJetMonAlg.getDefaultProperty('Do1DHistograms'))
- DoEnergyDiffHistograms = kwargs.get('DoEnergyDiffHistograms', tileJetMonAlg.getDefaultProperty('DoEnergyDiffHistograms'))
+ DoEnergyProfiles = kwargs.get('DoEnergyProfiles', tileJetMonAlg._descriptors['DoEnergyProfiles'].default)
+
+ Do1DHistograms = kwargs.get('Do1DHistograms', tileJetMonAlg._descriptors['Do1DHistograms'].default)
+ DoEnergyDiffHistograms = kwargs.get('DoEnergyDiffHistograms', tileJetMonAlg._descriptors['DoEnergyDiffHistograms'].default)
if not flags.DQ.DataType == 'heavyioncollision':
- jvtTool = CfgMgr.JetVertexTaggerTool()
- jetContainer = kwargs.get('JetContainer', tileJetMonAlg.getDefaultProperty('JetContainer'))
+ jvtTool = CompFactory.JetVertexTaggerTool()
+ jetContainer = kwargs.get('JetContainer', tileJetMonAlg._descriptors['JetContainer'].default)
jvtTool.JetContainer = jetContainer
tileJetMonAlg.JVT = jvtTool
- jetCleaningTool = CfgMgr.JetCleaningTool()
+ jetCleaningTool = CompFactory.JetCleaningTool()
jetCleaningTool.CutLevel = "LooseBad"
jetCleaningTool.DoUgly = False
@@ -68,7 +66,7 @@ def TileJetMonitoringConfig(flags, **kwargs):
jetPtMin = 20000
jetTrackingEtaLimit = 2.4
- eventCleaningTool = CfgMgr.ECUtils__EventCleaningTool()
+ eventCleaningTool = CompFactory.ECUtils.EventCleaningTool()
eventCleaningTool.JetCleaningTool = jetCleaningTool
eventCleaningTool.PtCut = jetPtMin
eventCleaningTool.EtaCut = jetTrackingEtaLimit
@@ -265,7 +263,7 @@ if __name__=='__main__':
Do1DHistograms = True,
DoEnergyDiffHistograms = True)
cfg.merge(tileJetMonitorAccumulator)
- cfg.printConfig(withDetails = True, summariseProps = True)
+ #cfg.printConfig(withDetails = True, summariseProps = True)
ConfigFlags.dump()
cfg.store( open('TileJetMonitorAlgorithm.pkl','wb') )
diff --git a/TileCalorimeter/TileMonitoring/python/TileMBTSMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileMBTSMonitorAlgorithm.py
index ae06f3244a9..dfcb32a336d 100644
--- a/TileCalorimeter/TileMonitoring/python/TileMBTSMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileMBTSMonitorAlgorithm.py
@@ -84,9 +84,12 @@ def _TileMBTSMonitoringConfigCore(helper, algConfObj, runNumber, **kwargs):
if 'FillHistogramsPerMBTS' in kwargs:
fillHistogramPerMBTS = kwargs['FillHistogramsPerMBTS']
- else:
+ elif hasattr(tileMBTSMonAlg,"_descriptors"): #GaudiConfig2 config
+ fillHistogramPerMBTS = tileMBTSMonAlg._descriptors['FillHistogramsPerMBTS'].default
+ else: #Run1/2 config
fillHistogramPerMBTS = tileMBTSMonAlg.getDefaultProperty('FillHistogramsPerMBTS')
+
# 1) Configure histogram with TileMBTSMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileMBTSMonAlg, 'TileMBTSMonExecuteTime', 'Tile/')
executeTimeGroup.defineHistogram('TIME_execute', path = 'MBTS', type='TH1F',
diff --git a/TileCalorimeter/TileRecAlgs/python/TileDigitsFilterConfig.py b/TileCalorimeter/TileRecAlgs/python/TileDigitsFilterConfig.py
index 83bc83b7451..ed414b3641c 100644
--- a/TileCalorimeter/TileRecAlgs/python/TileDigitsFilterConfig.py
+++ b/TileCalorimeter/TileRecAlgs/python/TileDigitsFilterConfig.py
@@ -34,18 +34,18 @@ def TileDigitsFilterOutputCfg(flags, streamName = 'ESD', **kwargs):
outputItemList = []
- if 'OutputDigitsContainer' in tileDigitsFilter.getValuedProperties():
- digitsContainer = tileDigitsFilter.getValuedProperties()['OutputDigitsContainer']
+ if 'OutputDigitsContainer' in tileDigitsFilter._properties:
+ digitsContainer = tileDigitsFilter._properties['OutputDigitsContainer']
else:
- digitsContainer = tileDigitsFilter.getDefaultProperty('OutputDigitsContainer')
+ digitsContainer = tileDigitsFilter._descriptors['OutputDigitsContainer'].default
if digitsContainer != '':
outputItemList += ['TileDigitsContainer#' + digitsContainer]
- if 'OutputRawChannelContainer' in tileDigitsFilter.getValuedProperties():
- rawChannelContainer = tileDigitsFilter.getValuedProperties()['OutputRawChannelContainer']
+ if 'OutputRawChannelContainer' in tileDigitsFilter._properties:
+ rawChannelContainer = tileDigitsFilter._properties['OutputRawChannelContainer']
else:
- rawChannelContainer = tileDigitsFilter.getDefaultProperty('OutputRawChannelContainer')
+ rawChannelContainer = tileDigitsFilter._descriptors['OutputRawChannelContainer'].default
if rawChannelContainer != '':
outputItemList += ['TileRawChannelContainer#' + rawChannelContainer]
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderFitConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderFitConfig.py
index 9d7b4f91bc3..a3a42dc6a18 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderFitConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderFitConfig.py
@@ -64,9 +64,9 @@ if __name__ == "__main__":
acc = ComponentAccumulator()
- print( acc.popToolsAndMerge( TileRawChannelBuilderFitFilterCfg(ConfigFlags) ) )
-
- print( acc.popToolsAndMerge( TileRawChannelBuilderFitOverflowCfg(ConfigFlags) ) )
+ #printing Configurables isn't reliable with GaudiConfig2
+ acc.popToolsAndMerge( TileRawChannelBuilderFitFilterCfg(ConfigFlags) )
+ acc.popToolsAndMerge( TileRawChannelBuilderFitOverflowCfg(ConfigFlags) )
acc.printConfig(withDetails = True, summariseProps = True)
acc.store( open('TileRawChannelBuilderFit.pkl','wb') )
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderMFConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderMFConfig.py
index 0063f4c736f..1970ff44dbd 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderMFConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderMFConfig.py
@@ -76,7 +76,8 @@ if __name__ == "__main__":
acc = ComponentAccumulator()
- print( acc.popToolsAndMerge( TileRawChannelBuilderMFCfg(ConfigFlags) ) )
+ #printing Configurables isn't reliable with GaudiConfig2
+ acc.popToolsAndMerge( TileRawChannelBuilderMFCfg(ConfigFlags) )
acc.printConfig(withDetails = True, summariseProps = True)
acc.store( open('TileRawChannelBuilderMF.pkl','wb') )
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderOptConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderOptConfig.py
index 3beb886d588..983b4f6fe5b 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderOptConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderOptConfig.py
@@ -104,9 +104,10 @@ if __name__ == "__main__":
acc = ComponentAccumulator()
- print( acc.popToolsAndMerge( TileRawChannelBuilderOpt2Cfg(ConfigFlags) ) )
- print( acc.popToolsAndMerge( TileRawChannelBuilderOptATLASCfg(ConfigFlags) ) )
- print( acc.popToolsAndMerge( TileRawChannelBuilderOF1Cfg(ConfigFlags) ) )
+ #Comment for now, priting configurables isn't reliable with GaudiConfig2
+ acc.popToolsAndMerge( TileRawChannelBuilderOpt2Cfg(ConfigFlags) )
+ acc.popToolsAndMerge( TileRawChannelBuilderOptATLASCfg(ConfigFlags) )
+ acc.popToolsAndMerge( TileRawChannelBuilderOF1Cfg(ConfigFlags) )
acc.printConfig(withDetails = True, summariseProps = True)
acc.store( open('TileRawChannelBuilder.pkl','wb') )
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelMakerConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelMakerConfig.py
index 668e15c20cd..dd3cf3d644a 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelMakerConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelMakerConfig.py
@@ -40,28 +40,28 @@ def TileRawChannelMakerCfg(flags, **kwargs):
tileRawChannelBuilderFitFilter = acc.popToolsAndMerge( TileRawChannelBuilderFitFilterCfg(flags) )
tileRawChannelBuilder += [tileRawChannelBuilderFitFilter]
mlog.info(" adding now TileRawChannelBuilderFitFilter with name %s to the algorithm: %s",
- tileRawChannelBuilderFitFilter.name(), name)
+ tileRawChannelBuilderFitFilter.name, name)
if flags.Tile.doOF1:
from TileRecUtils.TileRawChannelBuilderOptConfig import TileRawChannelBuilderOF1Cfg
tileRawChannelBuilderOF1 = acc.popToolsAndMerge( TileRawChannelBuilderOF1Cfg(flags) )
tileRawChannelBuilder += [tileRawChannelBuilderOF1]
mlog.info(" adding now TileRawChannelBuilderOpt2Filter with name %s to the algorithm: %s",
- tileRawChannelBuilderOF1.name(), name)
+ tileRawChannelBuilderOF1.name, name)
if flags.Tile.doOpt2:
from TileRecUtils.TileRawChannelBuilderOptConfig import TileRawChannelBuilderOpt2Cfg
tileRawChannelBuilderOpt2 = acc.popToolsAndMerge( TileRawChannelBuilderOpt2Cfg(flags) )
tileRawChannelBuilder += [tileRawChannelBuilderOpt2]
mlog.info(" adding now TileRawChannelBuilderOpt2Filter with name %s to the algorithm: %s",
- tileRawChannelBuilderOpt2.name(), name)
+ tileRawChannelBuilderOpt2.name, name)
if flags.Tile.doOptATLAS:
from TileRecUtils.TileRawChannelBuilderOptConfig import TileRawChannelBuilderOptATLASCfg
tileRawChannelBuilderOptATLAS = acc.popToolsAndMerge( TileRawChannelBuilderOptATLASCfg(flags) )
tileRawChannelBuilder += [tileRawChannelBuilderOptATLAS]
mlog.info(" adding now TileRawChannelBuilderOpt2Filter with name %s to the algorithm: %s",
- tileRawChannelBuilderOptATLAS.name(), name)
+ tileRawChannelBuilderOptATLAS.name, name)
kwargs.setdefault('TileRawChannelBuilder', tileRawChannelBuilder)
diff --git a/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py b/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py
index b8c975d4edc..1b96bddcdbb 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py
@@ -31,17 +31,17 @@ def TileDigitsMakerCfg(flags, **kwargs):
infoLoader = infoLoaderAcc.getPrimary()
acc.merge( infoLoaderAcc )
- infoLoaderProperties = infoLoader.getValuedProperties()
+ infoLoaderProperties = infoLoader._properties.items()
if 'TileNoise' in infoLoaderProperties:
tileNoise = infoLoaderProperties['TileNoise']
else:
- tileNoise = infoLoader.getDefaultProperty('TileNoise')
+ tileNoise = infoLoader._descriptors['TileNoise'].default
if 'TileCoherNoise' in infoLoaderProperties:
tileCoherNoise = infoLoaderProperties['TileCoherNoise']
else:
- tileCoherNoise = infoLoader.getDefaultProperty('TileCoherNoise')
+ tileCoherNoise = infoLoader._descriptors['TileCoherNoise'].default
from TileConditions.TileCablingSvcConfig import TileCablingSvcCfg
acc.merge(TileCablingSvcCfg(flags))
diff --git a/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py b/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py
index 470a27593dc..9a02380adea 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py
@@ -24,7 +24,7 @@ def TilePulseForTileMuonReceiverCfg(flags, **kwargs):
from TileConditions.TileInfoLoaderConfig import TileInfoLoaderCfg
acc.merge( TileInfoLoaderCfg(flags) )
infoLoader = acc.getService('TileInfoLoader')
- pedestal = infoLoader.getDefaultProperty('MuRcvPed')
+ pedestal = infoLoader._descriptors['MuRcvPed'].default
from TileConditions.TileCablingSvcConfig import TileCablingSvcCfg
acc.merge(TileCablingSvcCfg(flags))
--
GitLab