Merge branch 'ConStore' into 'master'

Move ConditionStore to default in ComponentAccumulator and standard Athena jobs, remove pycomps from pickle

See merge request atlas/athena!21889

Control/AthenaCommon/python/AtlasThreadedJob.py

@@ -32,9 +32,6 @@ def _setupAtlasThreadedJob():
     svcMgr += SG__HiveMgrSvc("EventDataSvc")
     svcMgr.EventDataSvc.NSlots = numStores
 
-    import StoreGate.StoreGateConf as StoreGateConf
-    svcMgr += StoreGateConf.StoreGateSvc("ConditionStore")
-
 
     from GaudiHive.GaudiHiveConf import AlgResourcePool
     arp=AlgResourcePool( OutputLevel = Constants.INFO )

Control/AthenaCommon/python/AtlasUnixStandardJob.py

@@ -46,6 +46,7 @@ def _setupAtlasUnixStandardJob():
     svcMgr += StoreGateConf.StoreGateSvc()
     svcMgr += StoreGateConf.StoreGateSvc("DetectorStore")
     svcMgr += StoreGateConf.StoreGateSvc("HistoryStore")
+    svcMgr += StoreGateConf.StoreGateSvc("ConditionStore")
 
     #ClassIDSvc configuration
     import CLIDComps.CLIDCompsConf as CLIDCompsConf

Control/AthenaCommon/share/bootstrap.pkl

@@ -475,43 +475,54 @@ sS'ProxyProviderSvc'
 p248
 S'ProxyProviderSvc'
 p249
-ssS'IncidentProcAlg1'
+ssS'ConditionStore'
 p250
 (dp251
-S'ExtraOutputs'
+S'IncidentSvc'
 p252
-S'[]'
+S'IncidentSvc'
 p253
-sS'NeededResources'
+sS'ProxyProviderSvc'
 p254
-S'[]'
+S'ProxyProviderSvc'
 p255
-sS'ExtraInputs'
+ssS'IncidentProcAlg1'
 p256
-S'[]'
-p257
-ssS'HistogramDataSvc'
+(dp257
+S'ExtraOutputs'
 p258
-(dp259
-S'Input'
+S'[]'
+p259
+sS'NeededResources'
 p260
 S'[]'
 p261
-sS'InhibitPathes'
+sS'ExtraInputs'
 p262
 S'[]'
 p263
-ssS'HistoryStore'
+ssS'HistogramDataSvc'
 p264
 (dp265
-S'IncidentSvc'
+S'Input'
 p266
-S'IncidentSvc'
+S'[]'
 p267
-sS'ProxyProviderSvc'
+sS'InhibitPathes'
 p268
-S'ProxyProviderSvc'
+S'[]'
 p269
+ssS'HistoryStore'
+p270
+(dp271
+S'IncidentSvc'
+p272
+S'IncidentSvc'
+p273
+sS'ProxyProviderSvc'
+p274
+S'ProxyProviderSvc'
+p275
 ss.ccollections
 defaultdict
 p1
@@ -950,7 +961,7 @@ p186
 g7
 sS'ExtSvc'
 p187
-S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StatusCodeSvc/StatusCodeSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc', 'JobOptionsSvc/JobOptionsSvc']"
+S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StatusCodeSvc/StatusCodeSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'StoreGateSvc/ConditionStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc', 'JobOptionsSvc/JobOptionsSvc']"
 p188
 sS'AuditAlgorithms'
 p189

Control/AthenaCommon/share/bootstrap_threaded.pkl

@@ -1055,7 +1055,7 @@ p179
 g7
 sS'ExtSvc'
 p180
-S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StatusCodeSvc/StatusCodeSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc', 'SG::HiveMgrSvc/EventDataSvc', 'StoreGateSvc/ConditionStore', 'AlgResourcePool/AlgResourcePool', 'AvalancheSchedulerSvc/AvalancheSchedulerSvc', 'AthenaHiveEventLoopMgr/AthenaHiveEventLoopMgr', 'TimelineSvc/TimelineSvc', 'JobOptionsSvc/JobOptionsSvc']"
+S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StatusCodeSvc/StatusCodeSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'StoreGateSvc/ConditionStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc', 'SG::HiveMgrSvc/EventDataSvc', 'AlgResourcePool/AlgResourcePool', 'AvalancheSchedulerSvc/AvalancheSchedulerSvc', 'AthenaHiveEventLoopMgr/AthenaHiveEventLoopMgr', 'TimelineSvc/TimelineSvc', 'JobOptionsSvc/JobOptionsSvc']"
 p181
 sS'AuditAlgorithms'
 p182

Control/AthenaConfiguration/python/MainServicesConfig.py

@@ -81,6 +81,7 @@ def MainServicesThreadedCfg(cfgFlags):
     cfg.addService(StoreGateSvc())
     cfg.addService(StoreGateSvc("DetectorStore"))
     cfg.addService(StoreGateSvc("HistoryStore"))
+    cfg.addService( StoreGateSvc("ConditionStore") )
     
     cfg.setAppProperty('InitializationLoopCheck',False)
 
@@ -109,9 +110,6 @@ def MainServicesThreadedCfg(cfgFlags):
         hivesvc.NSlots = cfgFlags.Concurrency.NumConcurrentEvents
         cfg.addService( hivesvc )
 
-        from StoreGate.StoreGateConf import StoreGateSvc
-        cfg.addService( StoreGateSvc("ConditionStore") )
-
         from GaudiHive.GaudiHiveConf import AlgResourcePool
         from AthenaCommon.Constants import INFO
         arp=AlgResourcePool( OutputLevel = INFO )

Database/IOVDbSvc/python/CondDB.py

@@ -31,13 +31,11 @@ from IOVSvc.IOVSvcConf import CondInputLoader
 from AthenaServices.AthenaServicesConf import Athena__ConditionsCleanerSvc
 from AthenaServices.AthenaServicesConf import Athena__DelayedConditionsCleanerSvc
 from AthenaCommon.AlgSequence import AthSequencer
-import StoreGate.StoreGateConf as StoreGateConf
 
 condInputLoader = CondInputLoader( "CondInputLoader")
 condSeq = AthSequencer("AthCondSeq")
 
 svcMgr += CondSvc()
-svcMgr += StoreGateConf.StoreGateSvc("ConditionStore")
 condSeq += condInputLoader
 
 # Enable conditions garbage collection.