Resolve "pi0 resolution for ECal barrel"

Closes #19 (closed)

benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx

@@ -9,9 +9,9 @@
 #include "dd4pod/Geant4ParticleCollection.h"
 #include "dd4pod/CalorimeterHitCollection.h"
 
-//#include <detector_benchmarks/include/benchmark.h>
-//#include "mt.h"
-//#include "util.h"
+#include "benchmark.h"
+#include "mt.h"
+#include "util.h"
 
 #include "TCanvas.h"
 #include "TStyle.h"
@@ -19,9 +19,7 @@
 #include "TH1.h"
 #include "TF1.h"
 #include "TH1D.h"
-#include <TFitResult.h>
-#include "TSystem.h"
-#include <fstream>
+#include "TFitResult.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
@@ -44,15 +42,15 @@ void emcal_barrel_pions_analysis(const char* input_fname = "sim_output/sim_emcal
   //TODO: Change test_tag to something else
   std:string detector = "Barrel_emcal";
   double resolutionTarget = 0.1;
-  /*
-  eic::util::Test pion0_Energy_resolution{
+
+  eic::util::Test pi0_energy_resolution{
       {{"name", fmt::format("{}_energy_resolution", test_tag)},
        {"title", "Pion0 Energy resolution"},
        {"description",
         fmt::format("Pion0 energy resolution with {}, estimated using a Gaussian fit.", detector)},
        {"quantity", "resolution (in %)"},
        {"target", std::to_string(resolutionTarget)}}};
-*/
+
 
   ROOT::EnableImplicitMT();
   ROOT::RDataFrame d0("events", input_fname);
@@ -85,18 +83,8 @@ void emcal_barrel_pions_analysis(const char* input_fname = "sim_output/sim_emcal
   return result;
   };
 
-  // Sampling fraction = Esampling / Ethrown
+  // Layer Sampling fraction = Esampling / Ethrown
   auto fsam = [](const std::vector<double>& sampled, const std::vector<double>& thrown) {
-    std::vector<double> result;
-    for (const auto& E1 : thrown) {
-      for (const auto& E2 : sampled)
-        result.push_back(E2/E1);
-    }
-    return result;
-  };
-
-  // Sampling fraction = Esampling / Ethrown, revised
-  auto fsam2 = [](const std::vector<double>& sampled, const std::vector<double>& thrown) {
     std::vector<double> result;
     auto it_sam = sampled.cbegin();
     auto it_thr = thrown.cbegin();
@@ -117,7 +105,7 @@ void emcal_barrel_pions_analysis(const char* input_fname = "sim_output/sim_emcal
     return result;
   };
 
-  // Relative Energy Resolution = (Esampling - Ethrown)/Ethrownnnn
+  // Relative Energy Resolution = (Esampling - Ethrown)/Ethrown
   auto eResol_rel = [](const std::vector<double>& sampled, const std::vector<double>& thrown) {
     std::vector<double> result;
     auto it_sam = sampled.cbegin();
@@ -132,17 +120,16 @@ void emcal_barrel_pions_analysis(const char* input_fname = "sim_output/sim_emcal
   auto d1 = d0.Define("Ethr",  Ethr,  {"mcparticles"})
 	      .Define("nhits",  nhits,      {"EcalBarrelHits"})
 	      .Define("Esim",   Esim,       {"EcalBarrelHits"})
-	      //.Define("fsam",  fsam,  {"Esim","Ethr"})
-        .Define("fsam",   fsam2,      {"Esim","Ethr"})
-        .Define("dE",     eResol,     {"Esim", "Ethr"})
-        .Define("dE_rel", eResol_rel, {"Esim", "Ethr"})
+        .Define("fsam",   fsam,       {"Esim","Ethr"})
+        .Define("dE",     eResol,     {"Esim","Ethr"})
+        .Define("dE_rel", eResol_rel, {"Esim","Ethr"})
 	      ;
 
   // Define Histograms
   auto hEthr  = d1.Histo1D({"hEthr",  "Thrown Energy; Thrown Energy [GeV]; Events",        100,  0.0,    7.5}, "Ethr");
   auto hNhits = d1.Histo1D({"hNhits", "Number of hits per events; Number of hits; Events", 100,  0.0, 2000.0}, "nhits");
   auto hEsim  = d1.Histo1D({"hEsim",  "Energy Deposit; Energy Deposit [GeV]; Events",      100,  0.0,    1.0}, "Esim");
-  auto hfsam  = d1.Histo1D({"hfsam",  "Sampling Fraction; Sampling Fraction; Events",      100,  0.0,    0.1}, "fsam");
+  auto hfsam  = d1.Histo1D({"hfsam",  "Layer Sampling Fraction; Layer Sampling Fraction; Events",      100,  0.0,    0.1}, "fsam");
 
   // Event Counts
   auto nevents_thrown      = d1.Count();
@@ -190,19 +177,18 @@ void emcal_barrel_pions_analysis(const char* input_fname = "sim_output/sim_emcal
 
   //Energy Resolution Work
   auto hdE          = d1.Histo1D({"hdE",      "dE; dE[GeV]; Events",              20, -7.5, 7.5}, "dE");//changed from 100
-  auto hdE_rel      = d1.Histo1D({"hdE_rel",  "dE Relative; dE Relative; Events", 20, -7.5, 7.5}, "dE_rel");//changed from 100
-  hdE_rel->Fit("gaus", "", "", -7.5,  7.5);
+  auto hdE_rel      = d1.Histo1D({"hdE_rel",  "dE Relative; dE Relative; Events", 20, -2, 2}, "dE_rel");//changed from 100
+  hdE_rel->Fit("gaus", "", "", -2,  2);
   double* res       = hdE_rel->GetFunction("gaus")->GetParameters();
 
   //Pass/Fail
-  /*
+  
   if (res[2] <= resolutionTarget) {
-    pion0_energy_resolution.pass(res[2]);
+    pi0_energy_resolution.pass(res[2]);
   } else {
-    pion0_energy_resolution.fail(res[2]);
+    pi0_energy_resolution.fail(res[2]);
   }
-  */
-  std::printf("Energy Resolution is %f\n", res[2]);
+  //std::printf("Energy Resolution is %f\n", res[2]);
 
   //Energy Resolution Histogram Plotting
   auto *cdE = new TCanvas("cdE", "cdE", 700, 500);
@@ -224,7 +210,7 @@ void emcal_barrel_pions_analysis(const char* input_fname = "sim_output/sim_emcal
   cdE_rel->SaveAs("results/emcal_barrel_pi0_dE_rel.png");
   cdE_rel->SaveAs("results/emcal_barrel_pi0_dE_rel.pdf");
 
-  //eic::util::write_test({pion0_energy_resolution}, fmt::format("{}_pions.json", detector));
+  eic::util::write_test({pi0_energy_resolution}, fmt::format("{}_pions.json", detector));
 
 
 }