Merge branch 'RegionSelector_newConfig' into 'master'

Move RegSelConfig to RegionSelector and add/fix new configuration unit test

See merge request atlas/athena!15761

Former-commit-id: f999d046

DetectorDescription/RegionSelector/CMakeLists.txt

@@ -38,4 +38,5 @@ atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 
 
+atlas_add_test( RegSelConfigTest    SCRIPT python -m RegionSelector.RegSelConfig    POST_EXEC_SCRIPT nopost.sh )
 

Trigger/TrigValidation/TrigUpgradeTest/python/RegSelConfig.py → DetectorDescription/RegionSelector/python/RegSelConfig.py

@@ -12,14 +12,14 @@ def RegSelConfig( flags ):
 
     regSel = RegSelSvc()
     regSel.DeltaZ = 225 * mm
-    
+
     # there will be ifology here enabling only the configured detectors
     from LArRegionSelector.LArRegionSelectorConf import LArRegionSelectorTable
     larTable =  LArRegionSelectorTable(name="LArRegionSelectorTable")
     acc.addPublicTool( larTable )
     regSel.LArRegionSelectorTable      = larTable
-    
-    
+
+
     from TileRawUtils.TileRawUtilsConf import TileRegionSelectorTable
     tileTable =  TileRegionSelectorTable(name="TileRegionSelectorTable")
     acc.addPublicTool( tileTable )
@@ -28,22 +28,16 @@ def RegSelConfig( flags ):
     #regSel.TileRegionSelectorTable     = tileTable
 
     regSel.enableCalo = True
-    
+
     acc.addService( regSel )
     return acc
 
-
 if __name__ == "__main__":
-    from AthenaConfiguration.AllConfigFlags import ConfigFlags
-    
-    ConfigFlags.lock()
-
     from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
     acc = ComponentAccumulator()
+    from AthenaConfiguration.AllConfigFlags import ConfigFlags
+    ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
 
-
-    acc.addConfig( RegSelConfig, ConfigFlags )
-
-    f=open('RegSelConfig.pkl','w')
-    acc.store(f)
-    f.close()
+    acc = RegSelConfig( ConfigFlags )
+    acc.store( file( "test.pkl", "w" ) )
+    print "All OK"

Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py

@@ -106,7 +106,7 @@ acc.getService("IOVDbSvc").Folders += ['/TagInfo<metaOnly/>']
 
 
 # setup algorithm sequences here, need few additional components
-from TrigUpgradeTest.RegSelConfig import RegSelConfig
+from RegionSelector.RegSelConfig import RegSelConfig
 acc.merge( RegSelConfig( flags ) )
 
 acc.getEventAlgo( "TrigSignatureMoniMT" ).OutputLevel=DEBUG