Merge branch 'master-ATLFASTIIF_G4MS' into 'master'

Add ATLFASTIIF_G4MS simulator; sweep from 21.3

See merge request atlas/athena!30949

Simulation/ISF/ISF_Config/python/FlagSetters.py

@@ -234,6 +234,15 @@ def configureFlagsFastOnly():
 
 ## methods for simulators which combine Geant4,  Fatras and FastCaloSim
 
+def configureFlagsATLFASTIIF_G4MS():
+    configureFlagsATLFASTIIF()
+    from G4AtlasApps.SimFlags import simFlags
+    simFlags.SimulationFlavour = "ATLFASTIIF_G4MS"
+    from ISF_Config.ISF_jobProperties import ISF_Flags
+    ISF_Flags.UsingGeant4 = True
+    ISF_Flags.ParticleBroker = "ISF_AFIIParticleBrokerSvc"
+    return
+
 def configureFlagsMultiSimTest():
     from ISF_Config.ISF_jobProperties import ISF_Flags
     ISF_Flags.UsingGeant4 = True

Simulation/ISF/ISF_Config/python/ISF_ConfigConfigDb.py

@@ -39,6 +39,7 @@ addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTII",           "ISF_Ker
 addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTIIMT",         "ISF_Kernel_ATLFASTIIMT")
 addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTII_QS",        "ISF_Kernel_ATLFASTII_QS")
 addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTIIF",          "ISF_Kernel_ATLFASTIIF")
+addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTIIF_G4MS",     "ISF_Kernel_ATLFASTIIF_G4MS")
 addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTIIFMT",        "ISF_Kernel_ATLFASTIIFMT")
 addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTIIF_PileUp",   "ISF_Kernel_ATLFASTIIF_PileUp")
 addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTII_PileUp",   "ISF_Kernel_ATLFASTII_PileUp")

Simulation/ISF/ISF_Config/python/ISF_MainConfig.py

@@ -494,6 +494,20 @@ def getKernel_ATLFASTIIF(name="ISF_Kernel_ATLFASTIIF", **kwargs):
     simFlags.SimulationFlavour = "ATLFASTIIF"
     return getKernel_GenericSimulatorNoG4(name, **kwargs)
 
+############## Simulator: ATLFASTIIF_G4MS ###############
+def getKernel_ATLFASTIIF_G4MS(name="ISF_Kernel_ATLFASTIIF_G4MS", **kwargs):
+    kwargs.setdefault("BeamPipeSimulationSelectors" , [ 'ISF_DefaultParticleKillerSelector' ]       )
+    kwargs.setdefault("IDSimulationSelectors"       , [ 'ISF_DefaultFatrasSelector' ]               )
+    kwargs.setdefault("CaloSimulationSelectors"     , [ 'ISF_MuonAFIIGeant4Selector',
+                                                        'ISF_EtaGreater5ParticleKillerSimSelector',
+                                                        'ISF_DefaultLegacyAFIIFastCaloSimSelector' ])
+    kwargs.setdefault("MSSimulationSelectors"       , [ 'ISF_DefaultAFIIGeant4Selector' ]           )
+    kwargs.setdefault("CavernSimulationSelectors"   , [ 'ISF_DefaultParticleKillerSelector' ]       )
+    # set the simFlags accordingly (TODO: is this even needed?)
+    from G4AtlasApps.SimFlags import simFlags
+    simFlags.SimulationFlavour = "ATLFASTIIF_G4MS"
+    return getKernel_GenericSimulator(name, **kwargs)
+
 ############## Simulator: ATLFASTIIFMT ###############
 def getKernel_ATLFASTIIFMT(name="ISF_Kernel_ATLFASTIIFMT", **kwargs):
     kwargs.setdefault("SimulationTools", ["ISF_ParticleKillerTool",