diff --git a/Calorimeter/CaloRec/share/CaloCellContainerAliasAlg_test.ref b/Calorimeter/CaloRec/share/CaloCellContainerAliasAlg_test.ref
index 9129a6d073bcb0736115844e41f47e3e3905f2db..850bef3e9c1a3ec0a94088aa12750ab91f7d1c92 100644
--- a/Calorimeter/CaloRec/share/CaloCellContainerAliasAlg_test.ref
+++ b/Calorimeter/CaloRec/share/CaloCellContainerAliasAlg_test.ref
@@ -243,7 +243,6 @@ ApplicationMgr SUCCESS AthSequencer/AthEndSeq
ApplicationMgr SUCCESS AthIncFirerAlg/EndIncFiringAlg
ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg2
ApplicationMgr SUCCESS AthSequencer/AthOutSeq
-ApplicationMgr SUCCESS AthSequencer/AthRegSeq
ApplicationMgr SUCCESS ******************************************************************************
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/OnOffIdMap'
ApplicationMgr INFO Application Manager Started successfully
diff --git a/Calorimeter/CaloRec/share/CaloThinCellsByClusterAlg_test.ref b/Calorimeter/CaloRec/share/CaloThinCellsByClusterAlg_test.ref
index 2d5f7c57003d80b0c8444b1ab3904f1b8c5be33c..15cd1168be860a84582dedca1ca610c3d0c0fda1 100644
--- a/Calorimeter/CaloRec/share/CaloThinCellsByClusterAlg_test.ref
+++ b/Calorimeter/CaloRec/share/CaloThinCellsByClusterAlg_test.ref
@@ -242,7 +242,6 @@ ApplicationMgr SUCCESS AthSequencer/AthEndSeq
ApplicationMgr SUCCESS AthIncFirerAlg/EndIncFiringAlg
ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg2
ApplicationMgr SUCCESS AthSequencer/AthOutSeq
-ApplicationMgr SUCCESS AthSequencer/AthRegSeq
ApplicationMgr SUCCESS ******************************************************************************
ClassIDSvc INFO getRegistryEntries: read 104 CLIDRegistry entries for module ALL
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/OnOffIdMap'
diff --git a/Calorimeter/CaloRec/share/CaloThinCellsBySamplingAlg_test.ref b/Calorimeter/CaloRec/share/CaloThinCellsBySamplingAlg_test.ref
index 1f5c562c172235743913c3c02df41a89f9461792..09dd51f6a0d96dd4a233ecea2dac3a467144c0f8 100644
--- a/Calorimeter/CaloRec/share/CaloThinCellsBySamplingAlg_test.ref
+++ b/Calorimeter/CaloRec/share/CaloThinCellsBySamplingAlg_test.ref
@@ -242,7 +242,6 @@ ApplicationMgr SUCCESS AthSequencer/AthEndSeq
ApplicationMgr SUCCESS AthIncFirerAlg/EndIncFiringAlg
ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg2
ApplicationMgr SUCCESS AthSequencer/AthOutSeq
-ApplicationMgr SUCCESS AthSequencer/AthRegSeq
ApplicationMgr SUCCESS ******************************************************************************
ClassIDSvc INFO getRegistryEntries: read 104 CLIDRegistry entries for module ALL
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/OnOffIdMap'
diff --git a/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref b/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
index 2880871f0ece09cab24d86b6865443af704842b7..112dce5bb51bcfb60002c3855c2fba145aef9ca3 100644
--- a/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
+++ b/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
@@ -91,7 +91,6 @@ ApplicationMgr SUCCESS AthSequencer/AthEndSeq
ApplicationMgr SUCCESS AthIncFirerAlg/EndIncFiringAlg
ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg2
ApplicationMgr SUCCESS AthSequencer/AthOutSeq
-ApplicationMgr SUCCESS AthSequencer/AthRegSeq
ApplicationMgr SUCCESS ******************************************************************************
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/LAR/CellCorrOfl/deadOTX'
ApplicationMgr INFO Application Manager Started successfully
diff --git a/Calorimeter/CaloUtils/share/ToolWithConstants_test.ref b/Calorimeter/CaloUtils/share/ToolWithConstants_test.ref
index 7e2e703b76ab4bf85884fb9a5da9af9ebba2b0c1..79eed8eb4cc51b59a4bfede411daae9f7dbeff04 100644
--- a/Calorimeter/CaloUtils/share/ToolWithConstants_test.ref
+++ b/Calorimeter/CaloUtils/share/ToolWithConstants_test.ref
@@ -31,7 +31,6 @@ ApplicationMgr SUCCESS AthSequencer/AthEndSeq
ApplicationMgr SUCCESS AthIncFirerAlg/EndIncFiringAlg
ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg2
ApplicationMgr SUCCESS AthSequencer/AthOutSeq
-ApplicationMgr SUCCESS AthSequencer/AthRegSeq
ApplicationMgr SUCCESS ******************************************************************************
ApplicationMgr INFO Application Manager Started successfully
EventPersistenc... INFO Added successfully Conversion service:McCnvSvc
diff --git a/Control/AthenaCommon/python/AppMgr.py b/Control/AthenaCommon/python/AppMgr.py
index da5b9ac56618e92582a45619114f15062553e9ba..d660fa209a560c251772c83dd6237d0d21428106 100755
--- a/Control/AthenaCommon/python/AppMgr.py
+++ b/Control/AthenaCommon/python/AppMgr.py
@@ -24,7 +24,6 @@ __all__ = [ 'theApp', 'ServiceMgr', 'ToolSvc', 'AuditorSvc', 'theAuditorSvc',
'athCondSeq',
'athAlgSeq', 'topSequence',
'athOutSeq',
- 'athRegSeq',
]
### helpers ------------------------------------------------------------------
@@ -263,7 +262,7 @@ class AthAppMgr( AppMgr ):
def __build_master_sequence (self):
"""helper method to build the top-level AthSequencer from all bits and
- pieces : AthMasterSeq, AthAlgSeq, AthOutSeq, AthRegSeq
+ pieces : AthMasterSeq, AthAlgSeq, AthOutSeq
"""
from . import AlgSequence as _as
from AthenaServices.AthenaServicesConf import AthIncFirerAlg as IFA
@@ -277,7 +276,6 @@ class AthAppMgr( AppMgr ):
athAlgSeq = _as.AthSequencer ("AthAlgSeq",IgnoreFilterPassed=True, StopOverride=True)
athEndSeq = _as.AthSequencer ("AthEndSeq",Sequential=True)
athOutSeq = _as.AthSequencer ("AthOutSeq", StopOverride=True)
- athRegSeq = _as.AthSequencer ("AthRegSeq", StopOverride=True)
athAllAlgSeq = _as.AthSequencer ("AthAllAlgSeq", StopOverride=True)
athAlgEvtSeq = _as.AthSequencer ("AthAlgEvtSeq",Sequential = True, StopOverride=True)
# transfer old TopAlg to new AthAlgSeq
@@ -337,7 +335,6 @@ class AthAppMgr( AppMgr ):
athMasterSeq += athAlgEvtSeq
athMasterSeq += athOutSeq
- athMasterSeq += athRegSeq
Logging.log.debug ("building master sequence... [done]")
return athMasterSeq
@@ -998,12 +995,9 @@ def AuditorSvc(): # backwards compatibility
# +--- athEndSeq
# |
# +--- athOutSeq
-# |
-# +--- athRegSeq
athMasterSeq = AlgSequence.AthSequencer( "AthMasterSeq" )
athCondSeq = AlgSequence.AthSequencer( "AthCondSeq" )
athAlgSeq = AlgSequence.AthSequencer( "AthAlgSeq" )
athOutSeq = AlgSequence.AthSequencer( "AthOutSeq" )
-athRegSeq = AlgSequence.AthSequencer( "AthRegSeq" )
topSequence = AlgSequence.AlgSequence( "TopAlg" ) # for backward compatibility
diff --git a/Control/AthenaCommon/python/ConfigurationShelve.py b/Control/AthenaCommon/python/ConfigurationShelve.py
index ffbb125095d7a62c28804c4a36a46971443e27ea..9163a2572a8fe2ef6cfd92d64e384545e079a597 100644
--- a/Control/AthenaCommon/python/ConfigurationShelve.py
+++ b/Control/AthenaCommon/python/ConfigurationShelve.py
@@ -110,7 +110,6 @@ class ConfigurationJar( object ):
self.TopSequence = _as.AlgSequence ("TopAlg")
self.athAlgSeq = _as.AthSequencer ("AthAlgSeq")
self.athOutSeq = _as.AthSequencer ("AthOutSeq")
- self.athRegSeq = _as.AthSequencer ("AthRegSeq")
self.AppMgr = theApp
self.ServiceMgr = ServiceMgr # takes care of AuditorSvc & ToolSvc
@@ -131,7 +130,6 @@ class ConfigurationJar( object ):
d[ 'AthAlgSeq' ] = self.athAlgSeq
d[ 'TopSequence' ] = self.TopSequence
d[ 'AthOutSeq' ] = self.athOutSeq
- d[ 'AthRegSeq' ] = self.athRegSeq
d[ 'AppMgr' ] = self.AppMgr
d[ 'Streams' ] = self.AppMgr._streams
d[ 'ServiceMgr' ] = self.ServiceMgr #takes care of {Auditor,Tool}Svc
diff --git a/Control/AthenaCommon/share/GenerateBootstrapTest.ref b/Control/AthenaCommon/share/GenerateBootstrapTest.ref
index 1458f3c147c2978aad06b1d7c4fcc7aaa2e5a99d..5b5ae6824a7ce8f8a9390da74e5a31d04d96fe84 100644
--- a/Control/AthenaCommon/share/GenerateBootstrapTest.ref
+++ b/Control/AthenaCommon/share/GenerateBootstrapTest.ref
@@ -1,16 +1,16 @@
Willing to acquire file bootstrap.pkl from
-/build/mnowak/work/sealsvc/build/x86_64-centos7-gcc8-opt/share/bootstrap.pkl
+/afs/cern.ch/work/s/smh/ol_reggie/bld/x86_64-centos7-gcc8-opt/share/bootstrap.pkl
copy bootstrap.pkl
... Read 2 items from python pickle file: bootstrap.pkl
... Read 2 items from python pickle file: bootstrap_test.pkl
Given list of size 0. Not looking for differences.
-Step 1: reference file #components: 28
-Step 2: file to check #components: 28
+Step 1: reference file #components: 27
+Step 2: file to check #components: 27
Willing to acquire file bootstrap_threaded.pkl from
-/build/mnowak/work/sealsvc/build/x86_64-centos7-gcc8-opt/share/bootstrap_threaded.pkl
+/afs/cern.ch/work/s/smh/ol_reggie/bld/x86_64-centos7-gcc8-opt/share/bootstrap_threaded.pkl
copy bootstrap_threaded.pkl
... Read 2 items from python pickle file: bootstrap_threaded.pkl
... Read 2 items from python pickle file: bootstrap_threaded_test.pkl
Given list of size 0. Not looking for differences.
-Step 1: reference file #components: 34
-Step 2: file to check #components: 34
+Step 1: reference file #components: 33
+Step 2: file to check #components: 33
diff --git a/Control/AthenaCommon/share/bootstrap.pkl b/Control/AthenaCommon/share/bootstrap.pkl
index 25d8b3ba8a5a5e4d4a28e7fb90e7afe6533dead1..f47ca3833841c2222ba5eff3774e56b02fa40232 100644
Binary files a/Control/AthenaCommon/share/bootstrap.pkl and b/Control/AthenaCommon/share/bootstrap.pkl differ
diff --git a/Control/AthenaCommon/share/bootstrap_threaded.pkl b/Control/AthenaCommon/share/bootstrap_threaded.pkl
index fc26464bcc670dfeab542f9d8b4676411288304a..d5cf4a78df80454ca1d06794a68f2994c2bcc026 100644
Binary files a/Control/AthenaCommon/share/bootstrap_threaded.pkl and b/Control/AthenaCommon/share/bootstrap_threaded.pkl differ
diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index a6cff972939920241b535b2bd4f4be43ee07f71d..a3ffde4ec5fc150a47c96df5bf3e154ee7e46e59 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -1066,7 +1066,6 @@ def appendCAtoAthena(ca):
preconfigured = [athCondSeq,athOutSeq,athAlgSeq,topSequence]
- #preconfigured = ["AthMasterSeq", "AthCondSeq", "AthAlgSeq", "AthOutSeq", "AthRegSeq"]
for seq in ca._allSequences:
merged = False
diff --git a/Control/AthenaConfiguration/python/MainServicesConfig.py b/Control/AthenaConfiguration/python/MainServicesConfig.py
index 9a9d69b62a55c9f4962ba4218e7b19cbdbc5d6e8..83dacda189f67aef1707a73d0d4c495089d34ae9 100644
--- a/Control/AthenaConfiguration/python/MainServicesConfig.py
+++ b/Control/AthenaConfiguration/python/MainServicesConfig.py
@@ -39,7 +39,6 @@ def MainServicesCfg(cfgFlags):
#Build standard sequences:
cfg.addSequence(AthSequencer('AthAlgEvtSeq',Sequential=True, StopOverride=True),parentName="AthMasterSeq")
cfg.addSequence(AthSequencer('AthOutSeq',StopOverride=True),parentName="AthMasterSeq")
- cfg.addSequence(AthSequencer('AthRegSeq',StopOverride=True),parentName="AthMasterSeq")
cfg.addSequence(AthSequencer('AthBeginSeq',Sequential=True),parentName='AthAlgEvtSeq')
cfg.addSequence(AthSequencer('AthAllAlgSeq',StopOverride=True),parentName='AthAlgEvtSeq')
diff --git a/Control/AthenaServices/share/AthTPCnvSvc.ref b/Control/AthenaServices/share/AthTPCnvSvc.ref
index 2d8416a38361f7b64e6f89a12dce62a6198587ac..d858d9810301ff63bb06f5c2b1b651fda637d22c 100644
--- a/Control/AthenaServices/share/AthTPCnvSvc.ref
+++ b/Control/AthenaServices/share/AthTPCnvSvc.ref
@@ -42,7 +42,6 @@ Py:Configurable ERROR attempt to add a duplicate (AthAlgEvtSeq.AthAllAlgSeq)
Py:Configurable ERROR attempt to add a duplicate (AthAlgEvtSeq.AthEndSeq) ... dupe ignored
Py:Configurable ERROR attempt to add a duplicate (AthMasterSeq.AthAlgEvtSeq) ... dupe ignored
Py:Configurable ERROR attempt to add a duplicate (AthMasterSeq.AthOutSeq) ... dupe ignored
-Py:Configurable ERROR attempt to add a duplicate (AthMasterSeq.AthRegSeq) ... dupe ignored
ClassIDSvc INFO RE-initializing ClassIDSvc
ApplicationMgr INFO Application Manager Reinitialized successfully
ApplicationMgr INFO Application Manager Started successfully
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead3MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead3MT.ref
index 64298519096b798deefc81dff68586cef7633adf..83c89e8eb99b2f50402d1b8c1dca35b5a619a9e2 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead3MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead3MT.ref
@@ -195,7 +195,6 @@ PrecedenceSvc 0 INFO
EndIncFiringAlg [Alg] [n= 0]
IncidentProcAlg2 [Alg] [n= 1] [unclonable]
AthOutSeq [Seq] [Concurrent]
- AthRegSeq [Seq] [Concurrent]
AthenaHiveEventLoopMgr 0 INFO Setup EventSelector service EventSelector
ApplicationMgr 0 INFO Application Manager Initialized successfully