update Gaudi to v28r2

Former-commit-id: c427e80e

Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts.py

@@ -13,9 +13,10 @@ nThreads = jp.ConcurrencyFlags.NumThreads()
 nProc = jp.ConcurrencyFlags.NumProcs()
 
 if nThreads >=1 :
-   from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-   svcMgr += ForwardSchedulerSvc()
-   svcMgr.ForwardSchedulerSvc.CheckDependencies = True
+   from AthenaCommon.AlgScheduler import AlgScheduler
+   AlgScheduler.OutputLevel( INFO )
+   AlgScheduler.ShowControlFlow( True )
+   AlgScheduler.ShowDataDependencies( True )
 
    # Support for the MT-MP hybrid mode
    if (nProc > 0) :

Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_alt.py

@@ -33,10 +33,10 @@ if (nThreads < 1) :
 # from GaudiHive.GaudiHiveConf import AlgResourcePool
 # svcMgr += AlgResourcePool( OutputLevel = INFO );
 
-from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-svcMgr += ForwardSchedulerSvc()
-svcMgr.ForwardSchedulerSvc.CheckDependencies = True
-# svcMgr.ForwardSchedulerSvc.OutputLevel = INFO
+from AthenaCommon.AlgScheduler import AlgScheduler
+AlgScheduler.OutputLevel( INFO )
+AlgScheduler.ShowControlFlow( True )
+AlgScheduler.ShowDataDependencies( True )
 
 from RecExConfig.RecFlags import rec
 rec.doTruth.set_Value_and_Lock(False)

Control/AthViews/share/GraphViews.py

+#
+#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#
+
 ###############################################################
 #
 # Job options file
@@ -11,9 +15,9 @@
 #--------------------------------------------------------------
 
 # Configure the scheduler
-from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-svcMgr += ForwardSchedulerSvc()
-svcMgr.ForwardSchedulerSvc.CheckDependencies = True
+from AthenaCommon.AlgScheduler import AlgScheduler
+AlgScheduler.ShowControlFlow( True )
+AlgScheduler.ShowDataDependencies( True )
 
 # Make a separate alg pool for the view algs
 from GaudiHive.GaudiHiveConf import AlgResourcePool

Control/AthenaCommon/python/AlgScheduler.py

