PerfMonComps: Updates to begin/end event handling in PerfMonSvc

This is a continuation of !36582 (merged). Since we've gotten rid of the Begin/EndEvent incidents and trigger these via certain components now, we always need the auditors. I also made the names of the components that trigger the begin/end event configurable. In serial Athena every event starts w/ an before execute auditor call from AthMasterSeq and ends w/ an after execute call from AthMasterSeq. However, in MT that's not the case. PerfMonSvc is still used for monitoring events w/ --nthreads=1. There, we simply use IncidentProcAlgs for this purpose.

Closes ATLASSIM-4839

Control/PerformanceMonitoring/PerfMonComps/python/JobOptCfg.py

@@ -5,7+5,7 @@
 # @author: Sebastien Binet <binet@cern.ch>
 
 ## import the automatically generated Configurables
 from __future__ import print_function
 from PerfMonComps.PerfMonCompsConf import PerfMonSvc as _PerfMonSvc
 import six
 
@@ -30,7+30,7 @@
         from AthenaCommon.ConcurrencyFlags import jobproperties as jp
         if jp.ConcurrencyFlags.NumThreads() > 1:
             print(" >> PerfMonSvc should NOT be used in MT>1 jobs, self removing...")
             if hasattr(svcMgr, 'PerfMonSvc'):
                 del svcMgr.PerfMonSvc
             return
 
@@ -45,7+45,7 @@
         if not isinstance(handle, PerfMonSvc):
             return
 
-        from AthenaCommon import CfgMgr
-        ## get a handle on the application manager
+        ## get a handle on the application manager and attach the auditors
         from AthenaCommon.AppMgr import theApp
-        if not jobproperties.PerfMonFlags.doFastMon() or jobproperties.PerfMonFlags.doSemiDetailedMonitoring():
-            theApp.AuditAlgorithms = True
-            theApp.AuditTools      = True
-            theApp.AuditServices   = True
+        theApp.AuditAlgorithms = True
+        theApp.AuditTools      = True
+        theApp.AuditServices   = True
+
+        ## For MT=1 jobs use IncidentProcAlgs to trigger begin/end event
+        if jp.ConcurrencyFlags.NumThreads() == 1:
+            handle.compBeginEvent = "IncidentProcAlg1"
+            handle.compEndEvent = "IncidentProcAlg2"
 
         ## get output levels
         import AthenaCommon.Constants as Lvl
@@ -59,7 +62,7 @@ class PerfMonSvc( _PerfMonSvc ):
         ## make sure the application manager explicitly creates the service
         if hasattr(handle, "getFullJobOptName") :
             handleName = handle.getFullJobOptName()
-            if not handleName in theApp.CreateSvc:
+            if handleName not in theApp.CreateSvc:
                 # we want to be the very first service to be initialized
                 # so we can monitor what happens during initialize
                 theApp.CreateSvc = [ handleName ] + theApp.CreateSvc
@@ -99,7 +102,7 @@ class PerfMonSvc( _PerfMonSvc ):
                 if isinstance( v, ( ConfigurableAlgorithm,
                                     ConfigurableAlgTool,
                                     ConfigurableService ) ) \
-                   and not k in ('PerfMonSvc',
+                   and k not in ('PerfMonSvc',
                                  'AthenaEventLoopMgr',):
                     componentNames.append (v.getJobOptName())
                     pass
@@ -115,7 +118,8 @@ class PerfMonSvc( _PerfMonSvc ):
             not jobproperties.PerfMonFlags.doFastMon()) :
                     
             ## make sure the AthenaPoolCnvSvc is correctly configured
-            try:   svcMgr.AthenaPoolCnvSvc.UseDetailChronoStat = True
+            try:
+                svcMgr.AthenaPoolCnvSvc.UseDetailChronoStat = True
             except AttributeError:
                 # ok... maybe not a 'writeAthenaPool' job...
                 pass
@@ -129,7 +133,8 @@ class PerfMonSvc( _PerfMonSvc ):
                 if 'Streams' in Configurable.configurables:
                     outStreams = Configurable.configurables['Streams']
                     for o in outStreams:
-                        if not hasattr(o, 'ItemList'): continue
+                        if not hasattr(o, 'ItemList'):
+                            continue
                         ioContainers += [ i for i in o.ItemList
                                           if not i.endswith("#*") ]
                     pass
@@ -146,7+151,7 @@
                         except AttributeError:
                             for k,v in keystore[l].items():
                                 ioContainers += [ "%s#%s" % (k,c) for c in v ]
                     pass
                 ## collect everything
                 handle.IoContainers = ioContainers
                 pass