From 4e21f7b656a7fe9fec73bc6bc3f1eeb116bfbd2c Mon Sep 17 00:00:00 2001
From: Christopher Young <christopher.young@cern.ch>
Date: Mon, 16 Oct 2023 15:58:23 +0200
Subject: [PATCH] Add default to Campaigns/MC23.py (and fix typo)
---
.../python/ISF_FastCaloSimJobProperties.py | 2 +-
.../python/ISF_FastCaloSimServicesTestHelpers.py | 2 +-
Simulation/SimulationConfig/python/SimConfigFlags.py | 2 +-
Tools/Campaigns/python/MC23.py | 2 ++
4 files changed, 5 insertions(+), 3 deletions(-)
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 a74b68b3b74..16bff8f9bd8 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 4b92a4c6449..1d49526d13e 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 31acadf2880..82e2eca1717 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 46595dc3407..f06aabf67ce 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"""
--
GitLab