Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso"

This reverts commit 4c9e84aa

Control/CalypsoExample/GeoModelTest/python/GeoModelTestConfig.py

@@ -66,8 +66,8 @@ if __name__ == "__main__":
     ConfigFlags.lock()
 
 # Configure components
-    from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
-    acc = MainServicesSerialCfg()
+    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+    acc = MainServicesCfg(ConfigFlags)
 
 # Set things up to create a conditions DB with neutral Tracker alignment transforms
     acc.merge(GeoModelTestCfg(ConfigFlags))

Control/CalypsoExample/RDOReadExample/python/RDOReadExampleConfig.py

@@ -33,9 +33,9 @@ if __name__ == "__main__":
     ConfigFlags.lock()
 
 # Configure components
-    from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
     from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
-    acc = MainServicesSerialCfg()
+    acc = MainServicesCfg(ConfigFlags)
     acc.merge(PoolReadCfg(ConfigFlags))
 
 # Set things up to create a conditions DB with neutral Tracker alignment transforms

Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig.py

@@ -58,8 +58,8 @@ if __name__ == "__main__":
     ConfigFlags.lock()
 
 # Configure components
-    from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
-    acc = MainServicesSerialCfg()
+    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+    acc = MainServicesCfg(ConfigFlags)
 
 # Set things up to create a conditions DB with neutral Tracker alignment transforms
     acc.merge(WriteAlignmentCfg(ConfigFlags))

DetectorDescription/GeoModel/FaserGeoModel/python/DipoleGMConfig.py

@@ -17,7 +17,7 @@ if __name__ == "__main__":
   from AthenaCommon.Constants import DEBUG
   from AthenaCommon.Configurable import Configurable
   from CalypsoConfiguration.AllConfigFlags import ConfigFlags
-  from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+  from AthenaConfiguration.MainServicesConfig import MainServicesCfg
   from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
   # Set up logging and new style config
   log.setLevel(DEBUG)
@@ -44,7 +44,7 @@ if __name__ == "__main__":
   #
   ConfigFlags.lock()
   # Construct ComponentAccumulator
-  acc = MainServicesSerialCfg()
+  acc = MainServicesCfg(ConfigFlags)
   acc.merge(PoolReadCfg(ConfigFlags))
   # acc.merge(ScintGeometryCfg(ConfigFlags)) 
   # acc.merge(FaserSCT_GeometryCfg(ConfigFlags)) 

DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py

@@ -16,7 +16,7 @@ if __name__ == "__main__":
   from AthenaCommon.Constants import DEBUG
   from AthenaCommon.Configurable import Configurable
   from CalypsoConfiguration.AllConfigFlags import ConfigFlags
-  from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+  from AthenaConfiguration.MainServicesConfig import MainServicesCfg
   from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
   # Set up logging and new style config
   log.setLevel(DEBUG)
@@ -36,7 +36,7 @@ if __name__ == "__main__":
   #
   ConfigFlags.lock()
   # Construct ComponentAccumulator
-  acc = MainServicesSerialCfg()
+  acc = MainServicesCfg(ConfigFlags)
   acc.merge(PoolReadCfg(ConfigFlags))
   # acc.merge(ScintGeometryCfg(ConfigFlags)) 
   acc.merge(FaserSCT_GeometryCfg(ConfigFlags)) 

DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py

@@ -25,7 +25,7 @@ if __name__ == "__main__":
   from AthenaCommon.Constants import DEBUG
   from AthenaCommon.Configurable import Configurable
   from AthenaConfiguration.AllConfigFlags import ConfigFlags
-  from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+  from AthenaConfiguration.MainServicesConfig import MainServicesCfg
   from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
   # Set up logging and new style config
   log.setLevel(DEBUG)
@@ -46,7 +46,7 @@ if __name__ == "__main__":
   #
   ConfigFlags.lock()
   # Construct ComponentAccumulator
-  acc = MainServicesSerialCfg()
+  acc = MainServicesCfg(ConfigFlags)
   acc.merge(PoolReadCfg(ConfigFlags))
   acc.merge(ScintGeometryCfg(ConfigFlags)) # FIXME This sets up the whole Scint geometry would be nicer just to set up min required
   #acc.getService("StoreGateSvc").Dump=True

DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py

@@ -10,7 +10,7 @@ if __name__ == "__main__":
     from AthenaCommon.Constants import VERBOSE, INFO
     from AthenaCommon.Configurable import Configurable
     from CalypsoConfiguration.AllConfigFlags import ConfigFlags
-    from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
     from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
     # Set up logging and new style config
     from FaserGeoModel.FaserGeoModelConfig import FaserGeometryCfg
@@ -32,7 +32,7 @@ if __name__ == "__main__":
     ConfigFlags.lock()
 
     # Construct ComponentAccumulator
-    acc = MainServicesSerialCfg()
+    acc = MainServicesCfg(ConfigFlags)
     acc.merge(PoolReadCfg(ConfigFlags))
     acc.merge(FaserGeometryCfg(ConfigFlags))
     # acc.getService("StoreGateSvc").Dump=True

Simulation/G4Faser/G4FaserAlg/test/runG4.py

@@ -13,7 +13,7 @@ if __name__ == "__main__":
     from AthenaCommon.Constants import VERBOSE, INFO
     from AthenaCommon.Configurable import Configurable
     from CalypsoConfiguration.AllConfigFlags import ConfigFlags
