diff --git a/Control/AthenaCommon/python/AlgSequence.py b/Control/AthenaCommon/python/AlgSequence.py index 7681446baf276766006f4000f3a0873fcb63ba21..e8f4dbdd70b56724427fa24ea8436d66cee30fe3 100755 --- a/Control/AthenaCommon/python/AlgSequence.py +++ b/Control/AthenaCommon/python/AlgSequence.py @@ -231,6 +231,7 @@ def dumpMasterSequence(): dumpSequence( AthSequencer ("AthMasterSeq"), indent=0 ) dumpSequence( AthSequencer ("AthFilterSeq"), indent=1 ) dumpSequence( AlgSequence ("AthBeginSeq"), indent=2 ) + dumpSequence( AlgSequence ("AthCondSeq"), indent=2 ) dumpSequence( AlgSequence ("TopAlg"), indent=2 ) dumpSequence( AlgSequence ("AthEndSeq"), indent=2 ) dumpSequence( AthSequencer ("AthOutSeq"), indent=2 ) diff --git a/Control/AthenaCommon/python/AppMgr.py b/Control/AthenaCommon/python/AppMgr.py index 6577741c9180471df93e244f0c397004d89fc89b..c29c9f595c0dd7525a3556686451f5a26a34f465 100755 --- a/Control/AthenaCommon/python/AppMgr.py +++ b/Control/AthenaCommon/python/AppMgr.py @@ -20,6 +20,7 @@ __all__ = [ 'theApp', 'ServiceMgr', 'ToolSvc', 'AuditorSvc', 'theAuditorSvc', 'athMasterSeq', 'athFilterSeq', 'athBeginSeq', + 'athCondSeq', 'athAlgSeq', 'topSequence', 'athEndSeq' 'athOutSeq', @@ -255,14 +256,16 @@ class AthAppMgr( AppMgr ): def _build(): Logging.log.debug ("building master sequence...") - athMasterSeq = _as.AthSequencer ("AthMasterSeq") + athMasterSeq = _as.AthSequencer ("AthMasterSeq",Sequential = True) athFilterSeq = _as.AthSequencer ("AthFilterSeq"); athBeginSeq = _as.AthSequencer ("AthBeginSeq") + athCondSeq = _as.AthSequencer ("AthCondSeq") athAlgSeq = _as.AthSequencer ("AthAlgSeq") athEndSeq = _as.AthSequencer ("AthEndSeq") athOutSeq = _as.AthSequencer ("AthOutSeq") athRegSeq = _as.AthSequencer ("AthRegSeq") - athMTSeq = _as.AthSequencer ("AthMTSeq") + athAllAlgSeq = _as.AthSequencer ("AthAllAlgSeq") + athAlgEvtSeq = _as.AthSequencer ("AthAlgEvtSeq",Sequential = True) # transfer old TopAlg to new AthAlgSeq _top_alg = _as.AlgSequence("TopAlg") # first transfer properties @@ -305,13 +308,14 @@ class AthAppMgr( AppMgr ): # XXX: should we discard empty sequences ? # might save some CPU and memory... - athMTSeq+=athBeginSeq - athMTSeq+=athAlgSeq - athMTSeq+=athEndSeq - # athMasterSeq += athBeginSeq - # athMasterSeq += athAlgSeq - # athMasterSeq += athEndSeq - athMasterSeq += athMTSeq + athAllAlgSeq += athCondSeq + athAllAlgSeq += athAlgSeq + + athAlgEvtSeq += athBeginSeq + athAlgEvtSeq += athAllAlgSeq + athAlgEvtSeq += athEndSeq + + athMasterSeq += athAlgEvtSeq athMasterSeq += athOutSeq athMasterSeq += athRegSeq @@ -951,6 +955,8 @@ def AuditorSvc(): # backwards compatibility # | # +--- athBeginSeq # | +# +--- athCondSeq +# | # +--- athAlgSeq == TopAlg # | # +--- athEndSeq @@ -960,6 +966,7 @@ def AuditorSvc(): # backwards compatibility # +--- athRegStreams athMasterSeq = AlgSequence.AthSequencer( "AthMasterSeq" ) athFilterSeq = AlgSequence.AthSequencer( "AthFilterSeq" ) +athCondSeq = AlgSequence.AthSequencer( "AthCondSeq" ) athAlgSeq = AlgSequence.AthSequencer( "AthAlgSeq" ) athOutSeq = AlgSequence.AthSequencer( "AthOutSeq" ) athRegSeq = AlgSequence.AthSequencer( "AthRegSeq" ) diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py index 26284eede9055cc09013439a5bb0e1e07c1d5acf..c439ae0c47f5ce73271ecc811ca9bfc70c3ae978 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py @@ -135,7 +135,7 @@ if DetFlags.haveRIO.pixel_on(): if not conddb.folderRequested('/PIXEL/Pixreco'): conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco",className='DetCondCFloat') from AthenaCommon.AlgSequence import AthSequencer - condSequence = AthSequencer("AthBeginSeq") + condSequence = AthSequencer("AthCondSeq") from PixelCalibAlgs.PixelCalibAlgsConf import PixelCalibCondAlg condSequence += PixelCalibCondAlg( "PixelCalibCondAlg" ) ToolSvc.PixelRecoDbTool.InputSource = 2 diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py index 59ca1f747b308da92f87c31ae5355824bcb70d03..7e7c106b3490a9cbd94289b75a5077a090f90e1f 100755 --- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py +++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py @@ -475,17 +475,17 @@ topSequence+=EventCounter(Frequency=100) # algorithm sequence! #FIXME: Subsequent algorithms may alter the event info object (setting Error bits) from AthenaCommon.AlgSequence import AthSequencer -beginSeq = AthSequencer("AthBeginSeq") +condSeq = AthSequencer("AthCondSeq") if( ( not objKeyStore.isInInput( "xAOD::EventInfo") ) and \ ( not hasattr( topSequence, "xAODMaker::EventInfoCnvAlg" ) ) ): from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg - beginSeq+=xAODMaker__EventInfoCnvAlg() + condSeq+=xAODMaker__EventInfoCnvAlg() pass # Conditions data access infrastructure for serial and MT Athena from IOVSvc.IOVSvcConf import CondInputLoader -beginSeq += CondInputLoader( "CondInputLoader") +condSeq += CondInputLoader( "CondInputLoader") import StoreGate.StoreGateConf as StoreGateConf svcMgr += StoreGateConf.StoreGateSvc("ConditionStore")