From 7d6e8321602b2f1474e519c194394d2d17dc8a60 Mon Sep 17 00:00:00 2001
From: Maria <zurek@anl.gov>
Date: Mon, 16 Aug 2021 20:31:56 -0500
Subject: [PATCH] Adjust all histogram ranges
---
benchmarks/imaging_ecal/config.yml | 8 ++++----
.../scripts/emcal_barrel_energy_scan_analysis.cxx | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/benchmarks/imaging_ecal/config.yml b/benchmarks/imaging_ecal/config.yml
index 796bf206..992b377d 100644
--- a/benchmarks/imaging_ecal/config.yml
+++ b/benchmarks/imaging_ecal/config.yml
@@ -3,14 +3,14 @@ imaging_ecal_electrons:
timeout: 48 hours
stage: run
script:
- - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_electron -p "electron" -n 500
+ - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_electron -p "electron" -n 100
imaging_ecal_photons:
extends: .rec_benchmark
timeout: 48 hours
stage: run
script:
- - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_photon -p "photon" -n 500
+ - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_photon -p "photon" -n 100
imaging_ecal_pions:
extends: .rec_benchmark
@@ -34,7 +34,7 @@ imaging_ecal_energy_scan_e:
# - if: '$RUN_EXTENDED_RECO_BENCHMARK == "true"'
script:
- export E_file="sim_output/emcal_barrel_energy_scan_points_${PARTICLE}.txt"
- - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_${PARTICLE}_${ENERGY} -n 750 -p "${PARTICLE}" -e "${ENERGY}" && echo "${ENERGY}" >> "$E_file"
+ - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_${PARTICLE}_${ENERGY} -n 1000 -p "${PARTICLE}" -e "${ENERGY}" && echo "${ENERGY}" >> "$E_file"
parallel:
matrix:
- ENERGY: ["0.8", "1", "2", "5", "10"]
@@ -48,7 +48,7 @@ imaging_ecal_energy_scan_ph:
# - if: '$RUN_EXTENDED_RECO_BENCHMARK == "true"'
script:
- export E_file="sim_output/emcal_barrel_energy_scan_points_${PARTICLE}.txt"
- - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_${PARTICLE}_${ENERGY} -n 750 -p "${PARTICLE}" -e "${ENERGY}" && echo "${ENERGY}" >> "$E_file"
+ - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_${PARTICLE}_${ENERGY} -n 1000 -p "${PARTICLE}" -e "${ENERGY}" && echo "${ENERGY}" >> "$E_file"
parallel:
matrix:
- ENERGY: ["0.5", "1", "2", "5", "10"]
diff --git a/benchmarks/imaging_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx b/benchmarks/imaging_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
index 32546bc5..879a9f59 100644
--- a/benchmarks/imaging_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
+++ b/benchmarks/imaging_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
@@ -222,7 +222,6 @@ std::tuple <double, double, double, double> extract_sampling_fraction_parameters
double mean_err = gaus->GetParError(1);
double sigma_err = gaus->GetParError(2);
save_canvas(c8, "fsamClusterImg", E_label, particle_label);
- return std::make_tuple(mean, sigma, mean_err, sigma_err);
}
{
@@ -245,6 +244,7 @@ std::tuple <double, double, double, double> extract_sampling_fraction_parameters
double mean_err = gaus->GetParError(1);
double sigma_err = gaus->GetParError(2);
save_canvas(c7, "fsamClusterScFi", E_label, particle_label);
+ return std::make_tuple(mean, sigma, mean_err, sigma_err);
}
}
--
GitLab