Merge branch 'ISFsel' into 'master'

New config for ISF_SimulationSelectors Fatras dependencies

See merge request !34732

Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.py

@@ -95,5 +95,15 @@ def createSimConfigFlags():
     scf.addFlag("Sim.FastChain.PUWeights_lar_hec", [1.0]) # LAr HEC
     scf.addFlag("Sim.FastChain.PUWeights_lar_bapre", [1.0]) # LAr Barrel presampler
     scf.addFlag("Sim.FastChain.PUWeights_tile", [1.0]) # Tile
+    
+    # Fatras
+    scf.addFlag("Sim.Fatras.RandomStreamName", "FatrasRnd")
+    scf.addFlag("Sim.Fatras.G4RandomStreamName", "FatrasG4")
+    scf.addFlag("Sim.Fatras.TrkExRandomStreamName", "TrkExRnd")
+    # Fatras fine tuning
+    scf.addFlag("Sim.Fatras.MomCutOffSec", 50.) # common momentum cut-off for secondaries
+    scf.addFlag("Sim.Fatras.HadronIntProb", 1.) # hadronic interaction scale factor
+    scf.addFlag("Sim.Fatras.GaussianMixtureModel", True) # use Gaussian mixture model for Multiple Scattering
+    scf.addFlag("Sim.Fatras.BetheHeitlerScale", 1.) # scale to Bethe-Heitler contribution
 
     return scf

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

@@ -11,7 +11,7 @@ from BarcodeServices.BarcodeServicesConfigNew import BarcodeSvcCfg
 def ParticleHelperCfg(flags, name="ISF_ParticleHelper", **kwargs):
     acc = BarcodeSvcCfg(flags)
     kwargs.setdefault("BarcodeSvc", acc.getPrimary())
-    acc.setPrivateTools(CompFactory.ISF.ParticleHelper(name, **kwargs))
+    acc.addPublicTool(CompFactory.ISF.ParticleHelper(name, **kwargs))
     return acc
 
 

Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesSimConfigNew.py

+"""
+ComponentAccumulator service configuration for ISF_Fatras simulator tool FatrasSimTool
+Separated from main config to avoid circular dependences
+
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from ISF_FatrasServices.ISF_FatrasServicesConfigNew import (
+    FatrasSimulatorToolSTCfg,
+    FatrasNewExtrapolationSimulatorToolSTCfg,
+    FatrasPileupSimulatorToolSTCfg,
+)
+from ISF_SimulationSelectors.ISF_SimulationSelectorsConfigNew import (
+    DefaultFatrasSelectorCfg, MuonFatrasSelectorCfg,
+)
+
+def FatrasSimulatorToolCfg(flags, name="ISF_FatrasSimulatorTool", **kwargs):
+    acc = ComponentAccumulator()
+    deftool = acc.popToolsAndMerge(DefaultFatrasSelectorCfg(flags))
+    muontool = acc.popToolsAndMerge(MuonFatrasSelectorCfg(flags))
+    kwargs.setdefault("IDSimulationSelectors", [deftool])
+    kwargs.setdefault("CaloSimulationSelectors", [muontool])
+    kwargs.setdefault("MSSimulationSelectors", [deftool])
+    tool = acc.popToolsAndMerge(FatrasSimulatorToolSTCfg(flags, name, **kwargs))
+    acc.setPrivateTools(tool)
+    return acc
+
+
+def FatrasNewExtrapolationSimulatorToolCfg(flags, name="ISF_FatrasSNewExtrapolationimulatorTool", **kwargs):
+    acc = ComponentAccumulator()
+    deftool = acc.popToolsAndMerge(DefaultFatrasSelectorCfg(flags))
+    muontool = acc.popToolsAndMerge(MuonFatrasSelectorCfg(flags))
+    kwargs.setdefault("IDSimulationSelectors", [deftool])
+    kwargs.setdefault("CaloSimulationSelectors", [muontool])
+    kwargs.setdefault("MSSimulationSelectors", [deftool])
+    tool = acc.popToolsAndMerge(FatrasNewExtrapolationSimulatorToolSTCfg(flags, name, **kwargs))
+    acc.setPrivateTools(tool)
+    return tool
+
+def FatrasPileupSimulatorToolCfg(flags, name="ISF_FatrasPileupSimulatorTool", **kwargs):
+    acc = ComponentAccumulator()
+    deftool = acc.popToolsAndMerge(DefaultFatrasSelectorCfg(flags))
+    muontool = acc.popToolsAndMerge(MuonFatrasSelectorCfg(flags))
+    kwargs.setdefault("IDSimulationSelectors", [deftool])
+    kwargs.setdefault("CaloSimulationSelectors", [muontool])
+    kwargs.setdefault("MSSimulationSelectors", [deftool])
+    tool = acc.popToolsAndMerge(FatrasPileupSimulatorToolSTCfg(flags, name, **kwargs))
+    acc.setPrivateTools(tool)
+    return tool

Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt

@@ -17,5 +17,5 @@ atlas_add_component( ISF_SimulationSelectors
                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} AtlasHepMCLib GaudiKernel BarcodeServicesLib ISF_Event ISF_InterfacesLib ISF_TrackingInterfacesLib )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 

Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfig.py

@@ -6,8 +6,6 @@ Elmar Ritsch, 04/02/2013
 
 from AthenaCommon import CfgMgr
 
-from AthenaCommon.Constants import *  # FATAL,ERROR etc.
-from AthenaCommon.SystemOfUnits import *
 from ISF_SimulationSelectors import SimulationFlavor
 ### DefaultSimSelector configurations