diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5f7b7c5a832bd608bf9db52ab638ad316dea0c8..3563178f28a666d97831a103f4bb5959152ed84f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,9 +116,12 @@ get_data:
     # snakemake support
     - mkdir "${DETECTOR_CONFIG}"
     - ln -s "${LOCAL_DATA_PATH}/sim_output" "${DETECTOR_CONFIG}/sim_output"
+    - find "${LOCAL_DATA_PATH}/sim_output" -type l -exec ls -la {} \;
     - ln -s "../results" "${DETECTOR_CONFIG}/results"
     - mkdir -p "$SNAKEMAKE_OUTPUT_CACHE"
     - ls -lrtha
+  after_script:
+    - find "${LOCAL_DATA_PATH}/sim_output" -type l -exec ls -la {} \;
   retry:
     max: 2
     when:
diff --git a/benchmarks/calo_pid/Snakefile b/benchmarks/calo_pid/Snakefile
index aa962ac58b0c9313dc443da7648fc1ad543ca71b..88a4e1ac6ffef27489589a2425d61c5233589cff 100644
--- a/benchmarks/calo_pid/Snakefile
+++ b/benchmarks/calo_pid/Snakefile
@@ -23,6 +23,8 @@ rule calo_pid_sim:
         DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
         ENERGY_MIN=lambda wildcards: format_energy_for_dd4hep(wildcards.ENERGY_MIN),
         ENERGY_MAX=lambda wildcards: format_energy_for_dd4hep(wildcards.ENERGY_MAX),
+        THETA_MIN=lambda wildcards: wildcards.THETA_MIN,
+        THETA_MAX=lambda wildcards: wildcards.THETA_MAX,
         DD4HEP_HASH=get_spack_package_hash("dd4hep"),
         NPSIM_HASH=get_spack_package_hash("npsim"),
     cache: True
diff --git a/benchmarks/femc_electron/Snakefile b/benchmarks/femc_electron/Snakefile
index 90a0c40fba576b03999a4ddcb55593cf03a28373..d1e77db8b69df5a2d3ce2b35dbb53c88a3b15b8f 100644
--- a/benchmarks/femc_electron/Snakefile
+++ b/benchmarks/femc_electron/Snakefile
@@ -14,10 +14,11 @@ rule femc_electron_generate:
         N_EVENTS=get_n_events,
         th_max=28,
         th_min=2.0,
+        P=lambda wildcards: wildcards.P,
     shell:
         """
 mkdir -p sim_output/femc_electron
-root -l -b -q '{input.script}({params.N_EVENTS},"{output.GEN_FILE}", "e-", {params.th_min}, {params.th_max}, 0., 360., {wildcards.P})'
+root -l -b -q '{input.script}({params.N_EVENTS},"{output.GEN_FILE}", "e-", {params.th_min}, {params.th_max}, 0., 360., {params.P})'
 """
 
 rule femc_electron_simulate:
diff --git a/benchmarks/femc_photon/Snakefile b/benchmarks/femc_photon/Snakefile
index d85b8132e4f9dff2c06f61ea8c6e8b4a1ca7758a..5cfecca5bf5afd1a7d32d7a1d41812416a7d6193 100644
--- a/benchmarks/femc_photon/Snakefile
+++ b/benchmarks/femc_photon/Snakefile
@@ -14,10 +14,11 @@ rule femc_photon_generate:
         N_EVENTS=get_n_events,
         th_max=28,
         th_min=2.0,
+        P=lambda wildcards: wildcards.P,
     shell:
         """
 mkdir -p sim_output/femc_photon
-root -l -b -q '{input.script}({params.N_EVENTS},"{output.GEN_FILE}", "gamma", {params.th_min}, {params.th_max}, 0., 360., {wildcards.P})'
+root -l -b -q '{input.script}({params.N_EVENTS},"{output.GEN_FILE}", "gamma", {params.th_min}, {params.th_max}, 0., 360., {params.P})'
 """
 
 rule femc_photon_simulate:
diff --git a/benchmarks/femc_pi0/Snakefile b/benchmarks/femc_pi0/Snakefile
index 05902510ec21a4c8a5aac8a79cc412893cb6eee7..9d753f3383da9cbbab6bff64a8fe0ad91be8279a 100644
--- a/benchmarks/femc_pi0/Snakefile
+++ b/benchmarks/femc_pi0/Snakefile
@@ -14,10 +14,11 @@ rule femc_pi0_generate:
         N_EVENTS=get_n_events,
         th_max=28,
         th_min=2.0,
+        P=lambda wildcards: wildcards.P,
     shell:
         """
 mkdir -p sim_output/femc_pi0
-root -l -b -q '{input.script}({params.N_EVENTS},"{output.GEN_FILE}", "pi0", {params.th_min}, {params.th_max}, 0., 360., {wildcards.P})'
+root -l -b -q '{input.script}({params.N_EVENTS},"{output.GEN_FILE}", "pi0", {params.th_min}, {params.th_max}, 0., 360., {params.P})'
 """
 
 rule femc_pi0_simulate:
