Merge branch 'py-config-tidy' into 'master'

Tidy up python config in RngComps and BCM_Digitization

See merge request !20566

Control/RngComps/CMakeLists.txt

@@ -70,8 +70,8 @@ atlas_add_test( RNGWrapper_test
    GaudiKernel AtlasCLHEP_RandomGenerators )
 
 atlas_add_test( RandomServices_test
-                SCRIPT python/RandomServices_test.py )
+                SCRIPT test/RandomServices_test.py )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_joboptions( share/*.py test/*.py )

Control/RngComps/python/RandomServices_test.py → Control/RngComps/test/RandomServices_test.py

@@ -6,7 +6,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 from AthenaCommon.Logging import log
 from AthenaCommon.Constants import DEBUG
 from AthenaCommon.Configurable import Configurable
-from RandomServices import dSFMT, Ranlux64, Ranecu, RNG
+from RngComps.RandomServices import dSFMT, Ranlux64, Ranecu, RNG
 
 # Set up logging and new style config
 log.setLevel(DEBUG)

InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigNew.py

@@ -5,8 +5,6 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 from AthenaCommon import CfgMgr
 from RngComps.RandomServices import RNG, AthEngines
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from Digitization.DigitizationFlags import digitizationFlags
-from OverlayCommonAlgs.OverlayFlags import overlayFlags
 
 # The earliest and last bunch crossing times for which interactions will be sent
 # to the BCM Digitization code.