+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+# Configuration for the Hive Algorithm Scheduler.
+#
+# Allows easy low level replacement of the specific Scheduler, without
+# requiring clients to know which one is in use.
+#
+# the AlgScheduler will be setup with the same number of threads
+# as are specified on the command line with the "--threads=N" parameter
+#
+# usage:
+#  from AthenaCommon.AlgScheduler import AlgScheduler
+# clients can then configure runtime printouts, threadpool, etc:
+#  AlgScheduler.ShowDataDependencies( True )
+#  AlgScheduler.ShowControlFlow( True )
+#  AlgScheduler.ShowDataFlow( True )
+#  AlgScheduler.setThreadPoolSize( 7 )
+#
+# if a specific scheduler lacks that option, a warning message is printed
+# clients can also replace the default scheduler with another one
+#  from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
+#  myScheduler = ForwardSchedulerSvc()
+#  AlgScheduler.SetScheduler( myScheduler )
+#  AlgScheduler.setThreadPoolSize( 7 )
+#
+# if this is done, the HiveEventLoopMgr also needs to know about it
+#    from AthenaServices.AthenaServicesConf import AthenaHiveEventLoopMgr
+#    svcMgr.AthenaHiveEventLoopMgr.SchedulerSvc = AlgScheduler.getScheduler().getName()
+#
+
+
+class AlgScheduler:
+    def __init__(self,theSched=None):
+        """Setup Algorithm Scheduler"""
+
+        from AppMgr import ServiceMgr as svcMgr
+        from Constants import VERBOSE, DEBUG, INFO, ERROR
+
+        from ConcurrencyFlags import jobproperties as jps
+        from AthenaCommon.Logging import logging
+
+        self.log = logging.getLogger( 'AlgScheduler' )
+
+        if (theSched == None) :
+            from GaudiHive.GaudiHiveConf import AvalancheSchedulerSvc
+            svcMgr += AvalancheSchedulerSvc()
+            self.SchedulerSvc = svcMgr.AvalancheSchedulerSvc
+        else :
+            svcMgr += theSched
+            self.SchedulerSvc = theSched
+            
+        self.SchedulerSvc.OutputLevel = INFO
+        self.SchedulerSvc.CheckDependencies = True
+        self.SchedulerSvc.ThreadPoolSize = jps.ConcurrencyFlags.NumThreads()
+
+        self.log.info("setting up " + self.SchedulerSvc.getFullName() + " with " + str(jps.ConcurrencyFlags.NumThreads()) + " threads")
+
+
+#
+## exchange the current scheduler for another one
+    def SetScheduler(self,theSched):
+        """setup a different Scheduler"""
+
+        if (self.SchedulerSvc.getFullName() != theSched.getFullName()) :
+            self.log.info("replacing " + self.SchedulerSvc.getFullName() 
+                          + " with " + theSched.getFullName())
+            from AppMgr import ServiceMgr as svcMgr
+            svcMgr.remove(self.SchedulerSvc)
+            svcMgr += theSched
+            self.SchedulerSvc = theSched
+
+#
+## change the output level
+    def OutputLevel(self,level) :
+        self.SchedulerSvc.OutputLevel = level
+        
+#
+## control checking of data deps at beginning of job for unmet input deps
+    def CheckDependencies(self,check=True):
+        if ( 'CheckDependencies' in self.SchedulerSvc.properties() ):
+            self.SchedulerSvc.CheckDependencies = check
+        else :
+            self.log.warning( self.SchedulerSvc.getFullName() + " has no property \"CheckDependencies\"")
+
+#
+## control printout of control flow at beginning of job
+    def ShowControlFlow(self,show=True):
+        if ( 'ShowControlFlow' in self.SchedulerSvc.properties() ):
+            self.SchedulerSvc.ShowControlFlow = show
+        else :
+            self.log.warning(self.SchedulerSvc.getFullName() + " has no property \"ShowControlFlow\"")
+
+#
+## control printout of data flow at beginning of job
+    def ShowDataFlow(self,show=True):
+        if ( 'ShowDataFlow' in self.SchedulerSvc.properties() ):
+            self.SchedulerSvc.ShowDataFlow = show
+        else :
+            self.log.warning(self.SchedulerSvc.getFullName() + " has no property \"ShowDataFlow\"")
+
+#
+## control printout of data dependencies at beginning of job
+    def ShowDataDependencies(self,show=True):
+        if ( 'ShowDataDependencies' in self.SchedulerSvc.properties() ):
+            self.SchedulerSvc.ShowDataDependencies = show
+        else :
+            self.log.warning(self.SchedulerSvc.getFullName() + " has no property \"ShowDataDependencies\"")
+
+
+#
+## set the DataLoader Algorithm to handle unmet input data deps
+    def setDataLoaderAlg(self,dataLoadAlg):
+        if ( 'DataLoaderAlg' in self.SchedulerSvc.properties() ):
+            self.SchedulerSvc.DataLoaderAlg = dataLoadAlg
+        else :
+            self.log.warning(self.SchedulerSvc.getFullName() + " has no property \"DataLoaderAlg\"")
+
+#
+## enable condition handling
+    def EnableConditions(self,enable=True):
+        if ( 'EnableConditions' in self.SchedulerSvc.properties() ):
+            self.SchedulerSvc.EnableConditions = enable
+        else :
+            self.log.warning(self.SchedulerSvc.getFullName() + " has no property \"EnableConditions\"")
+
+
+#
+## explicitly set the thread pool size
+    def setThreadPoolSize(self,tps) :
+        self.SchedulerSvc.ThreadPoolSize = tps
+
+#
+## get the currently configured scheduler
+    def getScheduler(self):
+        """Get the Scheduler"""
+        return self.SchedulerSvc
+
+AlgScheduler = AlgScheduler()

Control/AthenaCommon/python/AtlasThreadedJob.py

@@ -26,14 +26,6 @@ def _setupAtlasThreadedJob():
 
     theApp.StatusCodeCheck = False
 
-    from AthenaServices.AthenaServicesConf import AthenaHiveEventLoopMgr
-
-    svcMgr += AthenaHiveEventLoopMgr()
-    svcMgr.AthenaHiveEventLoopMgr.WhiteboardSvc = "EventDataSvc"
-#    svcMgr.AthenaHiveEventLoopMgr.OutputLevel = INFO
-
-    theApp.EventLoop = "AthenaHiveEventLoopMgr"
-
     svcMgr.StatusCodeSvc.AbortOnError = False
 
     nThreads = jps.ConcurrencyFlags.NumThreads()