diff --git a/benchmarks/insert_muon/Snakefile b/benchmarks/insert_muon/Snakefile
index 42143ba84cd89b22a4a549eb2d58ac62db4b2f86..85e3e27bc72b91d0defed0069c34318b93059e29 100644
--- a/benchmarks/insert_muon/Snakefile
+++ b/benchmarks/insert_muon/Snakefile
@@ -7,9 +7,10 @@ rule insert_muon_generate:
         NEVENTS_GEN=5000,
         th_max=7.0,
         th_min=1.7,
+        P=lambda wildcards: wildcards.P,
     shell:
         """
-root -l -b -q '{input.script}({params.NEVENTS_GEN},"{output.GEN_FILE}", "mu-", {params.th_min}, {params.th_max}, 0., 360., {wildcards.P})'
+root -l -b -q '{input.script}({params.NEVENTS_GEN},"{output.GEN_FILE}", "mu-", {params.th_min}, {params.th_max}, 0., 360., {params.P})'
 """
 
 rule insert_muon_simulate:
diff --git a/benchmarks/insert_neutron/Snakefile b/benchmarks/insert_neutron/Snakefile
index 2249b6fd6a91ef2cb756c10050925630adaa324c..940abc6ec5e81c7ad667042d129f5198338cdb90 100644
--- a/benchmarks/insert_neutron/Snakefile
+++ b/benchmarks/insert_neutron/Snakefile
@@ -7,10 +7,11 @@ rule insert_neutron_generate:
         NEVENTS_GEN=1000,
         th_max=5.7,
         th_min=2.0,
+        P=lambda wildcards: wildcards.P,
     shell:
         """
 mkdir -p sim_output/insert_neutron
-root -l -b -q '{input.script}({params.NEVENTS_GEN},"{output.GEN_FILE}", "neutron", {params.th_min}, {params.th_max}, 0., 360., {wildcards.P})'
+root -l -b -q '{input.script}({params.NEVENTS_GEN},"{output.GEN_FILE}", "neutron", {params.th_min}, {params.th_max}, 0., 360., {params.P})'
 """
 
 rule insert_neutron_simulate:
diff --git a/benchmarks/insert_tau/Snakefile b/benchmarks/insert_tau/Snakefile
index 6d10c7cfa3cf5f030f9d6a07c1866f3ca2741632..d3843439c347c06883150b6486b52139087e7d3a 100644
--- a/benchmarks/insert_tau/Snakefile
+++ b/benchmarks/insert_tau/Snakefile
@@ -13,9 +13,10 @@ rule insert_tau_generate:
         N_EVENTS=get_n_events,
         th_max=7.0,
         th_min=1.7,
+        P=lambda wildcards: wildcards.P,
     shell:
         """
-root -l -b -q '{input.script}({params.N_EVENTS},"{output.GEN_FILE}", "tau-", {params.th_min}, {params.th_max}, 0., 360., {wildcards.P})'
+root -l -b -q '{input.script}({params.N_EVENTS},"{output.GEN_FILE}", "tau-", {params.th_min}, {params.th_max}, 0., 360., {params.P})'
 """
 
 rule insert_tau_simulate:
diff --git a/benchmarks/tracking_performances/Snakefile b/benchmarks/tracking_performances/Snakefile
index bb9119f50ef2c697b35ae651500fa75d89ae99a6..2582137c898cb7795496c69c86422c515588595d 100644
--- a/benchmarks/tracking_performances/Snakefile
+++ b/benchmarks/tracking_performances/Snakefile
@@ -1,6 +1,6 @@
 rule tracking_performance_sim:
     input:
-        steering_file=ancient("EPIC/EVGEN/SINGLE/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.steer"),
+        steering_file="EPIC/EVGEN/SINGLE/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.steer",
         warmup="warmup/{DETECTOR_CONFIG}.edm4hep.root",
     output:
         "sim_output/tracking_performance/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.edm4hep.root",
diff --git a/benchmarks/zdc_lambda/Snakefile b/benchmarks/zdc_lambda/Snakefile
index 335f0a52ef34c5a747a4f6981dc9be82598ef59e..f256e6b0eb72fc277de4be28518b48fe7f966e3f 100644
--- a/benchmarks/zdc_lambda/Snakefile
+++ b/benchmarks/zdc_lambda/Snakefile
@@ -5,9 +5,10 @@ rule zdc_lambda_generate:
                 GEN_FILE="sim_output/zdc_lambda/lambda_decay_{P}GeV.hepmc",
         params:
                 N_EVENTS=1000,
+                P=lambda wildcards: wildcards.P,
         shell:
                 """
-root -l -b -q '{input.script}({params.N_EVENTS},0,"{output.GEN_FILE}",{wildcards.P},{wildcards.P})'
+root -l -b -q '{input.script}({params.N_EVENTS},0,"{output.GEN_FILE}",{params.P},{params.P})'
 """
 
 rule zdc_lambda_simulate:
