Merge branch 'master-FixRandomEngineFlag' into 'master'

Remove duplicate Random.Engine flags

See merge request atlas/athena!22016

InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigFlags.py

-"""Construct ConfigFlags Beam Conditions Monitor Digitization
-
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-"""
-from AthenaConfiguration.AthConfigFlags import AthConfigFlags
-
-def createBCMCfgFlags():
-    """Return an AthConfigFlags object with required flags"""
-    flags = AthConfigFlags()
-    # Run Inner Detector noise simulation?
-    flags.addFlag("Digitization.DoInnerDetectorNoise", True)
-    # Should pile-up digitization be done one bunch crossing at a time?
-    # Else all bunch crossings are provided at once.
-    flags.addFlag("Digitization.DoXingByXingPileUp", False)
-    # Name of MC EvtStore to overlay
-    flags.addFlag("Overlay.EventStore", "BkgEvent_0_SG")
-    # Name of the random number service to use
-    # of ("dSFMT", "Ranlux64", "Ranecu",)
-    flags.addFlag("Random.Engine", "dSFMT")
-    return flags
-

InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py

@@ -28,8 +28,6 @@ ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.lock()
 # Construct our accumulator to run
 acc = MainServicesSerialCfg()
-from StoreGate.StoreGateConf import StoreGateSvc # FIXME remove this once athena is fixed
-acc.addService(StoreGateSvc("ConditionStore"))
 acc.merge(PoolReadCfg(ConfigFlags))
 acc.merge(InDetGMConfig(ConfigFlags)) # FIXME This sets up the whole ID geometry would be nicer just to set up min required for BCM
 # Add configuration to write HITS pool file

Simulation/BeamEffects/python/SimulationFlags.py

@@ -11,10 +11,6 @@ def _createCfgFlags():
     # e.g. 'CondDB', 'VertexOverrideEventFile.txt', 'VertexOverride.txt',"LongBeamspot" 
     acf.addFlag('Vertex.Source', 'CondDB' )
 
-    # Name of the random number service to use
-    # of ("dSFMT", "Ranlux64", "Ranecu",)
-    acf.addFlag("Random.Engine", "dSFMT")
-
     return acf