Changes to sampF

Author: MSieczczynski

benchmarks/nhcal_acceptance/Snakefile

@@ -41,7 +41,7 @@ rule nhcal_acceptance_combine:
         f"sim_output/nhcal_acceptance/sim_{{DETECTOR_CONFIG}}_E{{ENERGY}}GeV_combined_{{N}}files.edm4hep.root",
     shell:
         """
-hadd {output} {input} 
+hadd -f {output} {input} 
 """
 
 rule nhcal_acceptance_analysis:

benchmarks/nhcal_acceptance/config.yml

@@ -17,7 +17,7 @@ bench:nhcal_acceptance_analysis:
     matrix:
       - ENERGY: ["1GeV", "5GeV", "10GeV"]
   script:
-    - snakemake --cores 3 results/nhcal_acceptance/analysis_epic_backward_hcal_only_E${ENERGY}_combined_10files.pdf
+    - snakemake --cores 1 results/nhcal_acceptance/analysis_epic_backward_hcal_only_E${ENERGY}_combined_10files.pdf
 
 collect_results:nhcal_acceptance:
   extends: .det_benchmark

benchmarks/nhcal_basic_distribution/Snakefile

@@ -41,7 +41,7 @@ rule nhcal_basic_distribution_combine:
         f"sim_output/nhcal_basic_distribution/sim_{{DETECTOR_CONFIG}}_E{{ENERGY}}GeV_combined_{{N}}files.edm4hep.root",
     shell:
         """
-hadd {output} {input} 
+hadd -f {output} {input} 
 """
 
 rule nhcal_basic_distribution_analysis:

benchmarks/nhcal_basic_distribution/config.yml

@@ -27,7 +27,7 @@ bench:nhcal_basic_distribution_analysis:
     matrix:
       - ENERGY: ["0.5GeV", "0.7GeV", "1.0GeV", "2.0GeV", "5.0GeV"]
   script:
-    - snakemake --cores 3 results/nhcal_basic_distribution/analysis_epic_backward_hcal_only_E${ENERGY}_combined_10files.pdf
+    - snakemake --cores 1 results/nhcal_basic_distribution/analysis_epic_backward_hcal_only_E${ENERGY}_combined_10files.pdf
 
 bench:nhcal_basic_distribution_analysis_full:
   extends: .det_benchmark
@@ -38,7 +38,7 @@ bench:nhcal_basic_distribution_analysis_full:
     matrix:
       - ENERGY: ["0.5GeV", "0.7GeV", "1.0GeV", "2.0GeV", "5.0GeV"]
   script:
-    - snakemake --cores 3 results/nhcal_basic_distribution/analysis_epic_full_E${ENERGY}_combined_10files.pdf
+    - snakemake --cores 1 results/nhcal_basic_distribution/analysis_epic_full_E${ENERGY}_combined_10files.pdf
 
 
 collect_results:nhcal_basic_distribution:

benchmarks/nhcal_sampling_fraction/Snakefile

@@ -5,7 +5,7 @@ DETECTOR_CONFIG = "epic_backward_hcal_only.xml"
 
 rule nhcal_sampling_fraction_simulate:
     output:
-        "sim_output/nhcal_sampling_fraction/{PARTICLE}/E{ENERGY}GeV/sim.{INDEX}.edm4hep.root",
+        "sim_output/nhcal_sampling_fraction/{PARTICLE}/E{ENERGY}GeV/sim.edm4hep.root",
     params:
         N_EVENTS=1000,
     shell:
@@ -30,28 +30,26 @@ exec ddsim \
 rule nhcal_sampling_fraction_combine:
     input:
         lambda wildcards: expand(
-            "sim_output/nhcal_sampling_fraction/{PARTICLE}/E{ENERGY}GeV/sim.{INDEX:02d}.edm4hep.root", 
+            "sim_output/nhcal_sampling_fraction/{PARTICLE}/E{ENERGY}GeV/sim.edm4hep.root", 
             ENERGY=["1", "2", "5", "10"],
             PARTICLE=["pi-", "neutron", "e-"],
-            INDEX=range(int(wildcards.N)),
         ),
     wildcard_constraints:
-        N=r"\d+",
         ENERGY=r"\d+"
     output:
-        f"sim_output/nhcal_sampling_fraction/sim_{{N}}files_per.edm4hep.root",
+        f"sim_output/nhcal_sampling_fraction/sim_combined.edm4hep.root",
     shell:
         """
-hadd {output} {input} 
+hadd -f {output} {input} 
 """
 
 rule nhcal_sampling_fraction_analysis:
     input:
-        combined="sim_output/nhcal_sampling_fraction/sim_{N}files_per.edm4hep.root",
+        combined="sim_output/nhcal_sampling_fraction/sim_combined.edm4hep.root",
         script="benchmarks/nhcal_sampling_fraction/scripts/sampling_fraction_analysis.cxx",
     output:
-        pdf=f"results/nhcal_sampling_fraction/analysis_{{N}}files_per.pdf",
-        png=f"results/nhcal_sampling_fraction/analysis_{{N}}files_per.png",
+        pdf=f"results/nhcal_sampling_fraction/analysis.pdf",
+        png=f"results/nhcal_sampling_fraction/analysis.png",
     shell:
         """
     root -l -b -q '{input.script}("{input.combined}","{output.pdf}","{output.png}","{DETECTOR_PATH}/{DETECTOR_CONFIG}")'

benchmarks/nhcal_sampling_fraction/config.yml

@@ -5,17 +5,16 @@ sim:nhcal_sampling_fraction:
     matrix:
       - ENERGY: ["1GeV", "2GeV", "5GeV", "10GeV"]
         PARTICLE: ["pi-", "neutron", "e-"]
-        INDEX: ["00","01","02","03"]
   script:
-    - snakemake --cores 5 sim_output/nhcal_sampling_fraction/${PARTICLE}/E${ENERGY}/sim.${INDEX}.edm4hep.root                 
+    - snakemake --cores 5 sim_output/nhcal_sampling_fraction/${PARTICLE}/E${ENERGY}/sim.edm4hep.root                 
 
 bench:nhcal_sampling_fraction:
   extends: .det_benchmark
   stage: benchmarks
   needs:
     - "sim:nhcal_sampling_fraction"
   script:
-    - snakemake --cores 3 results/nhcal_sampling_fraction/analysis_5files_per.pdf
+    - snakemake --cores 1 results/nhcal_sampling_fraction/analysis.pdf
 
 collect_results:nhcal_sampling_fraction:
   extends: .det_benchmark
@@ -25,6 +24,6 @@ collect_results:nhcal_sampling_fraction:
   script:
     - ls -lrht
     - mv results{,_save}/ 
-    - snakemake $SNAKEMAKE_FLAGS --cores 1 --delete-all-output results/nhcal_sampling_fraction/analysis_5files_per.pdf
+    - snakemake $SNAKEMAKE_FLAGS --cores 1 --delete-all-output results/nhcal_sampling_fraction/analysis.pdf
     - mv results{_save,}/