{insert_*,zdc_*}: move INDEX to params (caching bugfix)

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} \

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} \

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}

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} \

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}

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} \

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} \