From 4caa2d1ed8be17f7479f600801d62a5c9484bfb6 Mon Sep 17 00:00:00 2001 From: Michal Mazurek <michal.mazurek@cern.ch> Date: Mon, 2 May 2022 09:44:40 +0200 Subject: [PATCH 1/2] Decouple lhcb-gaussino-fastsim from lhcb-gaussino label --- lhcbnightlyconf/Gauss.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/lhcbnightlyconf/Gauss.py b/lhcbnightlyconf/Gauss.py index d03ecaee..d65d5e76 100644 --- a/lhcbnightlyconf/Gauss.py +++ b/lhcbnightlyconf/Gauss.py @@ -334,9 +334,6 @@ gaussinoFastSim = create_gaussino_slot( 'lhcb-gaussino-fastsim', 'Test build of Fast Simulation Interface in Gaussino and Gauss-on-Gaussino', ) -for project in gaussinoFastSim.activeProjects: - if project.name not in ['PARAM', 'DBASE', 'Gaussino', 'Gauss']: - project.checkout_opts['merges'] = ['all', 'label=lhcb-gaussino'] gaussinoFastSim.cache_entries['GEANT4FILES_VERSION'] = 'v107r0' gaussinoFastSim.cache_entries['GEANT4_TAG'] = 'lhcb/v10.7.0-branch' slots.append(gaussinoFastSim) -- GitLab From 8a709f21ceb8701a9b63aa682d0507615de7338e Mon Sep 17 00:00:00 2001 From: Michal Mazurek <michal.mazurek@cern.ch> Date: Mon, 2 May 2022 16:50:31 +0200 Subject: [PATCH 2/2] Test fast simulation with a dedicated version: FASTSIM --- lhcbnightlyconf/Gauss.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lhcbnightlyconf/Gauss.py b/lhcbnightlyconf/Gauss.py index d65d5e76..35c7f936 100644 --- a/lhcbnightlyconf/Gauss.py +++ b/lhcbnightlyconf/Gauss.py @@ -336,6 +336,20 @@ gaussinoFastSim = create_gaussino_slot( ) gaussinoFastSim.cache_entries['GEANT4FILES_VERSION'] = 'v107r0' gaussinoFastSim.cache_entries['GEANT4_TAG'] = 'lhcb/v10.7.0-branch' +gaussinoFastSim.Gaussino.version = 'FASTSIM' +gaussinoFastSim.Gaussino.checkout_opts = { + 'merges': [ + # 'all', disabled on purpose + 'label=lhcb-gaussino-fastsim', + ], +} +gaussinoFastSim.Gauss.version = 'FASTSIM' +gaussinoFastSim.Gauss.checkout_opts = { + 'merges': [ + # 'all', disabled on purpose + 'label=lhcb-gaussino-fastsim', + ], +} slots.append(gaussinoFastSim) # Slot for Gaussino with the new CMake -- GitLab