@@ -44,7 +36,6 @@ def _setupAtlasThreadedJob():
     from StoreGate.StoreGateConf import SG__HiveMgrSvc
     svcMgr += SG__HiveMgrSvc("EventDataSvc")
     svcMgr.EventDataSvc.NSlots = numStores
-#    svcMgr.EventDataSvc.OutputLevel = INFO
 
     import StoreGate.StoreGateConf as StoreGateConf
     svcMgr += StoreGateConf.StoreGateSvc("ConditionStore")
@@ -55,14 +46,17 @@ def _setupAtlasThreadedJob():
     arp.TopAlg=["AthMasterSeq"] #this should enable control flow
     svcMgr += arp
 
-    from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-    svcMgr += ForwardSchedulerSvc()
-    svcMgr.ForwardSchedulerSvc.OutputLevel = INFO
-    svcMgr.ForwardSchedulerSvc.MaxEventsInFlight = numStores
-    svcMgr.ForwardSchedulerSvc.MaxAlgosInFlight = numAlgsInFlight
-    svcMgr.ForwardSchedulerSvc.ThreadPoolSize = numThreads
-    svcMgr.ForwardSchedulerSvc.useGraphFlowManagement = True
-    svcMgr.ForwardSchedulerSvc.DataFlowManagerNext = True
+    from AlgScheduler import AlgScheduler
+    AlgScheduler.ShowDataDependencies(False)
+    AlgScheduler.ShowControlFlow(False)
+
+    from AthenaServices.AthenaServicesConf import AthenaHiveEventLoopMgr
+
+    svcMgr += AthenaHiveEventLoopMgr()
+    svcMgr.AthenaHiveEventLoopMgr.WhiteboardSvc = "EventDataSvc"
+    svcMgr.AthenaHiveEventLoopMgr.SchedulerSvc = AlgScheduler.getScheduler().getName()
+
+    theApp.EventLoop = "AthenaHiveEventLoopMgr"
 
     # enable timeline recording
     from GaudiHive.GaudiHiveConf import TimelineSvc

Control/AthenaExamples/AthExHive/share/AthExHiveOpts.py

@@ -27,22 +27,10 @@ from StoreGate.StoreGateConf import SG__HiveMgrSvc
 from GaudiHive.GaudiHiveConf import AlgResourcePool
 # svcMgr += AlgResourcePool( OutputLevel = INFO );
 
-from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-svcMgr.ForwardSchedulerSvc.OutputLevel = INFO
-svcMgr.ForwardSchedulerSvc.CheckDependencies = True
-
-#
-## Override defaults for numStores and numAlgsInFlight 
-##   Otherwise these are BOTH EQUAL to the number of threads set with the 
-##   command line opt --threads=N
-#
-
-# numStores = 1
-# numAlgsInFlight = 1
-
-# svcMgr.EventDataSvc.NSlots = numStores
-# svcMgr.ForwardSchedulerSvc.MaxEventsInFlight = numStores
-# svcMgr.ForwardSchedulerSvc.MaxAlgosInFlight = numAlgsInFlight
+from AthenaCommon.AlgScheduler import AlgScheduler
+AlgScheduler.OutputLevel( INFO )
+AlgScheduler.ShowControlFlow( True )
+AlgScheduler.ShowDataDependencies( True )
 
 # ThreadPoolService thread local initialization
 from GaudiHive.GaudiHiveConf import ThreadPoolSvc

Control/AthenaExamples/AthExHive/share/CircDataDep.py

@@ -26,22 +26,10 @@ from StoreGate.StoreGateConf import SG__HiveMgrSvc
 from GaudiHive.GaudiHiveConf import AlgResourcePool
 # svcMgr += AlgResourcePool( OutputLevel = INFO );
 
-from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-svcMgr.ForwardSchedulerSvc.OutputLevel = INFO
-svcMgr.ForwardSchedulerSvc.CheckDependencies = True
-
-#
-## Override defaults for numStores and numAlgsInFlight 
-##   Otherwise these are BOTH EQUAL to the number of threads set with the 
-##   command line opt --threads=N
-#
-
-# numStores = 1
-# numAlgsInFlight = 1
-
-# svcMgr.ForwardSchedulerSvc.DataLoaderAlg = "SGInputLoader"
-svcMgr.ForwardSchedulerSvc.ShowConfiguration = True
-svcMgr.ForwardSchedulerSvc.ShowDataFlow = True
+from AthenaCommon.AlgScheduler import AlgScheduler
+AlgScheduler.OutputLevel( INFO )
+AlgScheduler.ShowControlFlow( True )
+AlgScheduler.ShowDataDependencies( True )
 
 #------------------------------------------------------------------------------#
 #

