Merge branch 'ATLASSIM-5526_pt3_master' into 'master'

Update ISF_Validation tests (part 3: cosmics simulation)

See merge request !49527

Generators/CosmicGenerator/python/CosmicGeneratorConfig.py

@@ -152,8 +152,7 @@ def CosmicGeneratorCfg(flags, name="CosmicGenerator", **kwargs):
     ## Set up random seeds FIXME
     seed = 'COSMICS OFFSET 1234 2040160768 443921183'
     from RngComps.RandomServices import dSFMT
-    result.merge(dSFMT(seed))
-    kwargs.setdefault('AtRndmGenSvc', result.getService("AtDSFMTGenSvc"))
+    kwargs.setdefault('AtRndmGenSvc', result.getPrimaryAndMerge(dSFMT(seed)).name)
 
     from CosmicGenerator.CosmicGeneratorConfig import CavernPropertyCalculator
     theCavern = CavernPropertyCalculator()

Simulation/ISF/ISF_Core/ISF_Tools/python/ISF_ToolsConfig.py

@@ -87,7 +87,7 @@ def getCosmicEventFilterTool(name="ISF_CosmicEventFilter", **kwargs):
         if simFlags.CosmicFilterVolumeName2=="Muon":
             useAndFilter = True
             volumeNames += ["MuonExitLayer"]
-        if simFlags.CosmicFilterVolumeName=="Calo":
+        if simFlags.CosmicFilterVolumeName2=="Calo":
             useAndFilter = True
             volumeNames += ["MuonEntryLayer"]
         if simFlags.CosmicFilterVolumeName2=="InnerDetector":

Simulation/ISF/ISF_Core/ISF_Tools/python/ISF_ToolsConfigNew.py

@@ -101,25 +101,17 @@ def ValidationEntryLayerFilterCfg(flags, name="ISF_ValidationEntryLayerFilter",
 
 
 def CosmicEventFilterToolCfg(flags, name="ISF_CosmicEventFilter", **kwargs):
-    volmap = {
-        "Muon": ["MuonExitLayer"],
-        "Calo": ["MuonEntryLayer"],
-        "InnerDetector": ["CaloEntryLayer"],
-        "TRT_Barrel": ["TRTBarrelEntryLayer"],
-        "TRT_EC": ["TRTECAEntryLayer", "TRTECBEntryLayer"],
-        "SCT_Barrel": ["SCTBarrelEntryLayer"],
-        "Pixel": ["PixelEntryLayer"],
-    }
-    volumeNames = []
-    for vol in flags.Sim.CosmicFilterVolumeNames:
-        volumeNames += volmap[name]
-
-    kwargs.setdefault("UseAndFilter", True)
-    kwargs.setdefault("VolumeNames", volumeNames)
-    kwargs.setdefault("PDG_ID", flags.Sim.CosmicFilterID)
-    kwargs.setdefault("ptMin", flags.Sim.CosmicFilterPTmin)
-    kwargs.setdefault("ptMax", flags.Sim.CosmicFilterPTmax)
+    from G4CosmicFilter.G4CosmicFilterConfigNew import configCosmicFilterVolumeNames
     acc = ComponentAccumulator()
+    volumeNames = configCosmicFilterVolumeNames(flags)
+    kwargs.setdefault("UseAndFilter", len(volumeNames)<3 )
+    kwargs.setdefault("VolumeNames", volumeNames)
+    if flags.Sim.CosmicFilterID:
+        kwargs.setdefault("PDG_ID", flags.Sim.CosmicFilterID)
+    if flags.Sim.CosmicFilterPTmin:
+        kwargs.setdefault("ptMin", flags.Sim.CosmicFilterPTmin)
+    if flags.Sim.CosmicFilterPTmax:
+        kwargs.setdefault("ptMax", flags.Sim.CosmicFilterPTmax)
     acc.setPrivateTools(CompFactory.ISF.CosmicEventFilterTool(name, **kwargs))
     return acc