diff --git a/Tracking/Acts/ActsTrkAlgs/ActsTrkAnalysis/python/ActsTrkLiveMonitoringConfig.py b/Tracking/Acts/ActsTrkAlgs/ActsTrkAnalysis/python/ActsTrkMonitoringConfig.py
similarity index 62%
rename from Tracking/Acts/ActsTrkAlgs/ActsTrkAnalysis/python/ActsTrkLiveMonitoringConfig.py
rename to Tracking/Acts/ActsTrkAlgs/ActsTrkAnalysis/python/ActsTrkMonitoringConfig.py
index 6dce0654469dab6be20da40e8b56b24874a93b0e..ca995f77837cdc62672c0fb8785b37fc3b89e1b1 100644
--- a/Tracking/Acts/ActsTrkAlgs/ActsTrkAnalysis/python/ActsTrkLiveMonitoringConfig.py
+++ b/Tracking/Acts/ActsTrkAlgs/ActsTrkAnalysis/python/ActsTrkMonitoringConfig.py
@@ -2,15 +2,15 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-def ActsTrkLiveMonitoringHistSvcCfg(flags) -> ComponentAccumulator:
+def ActsTrkMonitoringHistSvcCfg(flags) -> ComponentAccumulator:
acc = ComponentAccumulator()
histSvc = CompFactory.THistSvc(Output = ["EXPERT DATAFILE='acts-expert-monitoring.root', OPT='RECREATE'"])
acc.addService(histSvc)
return acc
-def ActsTrkITkPixelClusterizationLiveMonitoringToolCfg(flags,
- name: str = "ActsTrkItkPixelClusterizationLiveMonitoringTool",
- **kwargs) -> ComponentAccumulator:
+def ActsTrkITkPixelClusterizationMonitoringToolCfg(flags,
+ name: str = "ActsTrkItkPixelClusterizationMonitoringTool",
+ **kwargs) -> ComponentAccumulator:
acc = ComponentAccumulator()
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
@@ -20,12 +20,12 @@ def ActsTrkITkPixelClusterizationLiveMonitoringToolCfg(flags,
xbins=100, xmin=0, xmax=10000)
acc.setPrivateTools(monTool)
- acc.merge(ActsTrkLiveMonitoringHistSvcCfg(flags))
+ acc.merge(ActsTrkMonitoringHistSvcCfg(flags))
return acc
-def ActsTrkITkStripClusterizationLiveMonitoringToolCfg(flags,
- name: str = "ActsTrkItkStripClusterizationLiveMonitoringTool",
- **kwargs) -> ComponentAccumulator:
+def ActsTrkITkStripClusterizationMonitoringToolCfg(flags,
+ name: str = "ActsTrkItkStripClusterizationMonitoringTool",
+ **kwargs) -> ComponentAccumulator:
acc = ComponentAccumulator()
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
@@ -35,13 +35,13 @@ def ActsTrkITkStripClusterizationLiveMonitoringToolCfg(flags,
xbins=100, xmin=0, xmax=10000)
acc.setPrivateTools(monTool)
- acc.merge(ActsTrkLiveMonitoringHistSvcCfg(flags))
+ acc.merge(ActsTrkMonitoringHistSvcCfg(flags))
return acc
-def ActsTrkPixelSpacePointFormatioLiveMonitoringToolCfg(flags,
- name: str = "ActsTrkPixelSpacePointFormatioLiveMonitoringTool",
- **kwargs) -> ComponentAccumulator:
+def ActsTrkPixelSpacePointFormationMonitoringToolCfg(flags,
+ name: str = "ActsTrkPixelSpacePointFormatioMonitoringTool",
+ **kwargs) -> ComponentAccumulator:
acc = ComponentAccumulator()
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
@@ -53,12 +53,12 @@ def ActsTrkPixelSpacePointFormatioLiveMonitoringToolCfg(flags,
xbins=100, xmin=0, xmax=1000000)
acc.setPrivateTools(monTool)
- acc.merge(ActsTrkLiveMonitoringHistSvcCfg(flags))
+ acc.merge(ActsTrkMonitoringHistSvcCfg(flags))
return acc
-def ActsTrkStripSpacePointFormatioLiveMonitoringToolCfg(flags,
- name: str = "ActsTrkStripSpacePointFormatioLiveMonitoringTool",
- **kwargs) -> ComponentAccumulator:
+def ActsTrkStripSpacePointFormationMonitoringToolCfg(flags,
+ name: str = "ActsTrkStripSpacePointFormationMonitoringTool",
+ **kwargs) -> ComponentAccumulator:
acc = ComponentAccumulator()
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
@@ -72,12 +72,12 @@ def ActsTrkStripSpacePointFormatioLiveMonitoringToolCfg(flags,
xbins=100, xmin=0, xmax=100000)
acc.setPrivateTools(monTool)
- acc.merge(ActsTrkLiveMonitoringHistSvcCfg(flags))
+ acc.merge(ActsTrkMonitoringHistSvcCfg(flags))
return acc
-def ActsTrkITkPixelSeedingLiveMonitoringCfg(flags,
- name: str = "ActsTrkITkPixelSeedingLiveMonitoring",
- **kwargs) -> ComponentAccumulator:
+def ActsTrkITkPixelSeedingMonitoringCfg(flags,
+ name: str = "ActsTrkITkPixelSeedingMonitoring",
+ **kwargs) -> ComponentAccumulator:
acc = ComponentAccumulator()
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
@@ -87,12 +87,12 @@ def ActsTrkITkPixelSeedingLiveMonitoringCfg(flags,
xbins=100, xmin=0, xmax=50000)
acc.setPrivateTools(monTool)
- acc.merge(ActsTrkLiveMonitoringHistSvcCfg(flags))
+ acc.merge(ActsTrkMonitoringHistSvcCfg(flags))
return acc
-def ActsTrkITkStripSeedingLiveMonitoringCfg(flags,
- name: str = "ActsTrkITkStripSeedingLiveMonitoring",
- **kwargs) -> ComponentAccumulator:
+def ActsTrkITkStripSeedingMonitoringCfg(flags,
+ name: str = "ActsTrkITkStripSeedingMonitoring",
+ **kwargs) -> ComponentAccumulator:
acc = ComponentAccumulator()
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
@@ -102,6 +102,6 @@ def ActsTrkITkStripSeedingLiveMonitoringCfg(flags,
xbins=100, xmin=0, xmax=50000)
acc.setPrivateTools(monTool)
- acc.merge(ActsTrkLiveMonitoringHistSvcCfg(flags))
+ acc.merge(ActsTrkMonitoringHistSvcCfg(flags))
return acc
diff --git a/Tracking/Acts/ActsTrkAlgs/ActsTrkClusterization/python/ActsTrkClusterizationConfig.py b/Tracking/Acts/ActsTrkAlgs/ActsTrkClusterization/python/ActsTrkClusterizationConfig.py
index b022c9348089e92ae13a9daeb7f1d33339415334..1a55ba85ff39a292cff26de53171e887c67b7dc6 100644
--- a/Tracking/Acts/ActsTrkAlgs/ActsTrkClusterization/python/ActsTrkClusterizationConfig.py
+++ b/Tracking/Acts/ActsTrkAlgs/ActsTrkClusterization/python/ActsTrkClusterizationConfig.py
@@ -12,8 +12,8 @@ def ActsTrkITkPixelClusterizationAlgCfg(flags, name='ActsTrkITkPixelClusterizati
kwargs.setdefault("PixelClusteringTool", acc.popToolsAndMerge(ActsTrkITkPixelClusteringToolCfg(flags)))
if flags.Acts.doMonitoring:
- from ActsTrkAnalysis.ActsTrkLiveMonitoringConfig import ActsTrkITkPixelClusterizationLiveMonitoringToolCfg
- kwargs.setdefault('MonTool', acc.popToolsAndMerge(ActsTrkITkPixelClusterizationLiveMonitoringToolCfg(flags)))
+ from ActsTrkAnalysis.ActsTrkMonitoringConfig import ActsTrkITkPixelClusterizationMonitoringToolCfg
+ kwargs.setdefault('MonTool', acc.popToolsAndMerge(ActsTrkITkPixelClusterizationMonitoringToolCfg(flags)))
acc.addEventAlgo(CompFactory.ActsTrk.PixelClusterizationAlg(name, **kwargs))
return acc
@@ -29,7 +29,7 @@ def ActsTrkITkStripClusterizationAlgCfg(flags, name='ActsTrkItkStripClusterizati
acc.addEventAlgo(CompFactory.ActsTrk.StripClusterizationAlg(name, **kwargs))
if flags.Acts.doMonitoring:
- from ActsTrkAnalysis.ActsTrkLiveMonitoringConfig import ActsTrkITkStripClusterizationLiveMonitoringToolCfg
- kwargs.setdefault('MonTool', acc.popToolsAndMerge(ActsTrkITkStripClusterizationLiveMonitoringToolCfg(flags)))
+ from ActsTrkAnalysis.ActsTrkMonitoringConfig import ActsTrkITkStripClusterizationMonitoringToolCfg
+ kwargs.setdefault('MonTool', acc.popToolsAndMerge(ActsTrkITkStripClusterizationMonitoringToolCfg(flags)))
return acc
diff --git a/Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding/python/ActsTrkSeedingConfig.py b/Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding/python/ActsTrkSeedingConfig.py
index 809daa379ec379ce1f2fc951dac95ca47eccb58d..ede77c6c40a73477b576563a9a4b42fd38e2898c 100644
--- a/Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding/python/ActsTrkSeedingConfig.py
+++ b/Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding/python/ActsTrkSeedingConfig.py
@@ -39,8 +39,8 @@ def ActsTrkITkPixelSeedingFromAthenaCfg(flags,
kwargs.setdefault('DetectorElements', 'ITkPixelDetectorElementCollection')
if flags.Acts.doMonitoring:
- from ActsTrkAnalysis.ActsTrkLiveMonitoringConfig import ActsTrkITkPixelSeedingLiveMonitoringCfg
- kwargs.setdefault('MonTool', acc.popToolsAndMerge(ActsTrkITkPixelSeedingLiveMonitoringCfg(flags)))
+ from ActsTrkAnalysis.ActsTrkMonitoringConfig import ActsTrkITkPixelSeedingMonitoringCfg
+ kwargs.setdefault('MonTool', acc.popToolsAndMerge(ActsTrkITkPixelSeedingMonitoringCfg(flags)))
acc.addEventAlgo(CompFactory.ActsTrk.SeedingFromAthenaAlg(name, **kwargs))
return acc
@@ -76,8 +76,8 @@ def ActsTrkITkStripSeedingFromAthenaCfg(flags,
kwargs.setdefault('DetectorElements', 'ITkStripDetectorElementCollection')
if flags.Acts.doMonitoring:
- from ActsTrkAnalysis.ActsTrkLiveMonitoringConfig import ActsTrkITkStripSeedingLiveMonitoringCfg
- kwargs.setdefault('MonTool', acc.popToolsAndMerge(ActsTrkITkStripSeedingLiveMonitoringCfg(flags)))
+ from ActsTrkAnalysis.ActsTrkMonitoringConfig import ActsTrkITkStripSeedingMonitoringCfg
+ kwargs.setdefault('MonTool', acc.popToolsAndMerge(ActsTrkITkStripSeedingMonitoringCfg(flags)))
acc.addEventAlgo(CompFactory.ActsTrk.SeedingFromAthenaAlg(name, **kwargs))
return acc
@@ -110,8 +110,8 @@ def ActsTrkITkPixelSeedingCfg(flags,
kwargs.setdefault('SeedTool', seedTool)
if flags.Acts.doMonitoring:
- from ActsTrkAnalysis.ActsTrkLiveMonitoringConfig import ActsTrkITkPixelSeedingLiveMonitoringCfg
- kwargs.setdefault('MonTool', acc.popToolsAndMerge(ActsTrkITkPixelSeedingLiveMonitoringCfg(flags)))
+ from ActsTrkAnalysis.ActsTrkMonitoringConfig import ActsTrkITkPixelSeedingMonitoringCfg
+ kwargs.setdefault('MonTool', acc.popToolsAndMerge(ActsTrkITkPixelSeedingMonitoringCfg(flags)))
acc.addEventAlgo(CompFactory.ActsTrk.SeedingAlg(name, **kwargs))
return acc
@@ -133,8 +133,8 @@ def ActsTrkITkStripSeedingCfg(flags,
kwargs.setdefault('SeedTool', seedTool)
if flags.Acts.doMonitoring:
- from ActsTrkAnalysis.ActsTrkLiveMonitoringConfig import ActsTrkITkStripSeedingLiveMonitoringCfg
- kwargs.setdefault('MonTool', acc.popToolsAndMerge(ActsTrkITkStripSeedingLiveMonitoringCfg(flags)))
+ from ActsTrkAnalysis.ActsTrkMonitoringConfig import ActsTrkITkStripSeedingMonitoringCfg
+ kwargs.setdefault('MonTool', acc.popToolsAndMerge(ActsTrkITkStripSeedingMonitoringCfg(flags)))
acc.addEventAlgo(CompFactory.ActsTrk.SeedingAlg(name, **kwargs))
return acc
diff --git a/Tracking/TrkConfig/python/ActsTrkSpacePointFormationConfig.py b/Tracking/TrkConfig/python/ActsTrkSpacePointFormationConfig.py
index b9a4b187b4241835da5461b3940f0cb2b033d6db..216a41c891a2ac841a88c21c8d20d5ee5b18ea0e 100644
--- a/Tracking/TrkConfig/python/ActsTrkSpacePointFormationConfig.py
+++ b/Tracking/TrkConfig/python/ActsTrkSpacePointFormationConfig.py
@@ -34,8 +34,8 @@ def ActsTrkPixelSpacePointFormationCfg(ConfigFlags,
kwargs.setdefault("PixelSpacePointData", "ITkPixelSpacePointData")
if ConfigFlags.Acts.doMonitoring:
- from ActsTrkAnalysis.ActsTrkLiveMonitoringConfig import ActsTrkPixelSpacePointFormatioLiveMonitoringToolCfg
- kwargs.setdefault("MonTool", acc.popToolsAndMerge(ActsTrkPixelSpacePointFormatioLiveMonitoringToolCfg(ConfigFlags)))
+ from ActsTrkAnalysis.ActsTrkMonitoringConfig import ActsTrkPixelSpacePointFormationMonitoringToolCfg
+ kwargs.setdefault("MonTool", acc.popToolsAndMerge(ActsTrkPixelSpacePointFormationMonitoringToolCfg(ConfigFlags)))
acc.addEventAlgo(CompFactory.ActsTrk.PixelSpacePointFormationAlg(name, **kwargs))
return acc
@@ -61,8 +61,8 @@ def ActsTrkStripSpacePointFormationCfg(ConfigFlags,
kwargs.setdefault("ProcessOverlapForStrip", True)
if ConfigFlags.Acts.doMonitoring:
- from ActsTrkAnalysis.ActsTrkLiveMonitoringConfig import ActsTrkStripSpacePointFormatioLiveMonitoringToolCfg
- kwargs.setdefault("MonTool", acc.popToolsAndMerge(ActsTrkStripSpacePointFormatioLiveMonitoringToolCfg(ConfigFlags)))
+ from ActsTrkAnalysis.ActsTrkMonitoringConfig import ActsTrkStripSpacePointFormationMonitoringToolCfg
+ kwargs.setdefault("MonTool", acc.popToolsAndMerge(ActsTrkStripSpacePointFormationMonitoringToolCfg(ConfigFlags)))
acc.addEventAlgo(CompFactory.ActsTrk.StripSpacePointFormationAlg(name, **kwargs))
return acc