Control/AthenaExamples/AthExHive/share/CondAlgsOpts.py

@@ -35,29 +35,11 @@ from StoreGate.StoreGateConf import SG__HiveMgrSvc
 from GaudiHive.GaudiHiveConf import AlgResourcePool
 # svcMgr += AlgResourcePool( OutputLevel = INFO );
 
-from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-svcMgr.ForwardSchedulerSvc.OutputLevel = INFO
-svcMgr.ForwardSchedulerSvc.CheckDependencies = True
-svcMgr.ForwardSchedulerSvc.EnableConditions = True
-
-#
-## Override defaults for numStores and numAlgsInFlight 
-##   Otherwise these are BOTH EQUAL to the number of threads set with the 
-##   command line opt --threads=N
-#
-
-# numStores = 1
-# numAlgsInFlight = 1
-
-# svcMgr.EventDataSvc.NSlots = numStores
-# svcMgr.ForwardSchedulerSvc.MaxEventsInFlight = numStores
-# svcMgr.ForwardSchedulerSvc.MaxAlgosInFlight = numAlgsInFlight
-
-# ThreadPoolService thread local initialization
-# from GaudiHive.GaudiHiveConf import ThreadPoolSvc
-# svcMgr += ThreadPoolSvc("ThreadPoolSvc")
-# svcMgr.ThreadPoolSvc.ThreadInitTools = ["ThreadInitTool"]
-
+from AthenaCommon.AlgScheduler import AlgScheduler
+AlgScheduler.OutputLevel( INFO )
+AlgScheduler.ShowControlFlow( True )
+AlgScheduler.ShowDataDependencies( True )
+AlgScheduler.EnableConditions( True )
 
 from IOVSvc.IOVSvcConf import CondSvc
 svcMgr += CondSvc( OutputLevel=DEBUG )
@@ -85,7 +67,7 @@ from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
 
 from SGComps.SGCompsConf import SGInputLoader
-topSequence+=SGInputLoader(OutputLevel=INFO, ShowEventDump=False)
+topSequence+=SGInputLoader(OutputLevel=DEBUG, ShowEventDump=False)
 topSequence.SGInputLoader.Load = [ ('EventInfo','McEventInfo') ]
 
 from AthExHive.AthExHiveConf import *

Control/AthenaExamples/AthExHive/share/DataLoopTest.py

@@ -27,23 +27,11 @@ from StoreGate.StoreGateConf import SG__HiveMgrSvc
 from GaudiHive.GaudiHiveConf import AlgResourcePool
 # svcMgr += AlgResourcePool( OutputLevel = INFO );
 
-from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-svcMgr.ForwardSchedulerSvc.OutputLevel = INFO
-svcMgr.ForwardSchedulerSvc.CheckDependencies = True
-svcMgr.ForwardSchedulerSvc.useGraphFlowManagement = True
+from AthenaCommon.AlgScheduler import AlgScheduler
+AlgScheduler.OutputLevel( INFO )
+AlgScheduler.ShowControlFlow( True )
+AlgScheduler.ShowDataDependencies( True )
 
-#
-## Override defaults for numStores and numAlgsInFlight 
-##   Otherwise these are BOTH EQUAL to the number of threads set with the 
-##   command line opt --threads=N
-#
-
-# numStores = 1
-# numAlgsInFlight = 1
-
-# svcMgr.EventDataSvc.NSlots = numStores
-# svcMgr.ForwardSchedulerSvc.MaxEventsInFlight = numStores
-# svcMgr.ForwardSchedulerSvc.MaxAlgosInFlight = numAlgsInFlight
 
 # ThreadPoolService thread local initialization
 from GaudiHive.GaudiHiveConf import ThreadPoolSvc
@@ -95,8 +83,8 @@ HL3 = HiveAlgL3("AlgL3",OutputLevel=DEBUG,Key_U1=loopKey,Time=120)
 HM = HiveAlgM("AlgM",OutputLevel=DEBUG,Key_R2=loopKey,Offset=3,Time=30)
 
 alp += HL1
