diff --git a/benchmarks/tracking_performances_dis/Snakefile b/benchmarks/tracking_performances_dis/Snakefile index 7774f2a..1b9b37a 100644 --- a/benchmarks/tracking_performances_dis/Snakefile +++ b/benchmarks/tracking_performances_dis/Snakefile @@ -16,6 +16,8 @@ rule trk_dis_compile: input: "benchmarks/tracking_performances_dis/analysis/trk_dis_analysis_cxx.so", "benchmarks/tracking_performances_dis/analysis/trk_dis_plots_cxx.so" + "benchmarks/tracking_performances_dis/analysis/vtx_dis_analysis_cxx.so", + "benchmarks/tracking_performances_dis/analysis/vtx_dis_plots_cxx.so" # Process the generated HepMC files through the simulation rule trk_dis_sim: @@ -53,42 +55,61 @@ exec env DETECTOR_CONFIG={wildcards.DETECTOR_CONFIG} \ """ # Process the files -- either from the campaign or local running -- through the analysis script -rule trk_dis_analysis: +rule dis_analysis: input: - script="benchmarks/tracking_performances_dis/analysis/trk_dis_analysis.cxx", - script_compiled="benchmarks/tracking_performances_dis/analysis/trk_dis_analysis_cxx.so", + script_trk="benchmarks/tracking_performances_dis/analysis/trk_dis_analysis.cxx", + script_trk_compiled="benchmarks/tracking_performances_dis/analysis/trk_dis_analysis_cxx.so", + script_vtx="benchmarks/tracking_performances_dis/analysis/vtx_dis_analysis.cxx", + script_vtx_compiled="benchmarks/tracking_performances_dis/analysis/vtx_dis_analysis_cxx.so", data="sim_output/tracking_performances_dis/{DETECTOR_CONFIG}/{PREFIX}pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_{INDEX}.edm4eic.root", output: - config="results/tracking_performances_dis/{DETECTOR_CONFIG}/{PREFIX}pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_{INDEX}/config.json", - hists="results/tracking_performances_dis/{DETECTOR_CONFIG}/{PREFIX}pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_{INDEX}/hists.root", + config_trk="results/tracking_performances_dis/{DETECTOR_CONFIG}/{PREFIX}pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_{INDEX}/config.json", + hists_trk="results/tracking_performances_dis/{DETECTOR_CONFIG}/{PREFIX}pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_{INDEX}/hists.root", + config_vtx="results/vertexing_performances_dis/{DETECTOR_CONFIG}/{PREFIX}pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_{INDEX}/config.json", + hists_vtx="results/vertexing_performances_dis/{DETECTOR_CONFIG}/{PREFIX}pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_{INDEX}/hists.root", wildcard_constraints: PREFIX= ".*", EBEAM="\d+", PBEAM="\d+", - MINQ2="\d+", + MINQ2="\d+", INDEX="\d+", shell: """ -cat > {output.config} < {output.config_trk} < {output.config_vtx} < {output.config} < {output.config_trk} < {output.config_vtx} <