diff --git a/benchmarks/zdc_lyso/Snakefile b/benchmarks/zdc_lyso/Snakefile
index cb77131e338e2635f3454daca3c3da6f3093aa1f..1809051bf9be68e980cdab6154421fd2effff2a7 100644
--- a/benchmarks/zdc_lyso/Snakefile
+++ b/benchmarks/zdc_lyso/Snakefile
@@ -10,9 +10,13 @@ rule zdc_lyso_sim_hepmc:
         "data/{PARTICLE}_{BEAM_ENERGY}GeV_theta_{THETA_MIN}deg_thru_{THETA_MAX}deg.hepmc.log",
     params:
         num_events=1000,
+        PARTICLE=lambda wildcards: wildcards.PARTICLE,
+        BEAM_ENERGY=lambda wildcards: wildcards.BEAM_ENERGY,
+        THETA_MIN=lambda wildcards: wildcards.THETA_MIN,
+        THETA_MAX=lambda wildcards: wildcards.THETA_MAX,
     shell:
         """
-root -l -b -q '{input.script}({params.num_events}, "{output.hepmcfile}", "{wildcards.PARTICLE}", {wildcards.THETA_MIN}, {wildcards.THETA_MAX}, 0, 360, {wildcards.BEAM_ENERGY})'
+root -l -b -q '{input.script}({params.num_events}, "{output.hepmcfile}", "{params.PARTICLE}", {params.THETA_MIN}, {params.THETA_MAX}, 0, 360, {params.BEAM_ENERGY})'
 """
 
 
diff --git a/benchmarks/zdc_photon/Snakefile b/benchmarks/zdc_photon/Snakefile
index 76adc7e5d4afbcac8bb7e7005f6930309ba8bf83..58bc5dbab0b345a01804d271b33e96044c540239 100644
--- a/benchmarks/zdc_photon/Snakefile
+++ b/benchmarks/zdc_photon/Snakefile
@@ -7,10 +7,11 @@ rule zdc_photon_generate:
                 th_max=0.23,
                 th_min=0,
                 N_EVENTS=1000,
+                P=lambda wildcards: wildcards.P,
         shell:
                 """
 mkdir -p sim_output/zdc_photon
-root -l -b -q '{input.script}('{params.N_EVENTS}',"{output.GEN_FILE}", "gamma", {params.th_min}, {params.th_max}, 0., 360., {wildcards.P})'
+root -l -b -q '{input.script}('{params.N_EVENTS}',"{output.GEN_FILE}", "gamma", {params.th_min}, {params.th_max}, 0., 360., {params.P})'
 """
 
 rule zdc_photon_simulate:
diff --git a/benchmarks/zdc_pi0/Snakefile b/benchmarks/zdc_pi0/Snakefile
index 7770d56633d874a977cee2a8434ece0bede5b020..7c97f2fb0077563a88944061e92a04cad75d9d10 100644
--- a/benchmarks/zdc_pi0/Snakefile
+++ b/benchmarks/zdc_pi0/Snakefile
@@ -5,10 +5,11 @@ rule zdc_pi0_generate:
                 GEN_FILE="sim_output/zdc_pi0/zdc_pi0_{P}GeV.hepmc",
         params:
                 N_EVENTS=1000,
+                P=lambda wildcards: wildcards.P,
         shell:
                 """
 mkdir -p sim_output/zdc_pi0
-root -l -b -q '{input.script}({params.N_EVENTS},0,"{output.GEN_FILE}",{wildcards.P},{wildcards.P})'
+root -l -b -q '{input.script}({params.N_EVENTS},0,"{output.GEN_FILE}",{params.P},{params.P})'
 """
 
 rule zdc_pi0_simulate:
diff --git a/benchmarks/zdc_sigma/Snakefile b/benchmarks/zdc_sigma/Snakefile
index 704016672e8dc6cfc17a75fdb8bd989aed25706f..92a645d26a614a12812cdd5a291938a32f115e7f 100644
--- a/benchmarks/zdc_sigma/Snakefile
+++ b/benchmarks/zdc_sigma/Snakefile
@@ -5,9 +5,10 @@ rule zdc_sigma_generate:
                 GEN_FILE="sim_output/zdc_sigma/sigma_decay_{P}GeV.hepmc",
         params:
                 N_EVENTS=100000,
+                P=lambda wildcards: wildcards.P,
         shell:
                 """
-root -l -b -q '{input.script}({params.N_EVENTS},0,"{output.GEN_FILE}",{wildcards.P},{wildcards.P})'
+root -l -b -q '{input.script}({params.N_EVENTS},0,"{output.GEN_FILE}",{params.P},{params.P})'
 """
 
 rule zdc_sigma_simulate:
@@ -67,5 +68,7 @@ rule zdc_sigma_analysis:
         shell:
                 """
 mkdir -p {output.results_dir}
+ls -la {input}
+find "$LOCAL_DATA_PATH/sim_output" -type l -exec readlink {{}} \; | xargs ls -la
 python {input.script} {output.results_dir}
 """