-alp += HL2
-alp += HL3
+# alp += HL2
+# alp += HL3
 alp += HM
 topSequence += alp
 

Control/AthenaExamples/AthExStoreGateExample/share/StoreGateHiveExample.py

+#
+#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#
+
 ###############################################################
 #
 # AthExStoreGateExample Job options file reading Generated events
@@ -26,15 +30,11 @@ from StoreGate.StoreGateConf import SG__HiveMgrSvc
 svcMgr += SG__HiveMgrSvc("EventDataSvc")
 svcMgr.EventDataSvc.NSlots = numStores
 
-from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-svcMgr += ForwardSchedulerSvc()
-svcMgr.ForwardSchedulerSvc.OutputLevel = DEBUG
-svcMgr.ForwardSchedulerSvc.MaxEventsInFlight = numStores
-svcMgr.ForwardSchedulerSvc.MaxAlgosInFlight = 1
-svcMgr.ForwardSchedulerSvc.ThreadPoolSize = 1
-
-svcMgr.ForwardSchedulerSvc.AlgosDependencies = [[],['8000/WriteData'],[],[]]
-
+from AthenaCommon.AlgScheduler import AlgScheduler
+AlgScheduler.OutputLevel( DEBUG )
+AlgScheduler.ShowControlFlow( True )
+AlgScheduler.ShowDataDependencies( True )
+AlgScheduler.setThreadPoolSize( 1 )
 
 svcMgr += AthenaHiveEventLoopMgr()
 svcMgr.AthenaHiveEventLoopMgr.WhiteboardSvc = "EventDataSvc"

Control/AthenaExamples/AthExStoreGateExample/share/StoreGateHiveExample_Reentrant_jobOptions.py

+#
+#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#
+
 ###############################################################
 #
 # AthExStoreGateExample Job options file reading Generated events
@@ -26,19 +30,15 @@ from StoreGate.StoreGateConf import SG__HiveMgrSvc
 svcMgr += SG__HiveMgrSvc("EventDataSvc")
 svcMgr.EventDataSvc.NSlots = numStores
 
-from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-svcMgr += ForwardSchedulerSvc()
-svcMgr.ForwardSchedulerSvc.OutputLevel = DEBUG
-svcMgr.ForwardSchedulerSvc.MaxEventsInFlight = numStores
-svcMgr.ForwardSchedulerSvc.MaxAlgosInFlight = 1
-svcMgr.ForwardSchedulerSvc.ThreadPoolSize = 1
-
-svcMgr.ForwardSchedulerSvc.AlgosDependencies = [[],['8000/WriteData'],[],[]]
+#svcMgr.ForwardSchedulerSvc.AlgosDependencies = [[],['8000/WriteData'],[],[]]
 
+from AthenaCommon.AlgScheduler import AlgScheduler
+AlgScheduler.setThreadPoolSize( 1 )
 
 svcMgr += AthenaHiveEventLoopMgr()
 svcMgr.AthenaHiveEventLoopMgr.WhiteboardSvc = "EventDataSvc"
 svcMgr.AthenaHiveEventLoopMgr.OutputLevel = DEBUG
+svcMgr.AthenaHiveEventLoopMgr.SchedulerSvc = AlgScheduler.getScheduler().getName()
 
 from StoreGate.StoreGateConf import SG__HiveMgrSvc
 svcMgr += SG__HiveMgrSvc("EventDataSvc")

Control/AthenaMonitoring/share/GenericMonitoringToolTest_jobOptions.py

+#
+#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#
+
 ## basic job configuration
 import AthenaCommon.AtlasUnixStandardJob
 
@@ -64,13 +68,10 @@ print svcMgr
 
 theApp.EvtMax = 1
 
-
-from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-svcMgr += ForwardSchedulerSvc()
-svcMgr.ForwardSchedulerSvc.MaxEventsInFlight = 1
-svcMgr.ForwardSchedulerSvc.MaxAlgosInFlight = 1
-svcMgr.ForwardSchedulerSvc.ThreadPoolSize = 1
-svcMgr.ForwardSchedulerSvc.CheckDependencies = True
+from AthenaCommon.AlgScheduler import AlgScheduler
+AlgScheduler.ShowControlFlow( True )
+AlgScheduler.ShowDataDependencies( True )
+AlgScheduler.setThreadPoolSize( 1 )
 
 
 print "topSequence dump:", topSequence

Control/AthenaPython/AthenaPython/PyProperty.h

