From 65a10fa9f7a06ca09ad217cff81a6ebbec2db0a5 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 11 Jan 2025 21:54:50 -0500
Subject: [PATCH] {insert_*,zdc_*}: move INDEX to params (caching bugfix)
---
benchmarks/insert_muon/Snakefile | 3 ++-
benchmarks/insert_neutron/Snakefile | 3 ++-
benchmarks/insert_tau/Snakefile | 3 ++-
benchmarks/zdc_lambda/Snakefile | 3 ++-
benchmarks/zdc_photon/Snakefile | 3 ++-
benchmarks/zdc_pi0/Snakefile | 3 ++-
benchmarks/zdc_sigma/Snakefile | 3 ++-
7 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/benchmarks/insert_muon/Snakefile b/benchmarks/insert_muon/Snakefile
index fe9ce0ae..42143ba8 100644
--- a/benchmarks/insert_muon/Snakefile
+++ b/benchmarks/insert_muon/Snakefile
@@ -20,6 +20,7 @@ rule insert_muon_simulate:
output:
SIM_FILE="sim_output/insert_muon/{DETECTOR_CONFIG}_sim_mu-_{P}GeV_{INDEX}.edm4hep.root",
params:
+ INDEX=lambda wildcards: wildcards.INDEX,
PHYSICS_LIST="FTFP_BERT",
DETECTOR_PATH=os.environ["DETECTOR_PATH"],
DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -32,7 +33,7 @@ NEVENTS_SIM=1000
# Running simulation
npsim \
--compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
- --skipNEvents $(( $NEVENTS_SIM * {wildcards.INDEX} )) \
+ --skipNEvents $(( $NEVENTS_SIM * {params.INDEX} )) \
--numberOfEvents $NEVENTS_SIM \
--physicsList {params.PHYSICS_LIST} \
--inputFiles {input.GEN_FILE} \
diff --git a/benchmarks/insert_neutron/Snakefile b/benchmarks/insert_neutron/Snakefile
index 98cc5a28..2249b6fd 100644
--- a/benchmarks/insert_neutron/Snakefile
+++ b/benchmarks/insert_neutron/Snakefile
@@ -21,6 +21,7 @@ rule insert_neutron_simulate:
output:
SIM_FILE="sim_output/insert_neutron/{DETECTOR_CONFIG}_sim_neutron_{P}GeV_{INDEX}.edm4hep.root",
params:
+ INDEX=lambda wildcards: wildcards.INDEX,
PHYSICS_LIST="FTFP_BERT",
DETECTOR_PATH=os.environ["DETECTOR_PATH"],
DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -33,7 +34,7 @@ NEVENTS_SIM=200
# Running simulation
npsim \
--compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
- --skipNEvents $(( $NEVENTS_SIM * {wildcards.INDEX} )) \
+ --skipNEvents $(( $NEVENTS_SIM * {params.INDEX} )) \
--numberOfEvents $NEVENTS_SIM \
--physicsList {params.PHYSICS_LIST} \
--inputFiles {input.GEN_FILE} \
diff --git a/benchmarks/insert_tau/Snakefile b/benchmarks/insert_tau/Snakefile
index ffc9c491..6d10c7cf 100644
--- a/benchmarks/insert_tau/Snakefile
+++ b/benchmarks/insert_tau/Snakefile
@@ -27,6 +27,7 @@ rule insert_tau_simulate:
SIM_FILE="sim_output/insert_tau/{DETECTOR_CONFIG}_sim_tau-_{P}GeV_{INDEX}.edm4hep.root",
params:
N_EVENTS=get_n_events,
+ INDEX=lambda wildcards: wildcards.INDEX,
PHYSICS_LIST="FTFP_BERT",
DETECTOR_PATH=os.environ["DETECTOR_PATH"],
DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -39,7 +40,7 @@ rule insert_tau_simulate:
npsim \
--compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
--numberOfEvents {params.N_EVENTS} \
- --skipNEvents $(( {params.N_EVENTS} * {wildcards.INDEX} )) \
+ --skipNEvents $(( {params.N_EVENTS} * {params.INDEX} )) \
--physicsList {params.PHYSICS_LIST} \
--inputFiles {input.GEN_FILE} \
--outputFile {output.SIM_FILE}
diff --git a/benchmarks/zdc_lambda/Snakefile b/benchmarks/zdc_lambda/Snakefile
index d4f89fac..335f0a52 100644
--- a/benchmarks/zdc_lambda/Snakefile
+++ b/benchmarks/zdc_lambda/Snakefile
@@ -19,6 +19,7 @@ rule zdc_lambda_simulate:
SIM_FILE="sim_output/zdc_lambda/{DETECTOR_CONFIG}_sim_lambda_dec_{P}GeV_{INDEX}.edm4hep.root",
params:
N_EVENTS=200,
+ INDEX=lambda wildcards: wildcards.INDEX,
PHYSICS_LIST="FTFP_BERT",
DETECTOR_PATH=os.environ["DETECTOR_PATH"],
DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -30,7 +31,7 @@ rule zdc_lambda_simulate:
# Running simulation
npsim \
--compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
- --skipNEvents $(( {params.N_EVENTS} * {wildcards.INDEX} )) \
+ --skipNEvents $(( {params.N_EVENTS} * {params.INDEX} )) \
--numberOfEvents {params.N_EVENTS} \
--physicsList {params.PHYSICS_LIST} \
--inputFiles {input.GEN_FILE} \
diff --git a/benchmarks/zdc_photon/Snakefile b/benchmarks/zdc_photon/Snakefile
index 3e653a13..76adc7e5 100644
--- a/benchmarks/zdc_photon/Snakefile
+++ b/benchmarks/zdc_photon/Snakefile
@@ -22,6 +22,7 @@ rule zdc_photon_simulate:
SIM_FILE="sim_output/zdc_photon/{DETECTOR_CONFIG}_sim_zdc_photon_{P}GeV_{INDEX}.edm4hep.root",
params:
N_EVENTS=200,
+ INDEX=lambda wildcards: wildcards.INDEX,
PHYSICS_LIST="FTFP_BERT",
DETECTOR_PATH=os.environ["DETECTOR_PATH"],
DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -34,7 +35,7 @@ rule zdc_photon_simulate:
npsim \
--compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
--physicsList {params.PHYSICS_LIST} \
- --skipNEvents $(( {params.N_EVENTS} * {wildcards.INDEX} )) \
+ --skipNEvents $(( {params.N_EVENTS} * {params.INDEX} )) \
--numberOfEvents {params.N_EVENTS} \
--inputFiles {input.GEN_FILE} \
--outputFile {output.SIM_FILE}
diff --git a/benchmarks/zdc_pi0/Snakefile b/benchmarks/zdc_pi0/Snakefile
index 320a20f3..7770d566 100644
--- a/benchmarks/zdc_pi0/Snakefile
+++ b/benchmarks/zdc_pi0/Snakefile
@@ -20,6 +20,7 @@ rule zdc_pi0_simulate:
SIM_FILE="sim_output/zdc_pi0/{DETECTOR_CONFIG}_sim_zdc_pi0_{P}GeV_{INDEX}.edm4hep.root",
params:
N_EVENTS=200,
+ INDEX=lambda wildcards: wildcards.INDEX,
PHYSICS_LIST="FTFP_BERT",
DETECTOR_PATH=os.environ["DETECTOR_PATH"],
DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -31,7 +32,7 @@ rule zdc_pi0_simulate:
# Running simulation
npsim \
--compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
- --skipNEvents $(( {params.N_EVENTS} * {wildcards.INDEX} )) \
+ --skipNEvents $(( {params.N_EVENTS} * {params.INDEX} )) \
--numberOfEvents {params.N_EVENTS} \
--physicsList {params.PHYSICS_LIST} \
--inputFiles {input.GEN_FILE} \
diff --git a/benchmarks/zdc_sigma/Snakefile b/benchmarks/zdc_sigma/Snakefile
index b7836e82..70401667 100644
--- a/benchmarks/zdc_sigma/Snakefile
+++ b/benchmarks/zdc_sigma/Snakefile
@@ -19,6 +19,7 @@ rule zdc_sigma_simulate:
SIM_FILE="sim_output/zdc_sigma/{DETECTOR_CONFIG}_sim_sigma_dec_{P}GeV_{INDEX}.edm4hep.root",
params:
N_EVENTS=200,
+ INDEX=lambda wildcards: wildcards.INDEX,
PHYSICS_LIST="FTFP_BERT",
DETECTOR_PATH=os.environ["DETECTOR_PATH"],
DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -30,7 +31,7 @@ rule zdc_sigma_simulate:
# Running simulation
npsim \
--compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
- --skipNEvents $(( {params.N_EVENTS} * {wildcards.INDEX} )) \
+ --skipNEvents $(( {params.N_EVENTS} * {params.INDEX} )) \
--numberOfEvents {params.N_EVENTS} \
--physicsList {params.PHYSICS_LIST} \
--inputFiles {input.GEN_FILE} \
--
GitLab