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,7 +19,7 @@
 #include "TH1.h"
 #include "TF1.h"
 #include "TH1D.h"
-#include <TFitResult.h>
+#include "TFitResult.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
@@ -42,7 +42,7 @@ 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{
       {{"name", fmt::format("{}_energy_resolution", test_tag)},
        {"title", "Pion0 Energy resolution"},
@@ -50,9 +50,18 @@ void emcal_barrel_pions_analysis(const char* input_fname = "sim_output/sim_emcal
         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);
+/*
+  auto colNames = d0.GetColumnNames();
+
+  ofstream out;
+  out.open("results/column_list.txt");
+  for (auto &&col : colNames){out << col << endl; cout << col << endl;}
+  out.close();
+  */
 
   // Thrown Energy [GeV]
   auto Ethr = [](std::vector<dd4pod::Geant4ParticleData> const& input) {
@@ -74,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();
@@ -112,7 +111,7 @@ void emcal_barrel_pions_analysis(const char* input_fname = "sim_output/sim_emcal
     auto it_sam = sampled.cbegin();
     auto it_thr = thrown.cbegin();
     for (; it_sam != sampled.end() && it_thr != thrown.end(); ++it_sam, ++it_thr) {
-        result.push_back((*it_sam - *it_thr) / *it_sam);
+        result.push_back((*it_sam - *it_thr) / *it_thr);
     }
     return result;
   };
@@ -121,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();
@@ -179,9 +177,9 @@ 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);
-  double* res       = hdE_rel->GetParameters();
+  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
   /*
@@ -191,7 +189,7 @@ void emcal_barrel_pions_analysis(const char* input_fname = "sim_output/sim_emcal
     pion0_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);