diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimJobProperties.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimJobProperties.py index a74b68b3b74f6e385a280c118c4d411ac4ca994b..16bff8f9bd8f3a7953aebb7e15a7019b2c3e35a4 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimJobProperties.py +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimJobProperties.py @@ -60,7 +60,7 @@ class ParamsInputFilename(JobProperty): """ Filename of the input parametrizations file. """ statusOn = True allowedTypes = ['str'] - StoredValue = 'FastCaloSim/MC16/TFCSparam_AF3_MC23_Sep23.root' + StoredValue = 'FastCaloSim/MC23/TFCSparam_AF3_MC23_Sep23.root' class RunOnGPU(JobProperty): """Determines if run the FastCaloSim on GPU or not""" diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesTestHelpers.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesTestHelpers.py index 4b92a4c64494d2a5299085700ce93c8c00da94f3..1d49526d13e3f99bc43a2a55b2f1a573ab8ec917 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesTestHelpers.py +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesTestHelpers.py @@ -64,7 +64,7 @@ def defaultTestFlags(configFlags, args): configFlags.Sim.BeamPipeSimMode = BeamPipeSimMode.FastSim configFlags.Sim.ISFRun = True configFlags.Sim.ISF.Simulator = SimulationFlavour.ATLFAST3MT - configFlags.Sim.FastCalo.ParamsInputFilename = "FastCaloSim/MC16/TFCSparam_AF3_MC23_Sep23.root" + configFlags.Sim.FastCalo.ParamsInputFilename = "FastCaloSim/MC23/TFCSparam_AF3_MC23_Sep23.root" configFlags.Sim.FastCalo.CaloCellsName = "AllCalo" configFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-14" diff --git a/Simulation/SimulationConfig/python/SimConfigFlags.py b/Simulation/SimulationConfig/python/SimConfigFlags.py index 31acadf28800bcd8d3f4af14cc23bd4863f7f158..82e2eca17170c5d06725641a58abf58a4a62d904 100644 --- a/Simulation/SimulationConfig/python/SimConfigFlags.py +++ b/Simulation/SimulationConfig/python/SimConfigFlags.py @@ -231,7 +231,7 @@ def createSimConfigFlags(): scf.addFlag("Sim.ISF.HITSMergingRequired", _decideHITSMerging) - scf.addFlag("Sim.FastCalo.ParamsInputFilename", "FastCaloSim/MC16/TFCSparam_AF3_MC23_Sep23.root") # filename of the input parametrizations file + scf.addFlag("Sim.FastCalo.ParamsInputFilename", "FastCaloSim/MC23/TFCSparam_AF3_MC23_Sep23.root") # filename of the input parametrizations file scf.addFlag("Sim.FastCalo.RunOnGPU", False) # Determines if run the FastCaloSim on GPU or not scf.addFlag("Sim.FastCalo.CaloCellsName", "AllCalo") # StoreGate collection name for FastCaloSim hits diff --git a/Tools/Campaigns/python/MC23.py b/Tools/Campaigns/python/MC23.py index 46595dc340778e997f4ee861df7b6854fb950646..f06aabf67ceb5e02a9d6d2bec2c373c58aa8be61 100644 --- a/Tools/Campaigns/python/MC23.py +++ b/Tools/Campaigns/python/MC23.py @@ -157,6 +157,8 @@ def MC23SimulationNoIoV(flags): from SimuJobTransforms.G4Optimizations import enableG4Optimizations enableG4Optimizations(flags) + flags.Sim.FastCalo.ParamsInputFilename = 'FastCaloSim/MC23/TFCSparam_dev_Hybrid_Ha_v5_all_baryons_0_500.root' + def MC23SimulationLowMuRun(flags): """MC23 flags for low mu run simulation"""