@@ -26,7 +26,7 @@ typedef _object PyObject;
 
 
 class PyProperty
-  : public PropertyWithHandlers
+  : public PropertyWithHandlers<>
 { 
 
   /////////////////////////////////////////////////////////////////// 

Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h

@@ -33,7 +33,7 @@ namespace Gaudi {
 namespace SG {
 
   class GAUDI_API VarHandleKeyArrayProperty
-    : public ::PropertyWithHandlers 
+    : public ::PropertyWithHandlers <>
   {
   public:
  

Control/StoreGate/StoreGate/VarHandleKeyProperty.h

@@ -76,7 +76,7 @@ namespace SG {
  * The Property object refers to an instance of @c SG::VarHandleKey
  * (the value object) and provides generic methods for manipulating it.
  */
-class GAUDI_API VarHandleKeyProperty : public PropertyWithHandlers 
+  class GAUDI_API VarHandleKeyProperty : public PropertyWithHandlers <>
 {
 public:
 

HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx

@@ -432,7 +432,6 @@ const RawEvent* ByteStreamEmonInputSvc::nextEvent()
             try {
                 m_re->check_tree();
                 log << MSG::INFO << "nextEvent: Got valid fragment of size:" << event.size() << endmsg;
-                log << MSG::INFO << "nextEvent: Got valid fragment of size:" << event.size() << endreq;
                 m_robProvider->setNextEvent(m_re);
                 m_robProvider->setEventStatus(0);
             } catch (ers::Issue& ex) {

InnerDetector/InDetExample/InDetRecExample/share/InDetHivePreExec.py

+#
+#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#
+
 #Early failure warning
-from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-svcMgr += ForwardSchedulerSvc()
-svcMgr.ForwardSchedulerSvc.CheckDependencies = True
+from AthenaCommon.AlgScheduler import AlgScheduler
+AlgScheduler.CheckDependencies( True )
 
 ## get a handle on the ServiceManager
 from AthenaCommon.AppMgr import ServiceMgr as svcMgr

MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_myTopOptions_MT.py

@@ -80,9 +80,9 @@ try:
     include("MuonRecExample/MuonRec_topOptions.py")
    
     from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-    from GaudiHive.GaudiHiveConf import ForwardSchedulerSvc
-    svcMgr += ForwardSchedulerSvc()
-    svcMgr.ForwardSchedulerSvc.CheckDependencies = True
+    from AthenaCommon.AlgScheduler import AlgScheduler
+    AlgScheduler.CheckDependencies( True )
+
     from SGComps.SGCompsConf import SGInputLoader
     topSequence += SGInputLoader( OutputLevel=INFO, ShowEventDump=False )
     topSequence.SGInputLoader.Load = [ ('MdtCsmContainer','MDTCSM'), ('RpcPadContainer','RPCPAD'), ('TgcRdoContainer','TGCRDO'), ('CscRawDataContainer','CSCRDO')]

Projects/Athena/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 AthenaExternalsVersion = 6491b6ae
-GaudiVersion = v28r1.conditions.010
+GaudiVersion = v28r2.001

Simulation/G4Sim/G4HiveEx/share/G4HiveExOpts.py

@@ -24,7 +24,6 @@ svcMgr.MessageSvc.Format = msgFmt
 # svcMgr.MessageSvc.useColors = True
 
 # svcMgr.AthenaHiveEventLoopMgr.OutputLevel = DEBUG
-# svcMgr.ForwardSchedulerSvc.OutputLevel = DEBUG
 
 #
 ## Override defaults. otherwise these are ALL EQUAL to the number of threads
@@ -32,11 +31,13 @@ svcMgr.MessageSvc.Format = msgFmt
 #
 
 # numStores = 1
-# numAlgsInFlight = 1
-
 # svcMgr.EventDataSvc.NSlots = numStores
-# svcMgr.ForwardSchedulerSvc.MaxEventsInFlight = numStores
-# svcMgr.ForwardSchedulerSvc.MaxAlgosInFlight = numAlgsInFlight
+
+# from AthenaCommon.AlgScheduler import AlgScheduler
+# AlgScheduler.OutputLevel( DEBUG )
+# AlgScheduler.ShowControlFlow( True )
+# AlgScheduler.ShowDataDependencies( True )
+# AlgScheduler.setThreadPoolSize( nThreads )
 
 # Thread pool service and initialization
 from GaudiHive.GaudiHiveConf import ThreadPoolSvc