From e4ff1c87ed1f70be47ed5eee2b1cc186b52bae31 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wouter.deconinck@umanitoba.ca>
Date: Wed, 27 Oct 2021 20:06:06 +0000
Subject: [PATCH] Add ebeam and pbeam parsing and add to plot

---
 benchmarks/dis/analysis/dis_electrons.cxx     | 12 ++++++++----
 benchmarks/dis/analysis/rec_analysis_ecal.cxx |  4 ++++
 benchmarks/dis/analysis/rec_analysis_hcal.cxx |  4 ++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/benchmarks/dis/analysis/dis_electrons.cxx b/benchmarks/dis/analysis/dis_electrons.cxx
index e59c69a5..91679ff1 100644
--- a/benchmarks/dis/analysis/dis_electrons.cxx
+++ b/benchmarks/dis/analysis/dis_electrons.cxx
@@ -35,6 +35,8 @@ int dis_electrons(const std::string& config_name)
   const std::string detector      = config["detector"];
   const std::string output_prefix = config["output_prefix"];
   const std::string test_tag      = config["test_tag"];
+  const int ebeam                 = config["ebeam"];
+  const int pbeam                 = config["pbeam"];
 
   fmt::print(fmt::emphasis::bold | fg(fmt::color::forest_green),
              "Running DIS electron analysis...\n");
@@ -42,6 +44,8 @@ int dis_electrons(const std::string& config_name)
   fmt::print(" - input file: {}\n", rec_file);
   fmt::print(" - output prefix: {}\n", output_prefix);
   fmt::print(" - test tag: {}\n", test_tag);
+  fmt::print(" - ebeam: {}\n", ebeam);
+  fmt::print(" - pbeam: {}\n", pbeam);
 
   // create our test definition
   // test_tag
@@ -142,7 +146,7 @@ int dis_electrons(const std::string& config_name)
     h3.DrawClone("hist same");
     h4.DrawClone("hist same");
     // FIXME hardcoded beam configuration
-    common_bench::plot::draw_label(18, 275, detector);
+    common_bench::plot::draw_label(ebeam, pbeam, detector);
     TText* tptr1;
     TPaveText t1(.6, .8417, .9, .925, "NB NDC");
     t1.SetFillColorAlpha(kWhite, 0);
@@ -184,7 +188,7 @@ int dis_electrons(const std::string& config_name)
     h2.DrawClone("hist same");
     h3.DrawClone("hist same");
     // FIXME hardcoded beam configuration
-    common_bench::plot::draw_label(18, 275, detector);
+    common_bench::plot::draw_label(ebeam, pbeam, detector);
     c.Print(fmt::format("{}Q2resolution.png", output_prefix).c_str());
   }
 
@@ -216,7 +220,7 @@ int dis_electrons(const std::string& config_name)
     h3.DrawClone("hist same");
     h4.DrawClone("hist same");
     // FIXME hardcoded beam configuration
-    common_bench::plot::draw_label(18, 275, detector);
+    common_bench::plot::draw_label(ebeam, pbeam, detector);
     TText* tptr1;
     TPaveText t1(.6, .8417, .9, .925, "NB NDC");
     t1.SetFillColorAlpha(kWhite, 0);
@@ -254,7 +258,7 @@ int dis_electrons(const std::string& config_name)
     h2.DrawClone("hist same");
     h3.DrawClone("hist same");
     // FIXME hardcoded beam configuration
-    common_bench::plot::draw_label(18, 275, detector);
+    common_bench::plot::draw_label(ebeam, pbeam, detector);
     c.Print(fmt::format("{}xresolution.png", output_prefix).c_str());
   }
 
diff --git a/benchmarks/dis/analysis/rec_analysis_ecal.cxx b/benchmarks/dis/analysis/rec_analysis_ecal.cxx
index 4aba2ca5..3d0af430 100644
--- a/benchmarks/dis/analysis/rec_analysis_ecal.cxx
+++ b/benchmarks/dis/analysis/rec_analysis_ecal.cxx
@@ -35,6 +35,8 @@ int rec_analysis_ecal(const std::string& config_name)
   const std::string detector      = config["detector"];
   const std::string output_prefix = config["output_prefix"];
   const std::string test_tag      = config["test_tag"];
+  const int ebeam                 = config["ebeam"];
+  const int pbeam                 = config["pbeam"];
 
   fmt::print(fmt::emphasis::bold | fg(fmt::color::forest_green),
              "Running DIS electron analysis...\n");
@@ -42,6 +44,8 @@ int rec_analysis_ecal(const std::string& config_name)
   fmt::print(" - input file: {}\n", rec_file);
   fmt::print(" - output prefix: {}\n", output_prefix);
   fmt::print(" - test tag: {}\n", test_tag);
+  fmt::print(" - ebeam: {}\n", ebeam);
+  fmt::print(" - pbeam: {}\n", pbeam);
 
   // create our test definition
   // test_tag
diff --git a/benchmarks/dis/analysis/rec_analysis_hcal.cxx b/benchmarks/dis/analysis/rec_analysis_hcal.cxx
index df018547..06641d34 100644
--- a/benchmarks/dis/analysis/rec_analysis_hcal.cxx
+++ b/benchmarks/dis/analysis/rec_analysis_hcal.cxx
@@ -35,6 +35,8 @@ int rec_analysis_hcal(const std::string& config_name)
   const std::string detector      = config["detector"];
   const std::string output_prefix = config["output_prefix"];
   const std::string test_tag      = config["test_tag"];
+  const int ebeam                 = config["ebeam"];
+  const int pbeam                 = config["pbeam"];
 
   fmt::print(fmt::emphasis::bold | fg(fmt::color::forest_green),
              "Running DIS electron analysis...\n");
@@ -42,6 +44,8 @@ int rec_analysis_hcal(const std::string& config_name)
   fmt::print(" - input file: {}\n", rec_file);
   fmt::print(" - output prefix: {}\n", output_prefix);
   fmt::print(" - test tag: {}\n", test_tag);
+  fmt::print(" - ebeam: {}\n", ebeam);
+  fmt::print(" - pbeam: {}\n", pbeam);
 
   // create our test definition
   // test_tag
-- 
GitLab