-    from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
     from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
     from McEventSelector.McEventSelectorConfig import McEventSelectorCfg
     from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
@@ -50,8 +50,6 @@ if __name__ == "__main__":
     ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig
 # Workaround to avoid problematic ISF code
     ConfigFlags.GeoModel.Layout = "Development"
-# To be sure...
-    ConfigFlags.Concurrency.NumThreads = 1
 #
 # Output settings
 #
@@ -84,7 +82,7 @@ if __name__ == "__main__":
 #
 # Construct ComponentAccumulator
 #
-    acc = MainServicesSerialCfg()
+    acc = MainServicesCfg(ConfigFlags)
 #
 # Particle Gun generator (comment out to read generator file)
 # Raw energies (without units given) are interpreted as MeV

Simulation/ISF/ISF_Core/FaserISF_Services/test/FaserISF_ServicesConfigNew_test.py

@@ -4,7 +4,7 @@
 Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 """
 if __name__ == '__main__':
-  from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+  from AthenaConfiguration.MainServicesConfig import MainServicesCfg
   import os
 
   # Set up logging and config behaviour
@@ -31,7 +31,7 @@ if __name__ == '__main__':
   from FaserISF_Services.FaserISF_ServicesConfigNew import FaserTruthServiceCfg, FaserGeoIDSvcCfg
 
   ## Initialize a new component accumulator
-  cfg = MainServicesSerialCfg()
+  cfg = MainServicesCfg(ConfigFlags)
 
   #add the algorithm
   cfg.merge(FaserTruthServiceCfg(ConfigFlags))

Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py

@@ -9,7 +9,7 @@ from AthenaCommon.Constants import DEBUG, VERBOSE, INFO
 from AthenaCommon.Configurable import Configurable
 from CalypsoConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
-from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
@@ -38,7 +38,7 @@ ConfigFlags.Digitization.TruthOutput = True
 ConfigFlags.lock()
 
 # Core components
-acc = MainServicesSerialCfg()
+acc = MainServicesCfg(ConfigFlags)
 acc.merge(PoolReadCfg(ConfigFlags))
 acc.merge(PoolWriteCfg(ConfigFlags))
 

Tracker/TrackerDigitization/FaserSCT_Digitization/test/SCT_DigitizationConfigNew_test.py

@@ -8,7 +8,7 @@ from AthenaCommon.Constants import DEBUG
 from AthenaCommon.Configurable import Configurable
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
-from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AtlasGeoModel.InDetGMConfig import InDetGeometryCfg
@@ -24,7 +24,7 @@ ConfigFlags.GeoModel.Align.Dynamic = False
 ConfigFlags.Concurrency.NumThreads = 1
 ConfigFlags.lock()
 # Construct our accumulator to run
-acc = MainServicesSerialCfg()
+acc = MainServicesCfg(ConfigFlags)
 acc.merge(PoolReadCfg(ConfigFlags))
 acc.merge(FaserSCT_DigitizationHSCfg(ConfigFlags))
 # Dump config

Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py

@@ -9,7 +9,7 @@ from AthenaCommon.Constants import DEBUG, VERBOSE, INFO
 from AthenaCommon.Configurable import Configurable
 from CalypsoConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
-from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
@@ -35,7 +35,7 @@ ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to
 ConfigFlags.lock()
 
 # Core components
-acc = MainServicesSerialCfg()
+acc = MainServicesCfg(ConfigFlags)
 acc.merge(PoolReadCfg(ConfigFlags))
 acc.merge(PoolWriteCfg(ConfigFlags))
 

Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py

@@ -9,7 +9,7 @@ from AthenaCommon.Constants import DEBUG, VERBOSE, INFO
 from AthenaCommon.Configurable import Configurable
 from CalypsoConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
-from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
@@ -36,7 +36,7 @@ ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to
 ConfigFlags.lock()
 
 # Core components
-acc = MainServicesSerialCfg()
+acc = MainServicesCfg(ConfigFlags)
 acc.merge(PoolReadCfg(ConfigFlags))
 acc.merge(PoolWriteCfg(ConfigFlags))
 

Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py

@@ -9,7 +9,7 @@ from AthenaCommon.Constants import DEBUG, VERBOSE, INFO
 from AthenaCommon.Configurable import Configurable
 from CalypsoConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
-from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
@@ -36,7 +36,7 @@ ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to
 ConfigFlags.lock()
 
 # Core components
-acc = MainServicesSerialCfg()
+acc = MainServicesCfg(ConfigFlags)
 acc.merge(PoolReadCfg(ConfigFlags))
 acc.merge(PoolWriteCfg(ConfigFlags))
 

Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py

@@ -9,7 +9,7 @@ from AthenaCommon.Constants import DEBUG, VERBOSE, INFO
 from AthenaCommon.Configurable import Configurable
 from CalypsoConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
-from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
@@ -37,7 +37,7 @@ ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to
 ConfigFlags.lock()
 
 # Core components
-acc = MainServicesSerialCfg()
+acc = MainServicesCfg(ConfigFlags)
 acc.merge(PoolReadCfg(ConfigFlags))
 acc.merge(PoolWriteCfg(ConfigFlags))