diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dbabe60f64e6f6399e5695188d90a522d5f6dd67..f030bd8bb7ac7d20fba7e13fd5572069b6645430 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,7 +152,8 @@ include: # - local: 'benchmarks/femc_electron/config.yml' # - local: 'benchmarks/femc_photon/config.yml' # - local: 'benchmarks/femc_pi0/config.yml' - - local: 'benchmarks/nhcal_acceptance/config.yml' + - local: 'benchmarks/nHcal/nhcal_acceptance/config.yml' + deploy_results: allow_failure: true stage: deploy diff --git a/Snakefile b/Snakefile index e3cbc9a8705349738a6bdbdabe43aed82c86943c..fe5f7121c5d2eea1161f406316466d0e1336c557 100644 --- a/Snakefile +++ b/Snakefile @@ -51,7 +51,7 @@ include: "benchmarks/insert_tau/Snakefile" include: "benchmarks/femc_electron/Snakefile" include: "benchmarks/femc_photon/Snakefile" include: "benchmarks/femc_pi0/Snakefile" -include: "benchmarks/nhcal_acceptance/Snakefile" +include: "benchmarks/nHcal/nhcal_acceptance/Snakefile" use_s3 = config["remote_provider"].lower() == "s3" use_xrootd = config["remote_provider"].lower() == "xrootd" diff --git a/benchmarks/nhcal_acceptance/Snakefile b/benchmarks/nHcal/nhcal_acceptance/Snakefile similarity index 94% rename from benchmarks/nhcal_acceptance/Snakefile rename to benchmarks/nHcal/nhcal_acceptance/Snakefile index 437462f81c4c8af69ff26f6f9c89ea5b37c6f3ad..4c25ddeca7430b8d2fafe63194304f90bced1985 100644 --- a/benchmarks/nhcal_acceptance/Snakefile +++ b/benchmarks/nHcal/nhcal_acceptance/Snakefile @@ -46,7 +46,7 @@ hadd {output} {input} rule nhcal_acceptance_analysis: input: combined="sim_output/nhcal_acceptance/sim_{DETECTOR_CONFIG}_E{ENERGY}GeV_combined_{N}files.edm4hep.root", - script="benchmarks/nhcal_acceptance/scripts/nhcal_acceptance_analysis.cxx", + script="benchmarks/nHcal/nhcal_acceptance/scripts/nhcal_acceptance_analysis.cxx", output: f"results/nhcal_acceptance_analysis_{{DETECTOR_CONFIG}}_E{{ENERGY}}GeV_combined_{{N}}files.pdf", shell: diff --git a/benchmarks/nhcal_acceptance/config.yml b/benchmarks/nHcal/nhcal_acceptance/config.yml similarity index 100% rename from benchmarks/nhcal_acceptance/config.yml rename to benchmarks/nHcal/nhcal_acceptance/config.yml diff --git a/benchmarks/nhcal_acceptance/scripts/nhcal_acceptance_analysis.cxx b/benchmarks/nHcal/nhcal_acceptance/scripts/nhcal_acceptance_analysis.cxx similarity index 98% rename from benchmarks/nhcal_acceptance/scripts/nhcal_acceptance_analysis.cxx rename to benchmarks/nHcal/nhcal_acceptance/scripts/nhcal_acceptance_analysis.cxx index d62afe966cb158be96be3bd00063e468671668de..bf28937f387b9fb0f1682b68e855f62fe0ea089d 100644 --- a/benchmarks/nhcal_acceptance/scripts/nhcal_acceptance_analysis.cxx +++ b/benchmarks/nHcal/nhcal_acceptance/scripts/nhcal_acceptance_analysis.cxx @@ -67,7 +67,7 @@ int nhcal_acceptance_analysis(TString filename, TString outname) } // Check, if pi- have contributions nHCal - for (size_t i = 0; i < contrib_particle_idx.GetSize(); ++i) { + for (size_t i = 0; i < contrib_particle_idx.GetSize(); i++) { int idx = contrib_particle_idx[i]; if (pi_minus_eta_phi.count(idx)) { detected.insert(idx);