diff --git a/Snakefile b/Snakefile index 39861cc0..8ea73d76 100644 --- a/Snakefile +++ b/Snakefile @@ -104,15 +104,14 @@ exit 1 rule warmup_run: output: - "warmup/{DETECTOR_CONFIG}.edm4hep.root", - message: "Ensuring that calibrations/fieldmaps are available for {wildcards.DETECTOR_CONFIG}" + "warmup.edm4hep.root", + message: "Ensuring that calibrations/fieldmaps are available" shell: """ set -m # monitor mode to prevent lingering processes exec ddsim \ - -v VERBOSE \ --runType batch \ --numberOfEvents 1 \ - --compactFile "$DETECTOR_PATH/{wildcards.DETECTOR_CONFIG}.xml" \ + --compactFile "$DETECTOR_PATH/epic_ip6.xml" \ --outputFile "{output}" \ --enableGun """ diff --git a/benchmarks/backgrounds/Snakefile b/benchmarks/backgrounds/Snakefile index d9de9e05..cdf85f8a 100644 --- a/benchmarks/backgrounds/Snakefile +++ b/benchmarks/backgrounds/Snakefile @@ -4,7 +4,7 @@ import shutil rule backgrounds_sim: input: - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: "sim_output/{DETECTOR_CONFIG}/backgrounds/{PATH}.edm4hep.root", diff --git a/benchmarks/backwards_ecal/Snakefile b/benchmarks/backwards_ecal/Snakefile index f0bd6bb5..52261c7a 100644 --- a/benchmarks/backwards_ecal/Snakefile +++ b/benchmarks/backwards_ecal/Snakefile @@ -8,7 +8,7 @@ def get_n_events(wildcards): rule backwards_ecal_sim: input: steering_file=ancient("EPIC/EVGEN/SINGLE/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.steer"), - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: "sim_output/backwards_ecal/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.edm4hep.root", @@ -46,7 +46,7 @@ exec npsim \ rule backwards_ecal_recon: input: sim="sim_output/backwards_ecal/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: "sim_output/backwards_ecal/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.eicrecon.edm4eic.root", log: diff --git a/benchmarks/beamline/Snakefile b/benchmarks/beamline/Snakefile index 878c2b2b..3ef663b5 100644 --- a/benchmarks/beamline/Snakefile +++ b/benchmarks/beamline/Snakefile @@ -7,7 +7,7 @@ ANALYSISDIR=SIMOUTDIR+"analysis/" rule beamline_steering_sim: input: - warmup="warmup/epic_ip6_extended.edm4hep.root", + warmup="warmup.edm4hep.root", macro=workflow.source_path("beamlineGPS.mac"), geometry_lib=find_epic_libraries(), output: @@ -31,7 +31,7 @@ rule beamline_steering_sim: rule beamline_steering_analysis: input: - warmup="warmup/epic_ip6_extended.edm4hep.root", + warmup="warmup.edm4hep.root", script=workflow.source_path("beamlineAnalysis.C"), header=workflow.source_path("shared_functions.h"), data=SIMOUTDIR+"beamlineTest{CAMPAIGN}.edm4hep.root", @@ -59,7 +59,7 @@ rule beamline_steering_analysis: rule beamline_acceptance_sim: input: - warmup="warmup/epic_ip6_extended.edm4hep.root", + warmup="warmup.edm4hep.root", macro=workflow.source_path("acceptanceGPS.mac"), geometry_lib=find_epic_libraries(), output: @@ -82,7 +82,7 @@ rule beamline_acceptance_sim: rule beamline_acceptance_analysis: input: - warmup="warmup/epic_ip6_extended.edm4hep.root", + warmup="warmup.edm4hep.root", script=workflow.source_path("acceptanceAnalysis.C"), header=workflow.source_path("shared_functions.h"), data=SIMOUTDIR+"acceptanceTest{CAMPAIGN}.edm4hep.root", diff --git a/benchmarks/calo_pid/Snakefile b/benchmarks/calo_pid/Snakefile index c24e39ca..32bd1547 100644 --- a/benchmarks/calo_pid/Snakefile +++ b/benchmarks/calo_pid/Snakefile @@ -3,7 +3,7 @@ def format_energy_for_dd4hep(s): rule calo_pid_sim: input: - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: "sim_output/calo_pid/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY_MIN}to{ENERGY_MAX}/{THETA_MIN}to{THETA_MAX}deg/{PARTICLE}_{ENERGY}_{THETA_MIN}to{THETA_MAX}deg.{INDEX}.edm4hep.root", @@ -52,7 +52,7 @@ exec npsim \ rule calo_pid_recon: input: sim="sim_output/calo_pid/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: "sim_output/calo_pid/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.eicrecon.edm4eic.root", log: diff --git a/benchmarks/ecal_gaps/Snakefile b/benchmarks/ecal_gaps/Snakefile index ea6a96a1..9a80f396 100644 --- a/benchmarks/ecal_gaps/Snakefile +++ b/benchmarks/ecal_gaps/Snakefile @@ -4,7 +4,7 @@ import os rule ecal_gaps_sim: input: steering_file="EPIC/EVGEN/SINGLE/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.steer", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: "sim_output/ecal_gaps/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.edm4hep.root", @@ -42,7 +42,7 @@ exec npsim \ rule ecal_gaps_recon: input: sim="sim_output/ecal_gaps/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: "sim_output/ecal_gaps/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.eicrecon.edm4eic.root", log: diff --git a/benchmarks/far_forward_dvcs/Snakefile b/benchmarks/far_forward_dvcs/Snakefile index 78810eb5..a18644ae 100644 --- a/benchmarks/far_forward_dvcs/Snakefile +++ b/benchmarks/far_forward_dvcs/Snakefile @@ -5,7 +5,7 @@ rule far_forward_dvcs_compile: # Process the generated HepMC files through the simulation rule far_forward_dvcs_sim: input: - warmup="warmup/{DETECTOR_CONFIG}.edm4hep.root", + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: "sim_output/far_forward_dvcs/{DETECTOR_CONFIG}/DVCS.{INDEX}.ab.hiAcc.{EBEAM}x{PBEAM}.edm4hep.root", @@ -42,7 +42,7 @@ rule foo: rule far_forward_dvcs_reco: input: sim="sim_output/far_forward_dvcs/{DETECTOR_CONFIG}/DVCS.{INDEX}.ab.hiAcc.{EBEAM}x{PBEAM}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: "sim_output/far_forward_dvcs/{DETECTOR_CONFIG}/DVCS.{INDEX}.ab.hiAcc.{EBEAM}x{PBEAM}.eicrecon.edm4eic.root", params: diff --git a/benchmarks/femc_electron/Snakefile b/benchmarks/femc_electron/Snakefile index 4654f9c5..dff823ce 100644 --- a/benchmarks/femc_electron/Snakefile +++ b/benchmarks/femc_electron/Snakefile @@ -24,7 +24,7 @@ root -l -b -q '{input.script}({params.N_EVENTS},"{output.GEN_FILE}", "e-", {para rule femc_electron_simulate: input: GEN_FILE="sim_output/femc_electron/e-_{P}GeV.hepmc", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: SIM_FILE="sim_output/femc_electron/{DETECTOR_CONFIG}_sim_e-_{P}GeV.edm4hep.root", @@ -50,7 +50,7 @@ exec npsim \ rule femc_electron_recon: input: SIM_FILE="sim_output/femc_electron/{DETECTOR_CONFIG}_sim_e-_{P}GeV.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: REC_FILE="sim_output/femc_electron/{DETECTOR_CONFIG}_rec_e-_{P}GeV.edm4eic.root", params: diff --git a/benchmarks/femc_photon/Snakefile b/benchmarks/femc_photon/Snakefile index 1f2c6379..97335c28 100644 --- a/benchmarks/femc_photon/Snakefile +++ b/benchmarks/femc_photon/Snakefile @@ -24,7 +24,7 @@ root -l -b -q '{input.script}({params.N_EVENTS},"{output.GEN_FILE}", "gamma", {p rule femc_photon_simulate: input: GEN_FILE="sim_output/femc_photon/photon_{P}GeV.hepmc", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: SIM_FILE="sim_output/femc_photon/{DETECTOR_CONFIG}_sim_photon_{P}GeV.edm4hep.root", @@ -50,7 +50,7 @@ exec npsim \ rule femc_photon_recon: input: SIM_FILE="sim_output/femc_photon/{DETECTOR_CONFIG}_sim_photon_{P}GeV.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: REC_FILE="sim_output/femc_photon/{DETECTOR_CONFIG}_rec_photon_{P}GeV.edm4eic.root", params: diff --git a/benchmarks/femc_pi0/Snakefile b/benchmarks/femc_pi0/Snakefile index bd045d68..136abcba 100644 --- a/benchmarks/femc_pi0/Snakefile +++ b/benchmarks/femc_pi0/Snakefile @@ -24,7 +24,7 @@ root -l -b -q '{input.script}({params.N_EVENTS},"{output.GEN_FILE}", "pi0", {par rule femc_pi0_simulate: input: GEN_FILE="sim_output/femc_pi0/pi0_{P}GeV.hepmc", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), params: N_EVENTS=get_n_events, @@ -50,7 +50,7 @@ exec npsim \ rule femc_pi0_recon: input: SIM_FILE="sim_output/femc_pi0/{DETECTOR_CONFIG}_sim_pi0_{P}GeV.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: REC_FILE="sim_output/femc_pi0/{DETECTOR_CONFIG}_rec_pi0_{P}GeV.edm4eic.root", params: diff --git a/benchmarks/insert_muon/Snakefile b/benchmarks/insert_muon/Snakefile index 9e00dd7b..70fb0d77 100644 --- a/benchmarks/insert_muon/Snakefile +++ b/benchmarks/insert_muon/Snakefile @@ -16,7 +16,7 @@ root -l -b -q '{input.script}({params.NEVENTS_GEN},"{output.GEN_FILE}", "mu-", { rule insert_muon_simulate: input: GEN_FILE="sim_output/insert_muon/mu-_{P}GeV.hepmc", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: SIM_FILE="sim_output/insert_muon/{DETECTOR_CONFIG}_sim_mu-_{P}GeV_{INDEX}.edm4hep.root", @@ -45,7 +45,7 @@ exec npsim \ rule insert_muon_recon: input: SIM_FILE="sim_output/insert_muon/{DETECTOR_CONFIG}_sim_mu-_{P}GeV_{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: REC_FILE="sim_output/insert_muon/{DETECTOR_CONFIG}_rec_mu-_{P}GeV_{INDEX}.edm4hep.root", params: diff --git a/benchmarks/insert_neutron/Snakefile b/benchmarks/insert_neutron/Snakefile index fac95d23..2ef1d332 100644 --- a/benchmarks/insert_neutron/Snakefile +++ b/benchmarks/insert_neutron/Snakefile @@ -17,7 +17,7 @@ root -l -b -q '{input.script}({params.NEVENTS_GEN},"{output.GEN_FILE}", "neutron rule insert_neutron_simulate: input: GEN_FILE="sim_output/insert_neutron/neutron_{P}GeV.hepmc", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: SIM_FILE="sim_output/insert_neutron/{DETECTOR_CONFIG}_sim_neutron_{P}GeV_{INDEX}.edm4hep.root", @@ -46,7 +46,7 @@ exec npsim \ rule insert_neutron_recon: input: SIM_FILE="sim_output/insert_neutron/{DETECTOR_CONFIG}_sim_neutron_{P}GeV_{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: REC_FILE="sim_output/insert_neutron/{DETECTOR_CONFIG}_rec_neutron_{P}GeV_{INDEX}.edm4eic.root", params: diff --git a/benchmarks/insert_tau/Snakefile b/benchmarks/insert_tau/Snakefile index bf275c9c..28945bcc 100644 --- a/benchmarks/insert_tau/Snakefile +++ b/benchmarks/insert_tau/Snakefile @@ -22,7 +22,7 @@ root -l -b -q '{input.script}({params.N_EVENTS},"{output.GEN_FILE}", "tau-", {pa rule insert_tau_simulate: input: GEN_FILE="sim_output/insert_tau/tau-_{P}GeV.hepmc", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: SIM_FILE="sim_output/insert_tau/{DETECTOR_CONFIG}_sim_tau-_{P}GeV_{INDEX}.edm4hep.root", @@ -51,7 +51,7 @@ exec npsim \ rule insert_tau_recon: input: SIM_FILE="sim_output/insert_tau/{DETECTOR_CONFIG}_sim_tau-_{P}GeV_{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: REC_FILE="sim_output/insert_tau/{DETECTOR_CONFIG}_rec_tau-_{P}GeV_{INDEX}.edm4eic.root", params: diff --git a/benchmarks/lfhcal/Snakefile b/benchmarks/lfhcal/Snakefile index d65e03c2..2230287d 100644 --- a/benchmarks/lfhcal/Snakefile +++ b/benchmarks/lfhcal/Snakefile @@ -8,7 +8,7 @@ def get_n_events(wildcards): rule lfhcal_sim: input: steering_file="EPIC/EVGEN/SINGLE/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.steer", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: "sim_output/lfhcal/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.edm4hep.root", @@ -42,7 +42,7 @@ npsim \ rule lfhcal_recon: input: sim="sim_output/lfhcal/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: "sim_output/lfhcal/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.eicrecon.edm4eic.root", log: diff --git a/benchmarks/nhcal_acceptance/Snakefile b/benchmarks/nhcal_acceptance/Snakefile index 811d81da..a53a4d21 100644 --- a/benchmarks/nhcal_acceptance/Snakefile +++ b/benchmarks/nhcal_acceptance/Snakefile @@ -1,6 +1,6 @@ rule nhcal_acceptance_simulate: input: - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: "sim_output/nhcal_acceptance/E{ENERGY}GeV/sim_{DETECTOR_CONFIG}.{INDEX}.edm4hep.root", diff --git a/benchmarks/nhcal_basic_distribution/Snakefile b/benchmarks/nhcal_basic_distribution/Snakefile index c3e8a9d7..9e672a71 100644 --- a/benchmarks/nhcal_basic_distribution/Snakefile +++ b/benchmarks/nhcal_basic_distribution/Snakefile @@ -1,6 +1,6 @@ rule nhcal_basic_distribution_simulate: input: - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: "sim_output/nhcal_basic_distribution/E{ENERGY}GeV/sim_{DETECTOR_CONFIG}.{INDEX}.edm4hep.root", diff --git a/benchmarks/tracking_performances/Snakefile b/benchmarks/tracking_performances/Snakefile index 95d7efc7..a6d11d6d 100644 --- a/benchmarks/tracking_performances/Snakefile +++ b/benchmarks/tracking_performances/Snakefile @@ -1,7 +1,7 @@ rule tracking_performance_sim: input: steering_file="EPIC/EVGEN/SINGLE/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.steer", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: "sim_output/tracking_performance/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.edm4hep.root", @@ -43,7 +43,7 @@ exec npsim \ rule tracking_performance_recon: input: "sim_output/tracking_performance/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: "sim_output/tracking_performance/{DETECTOR_CONFIG}/{PARTICLE}/{ENERGY}/{PHASE_SPACE}/{PARTICLE}_{ENERGY}_{PHASE_SPACE}.{INDEX}.eicrecon.edm4eic.root", log: diff --git a/benchmarks/tracking_performances_dis/Snakefile b/benchmarks/tracking_performances_dis/Snakefile index 631911a9..b0d73d1c 100644 --- a/benchmarks/tracking_performances_dis/Snakefile +++ b/benchmarks/tracking_performances_dis/Snakefile @@ -10,7 +10,7 @@ rule trk_dis_compile: # Process the generated HepMC files through the simulation rule trk_dis_sim: input: - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: "sim_output/tracking_performances_dis/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_{INDEX}.edm4hep.root", @@ -44,7 +44,7 @@ npsim \ rule trk_dis_reco: input: sim="sim_output/tracking_performances_dis/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: "sim_output/tracking_performances_dis/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_{INDEX}.edm4eic.root", params: diff --git a/benchmarks/zdc_lambda/Snakefile b/benchmarks/zdc_lambda/Snakefile index 02c43422..b06b8865 100644 --- a/benchmarks/zdc_lambda/Snakefile +++ b/benchmarks/zdc_lambda/Snakefile @@ -14,7 +14,7 @@ root -l -b -q '{input.script}({params.N_EVENTS},0,"{output.GEN_FILE}",{params.P} rule zdc_lambda_simulate: input: GEN_FILE="sim_output/zdc_lambda/lambda_decay_{P}GeV.hepmc", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: SIM_FILE="sim_output/zdc_lambda/{DETECTOR_CONFIG}_sim_lambda_dec_{P}GeV_{INDEX}.edm4hep.root", @@ -43,7 +43,7 @@ exec npsim \ rule zdc_lambda_recon: input: SIM_FILE="sim_output/zdc_lambda/{DETECTOR_CONFIG}_sim_lambda_dec_{P}GeV_{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: REC_FILE="sim_output/zdc_lambda/{DETECTOR_CONFIG}_rec_lambda_dec_{P}GeV_{INDEX}.edm4eic.root", params: diff --git a/benchmarks/zdc_lyso/Snakefile b/benchmarks/zdc_lyso/Snakefile index fc4b7e56..eb9e4b8f 100644 --- a/benchmarks/zdc_lyso/Snakefile +++ b/benchmarks/zdc_lyso/Snakefile @@ -23,7 +23,7 @@ root -l -b -q '{input.script}({params.num_events}, "{output.hepmcfile}", "{param rule zdc_lyso_sim: input: hepmcfile="data/{PARTICLE}_{BEAM_ENERGY}GeV_theta_{THETA_MIN}deg_thru_{THETA_MAX}deg.hepmc", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: "sim_output/zdc_lyso/{DETECTOR_CONFIG}_{PARTICLE}_{BEAM_ENERGY}GeV_theta_{THETA_MIN}deg_thru_{THETA_MAX}deg.edm4hep.root", @@ -52,7 +52,7 @@ exec npsim \ rule zdc_lyso_reco: input: sim="sim_output/zdc_lyso/{DETECTOR_CONFIG}_{PARTICLE}_{BEAM_ENERGY}GeV_theta_{THETA_MIN}deg_thru_{THETA_MAX}deg.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: "sim_output/zdc_lyso/{DETECTOR_CONFIG}_{PARTICLE}_{BEAM_ENERGY}GeV_theta_{THETA_MIN}deg_thru_{THETA_MAX}deg.eicrecon.edm4eic.root", log: diff --git a/benchmarks/zdc_neutron/Snakefile b/benchmarks/zdc_neutron/Snakefile index ff56afca..689a4426 100644 --- a/benchmarks/zdc_neutron/Snakefile +++ b/benchmarks/zdc_neutron/Snakefile @@ -15,7 +15,7 @@ root -l -b -q '{input.script}({params.num_events}, 0, "{output.hepmcfile}")' rule zdc_neutron_sim: input: hepmcfile="sim_output/zdc_neutron/{DETECTOR_CONFIG}/fwd_neutrons.hepmc", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: "sim_output/zdc_neutron/{DETECTOR_CONFIG}/fwd_neutrons.edm4hep.root", @@ -41,7 +41,7 @@ exec npsim \ rule zdc_neutron_reco: input: sim="sim_output/zdc_neutron/{DETECTOR_CONFIG}/fwd_neutrons.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: "sim_output/zdc_neutron/{DETECTOR_CONFIG}/fwd_neutrons.edm4eic.root", params: diff --git a/benchmarks/zdc_photon/Snakefile b/benchmarks/zdc_photon/Snakefile index f46179cf..81437cd7 100644 --- a/benchmarks/zdc_photon/Snakefile +++ b/benchmarks/zdc_photon/Snakefile @@ -17,7 +17,7 @@ root -l -b -q '{input.script}('{params.N_EVENTS}',"{output.GEN_FILE}", "gamma", rule zdc_photon_simulate: input: GEN_FILE="sim_output/zdc_photon/zdc_photon_{P}GeV.hepmc", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: SIM_FILE="sim_output/zdc_photon/{DETECTOR_CONFIG}_sim_zdc_photon_{P}GeV_{INDEX}.edm4hep.root", @@ -46,7 +46,7 @@ exec npsim \ rule zdc_photon_recon: input: SIM_FILE="sim_output/zdc_photon/{DETECTOR_CONFIG}_sim_zdc_photon_{P}GeV_{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: REC_FILE="sim_output/zdc_photon/{DETECTOR_CONFIG}_rec_zdc_photon_{P}GeV_{INDEX}.edm4eic.root", params: diff --git a/benchmarks/zdc_pi0/Snakefile b/benchmarks/zdc_pi0/Snakefile index 2e6934bc..27b84238 100644 --- a/benchmarks/zdc_pi0/Snakefile +++ b/benchmarks/zdc_pi0/Snakefile @@ -15,7 +15,7 @@ root -l -b -q '{input.script}({params.N_EVENTS},0,"{output.GEN_FILE}",{params.P} rule zdc_pi0_simulate: input: GEN_FILE="sim_output/zdc_pi0/zdc_pi0_{P}GeV.hepmc", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: SIM_FILE="sim_output/zdc_pi0/{DETECTOR_CONFIG}_sim_zdc_pi0_{P}GeV_{INDEX}.edm4hep.root", @@ -44,7 +44,7 @@ exec npsim \ rule zdc_pi0_recon: input: SIM_FILE="sim_output/zdc_pi0/{DETECTOR_CONFIG}_sim_zdc_pi0_{P}GeV_{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: REC_FILE="sim_output/zdc_pi0/{DETECTOR_CONFIG}_rec_zdc_pi0_{P}GeV_{INDEX}.edm4eic.root", params: diff --git a/benchmarks/zdc_sigma/Snakefile b/benchmarks/zdc_sigma/Snakefile index 94158c44..1a752752 100644 --- a/benchmarks/zdc_sigma/Snakefile +++ b/benchmarks/zdc_sigma/Snakefile @@ -14,7 +14,7 @@ root -l -b -q '{input.script}({params.N_EVENTS},0,"{output.GEN_FILE}",{params.P} rule zdc_sigma_simulate: input: GEN_FILE="sim_output/zdc_sigma/sigma_decay_{P}GeV.hepmc", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", geometry_lib=find_epic_libraries(), output: SIM_FILE="sim_output/zdc_sigma/{DETECTOR_CONFIG}_sim_sigma_dec_{P}GeV_{INDEX}.edm4hep.root", @@ -43,7 +43,7 @@ exec npsim \ rule zdc_sigma_recon: input: SIM_FILE="sim_output/zdc_sigma/{DETECTOR_CONFIG}_sim_sigma_dec_{P}GeV_{INDEX}.edm4hep.root", - warmup=ancient("warmup/{DETECTOR_CONFIG}.edm4hep.root"), + warmup="warmup.edm4hep.root", output: REC_FILE="sim_output/zdc_sigma/{DETECTOR_CONFIG}_rec_sigma_dec_{P}GeV_{INDEX}.edm4eic.root", params: