From 2a953667b9558ce924d20203678971cf9acdb617 Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Thu, 23 Feb 2023 09:35:53 +0100
Subject: [PATCH] SimConfigFlags: Clean-up HITMerging auto-configuration
SimConfigFlags: Clean-up HITMerging auto-configuration
---
Simulation/SimulationConfig/python/SimConfigFlags.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/Simulation/SimulationConfig/python/SimConfigFlags.py b/Simulation/SimulationConfig/python/SimConfigFlags.py
index f8baf8eddc2..0ab2cee3857 100644
--- a/Simulation/SimulationConfig/python/SimConfigFlags.py
+++ b/Simulation/SimulationConfig/python/SimConfigFlags.py
@@ -183,24 +183,23 @@ def createSimConfigFlags():
scf.addFlag("Sim.ISF.UseTrackingGeometryCond", False) # Using Condition for tracking Geometry
def _decideHITSMerging(prevFlags):
- simulator = prevFlags.Sim.ISF.Simulator
# Further specialization possible in future
- if simulator in [SimulationFlavour.FullG4MT, SimulationFlavour.FullG4MT_QS, SimulationFlavour.PassBackG4MT, SimulationFlavour.AtlasG4]:
+ if prevFlags.Sim.ISF.Simulator.isFullSim():
doID = False
doITk = False
doCALO = False
doMUON = False
- elif simulator in [SimulationFlavour.ATLFASTIIF_G4MS, SimulationFlavour.ATLFASTIIFMT, SimulationFlavour.ATLFAST3F_G4MS]:
+ elif prevFlags.Sim.ISF.Simulator.usesFatras() and prevFlags.Sim.ISF.Simulator.usesFastCaloSim():
doID = True
doITk = True
doCALO = True
doMUON = True
- elif simulator in [SimulationFlavour.ATLFASTIIMT, SimulationFlavour.ATLFAST3MT, SimulationFlavour.ATLFAST3MT_QS]:
+ elif prevFlags.Sim.ISF.Simulator.usesFastCaloSim():
doID = False
doITk = False
doCALO = True
doMUON = False
- elif simulator in [SimulationFlavour.Unknown]:
+ elif prevFlags.Sim.ISF.Simulator in [SimulationFlavour.Unknown]:
doID = True
doITk = True
doCALO = True
--
GitLab