Skip to content
Snippets Groups Projects
Commit d08d0375 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'master-fix-perfmonmt-config-error' into 'master'

PerfMonComps: Do not overwrite topSequence in the configuration

See merge request atlas/athena!39101
parents 80f95a76 9b001355
No related branches found
No related tags found
No related merge requests found
...@@ -135,22 +135,22 @@ class doMonitoringMT(JobProperty): ...@@ -135,22 +135,22 @@ class doMonitoringMT(JobProperty):
svcMgr += PerfMonMTSvc("PerfMonMTSvc") svcMgr += PerfMonMTSvc("PerfMonMTSvc")
# Setup PerfMonAlg # Setup PerfMonAlg
from AthenaCommon.AlgSequence import AthSequencer from AthenaCommon.AlgSequence import AthSequencer
topSequence = AthSequencer("AthAlgSeq") algSeq = AthSequencer("AthAlgSeq")
if not hasattr(topSequence, "PerfMonMTAlg"): if not hasattr(algSeq, "PerfMonMTAlg"):
from PerfMonComps.PerfMonCompsConf import PerfMonMTAlg from PerfMonComps.PerfMonCompsConf import PerfMonMTAlg
topSequence += PerfMonMTAlg("PerfMonMTAlg") algSeq += PerfMonMTAlg("PerfMonMTAlg")
return return
def _undo_action(self): def _undo_action(self):
# Uninstall the service and the algorithm # Uninstall the service and the algorithm
from AthenaCommon.AppMgr import ServiceMgr as svcMgr from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaCommon.AlgSequence import AthSequencer from AthenaCommon.AlgSequence import AthSequencer
topSequence = AthSequencer("AthAlgSeq") algSeq = AthSequencer("AthAlgSeq")
if hasattr(svcMgr, 'PerfMonMTSvc'): if hasattr(svcMgr, 'PerfMonMTSvc'):
del svcMgr.PerfMonMTSvc del svcMgr.PerfMonMTSvc
if hasattr(topSequence, 'PerfMonMTAlg'): if hasattr(algSeq, 'PerfMonMTAlg'):
del topSequence.PerfMonMTAlg del algSeq.PerfMonMTAlg
return return
# #
class doFastMonMT(JobProperty): class doFastMonMT(JobProperty):
......
...@@ -31,8 +31,9 @@ if not hasattr(svcMgr, 'PerfMonMTSvc'): ...@@ -31,8 +31,9 @@ if not hasattr(svcMgr, 'PerfMonMTSvc'):
# Load PerfMonMTAlg # Load PerfMonMTAlg
############################### ###############################
from AthenaCommon.AlgSequence import AthSequencer from AthenaCommon.AlgSequence import AthSequencer
topSequence = AthSequencer("AthAlgSeq") algSeq = AthSequencer("AthAlgSeq")
if not hasattr(topSequence, "PerfMonMTAlg"): if not hasattr(algSeq, "PerfMonMTAlg"):
from PerfMonComps.PerfMonCompsConf import PerfMonMTAlg from PerfMonComps.PerfMonCompsConf import PerfMonMTAlg
topSequence += PerfMonMTAlg("PerfMonMTAlg") algSeq += PerfMonMTAlg("PerfMonMTAlg")
pass pass
del algSeq
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment