From 86e90f541bdf46423a6e99ab2e2c5cc933caa33c Mon Sep 17 00:00:00 2001
From: Maria <zurek@anl.gov>
Date: Thu, 16 Sep 2021 11:31:55 -0500
Subject: [PATCH] Adjust histograms

---
 .../emcal_barrel_energy_scan_analysis.cxx     | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

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 dfb0bd82..38463b15 100644
--- a/benchmarks/imaging_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
+++ b/benchmarks/imaging_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
@@ -121,20 +121,20 @@ std::tuple <double, double, double, double, double, double, double, double> extr
                 .Define("fsamClusterScFi", fsam, {"EClusterScFi", "Ethr"});
 
   // Define Histograms
-  auto hEthr = d1.Histo1D({"hEthr", "Thrown Energy; Thrown Energy [GeV]; Events", 100, 0.0, 25.0},"Ethr").GetPtr();
-  auto hEdigiImg = d1.Histo1D({"hEdigiImg", "Digi energy deposit; Amplitude [QCD]; Events", 1000, 0, 200000},"EdigiImg").GetPtr();
-  auto hErecImg = d1.Histo1D({"hErecImg", "Reconstructed energy deposit; Energy Deposit [GeV]; Events", 500, 0.0, 0.5},"ErecImg").GetPtr();
-  auto hEClusterImg = d1.Histo1D({"hEClusterImg", "Cluster Energy; Cluster Energy [GeV]; Events", 200, 0.0, 25.0},"EClusterImg").GetPtr();
-  auto hNClusterImg = d1.Histo1D({"hNClusterImg", "Number of Clusters; # of Clusters; Events", 100, 0.0, 100.0}, "NClusterImg").GetPtr();
-  auto hfsamImg = d1.Histo1D({"hfsamImg", "Cluster Energy/E true; Cluster Energy/E true; Events", 100, 0.0, 1.5},"fsamClusterImg").GetPtr();
-  auto hfsamRecImg = d1.Histo1D({"hfsamRecImg", "Reco Hits Energy/E true; Reco Hits Energy/E true; Events", 50, 0.0, 0.1},"fsamRecImg").GetPtr();
-
-  auto hErecScFi = d1.Histo1D({"hErecScFi", "Reconstructed energy deposit; Energy Deposit [GeV]; Events", 500, 0.0, 15.0},"ErecScFi").GetPtr();
-  auto hEdigiScFi = d1.Histo1D({"hEdigiScFi", "Digi energy deposit; Amplitude [QCD]; Events", 1000, 0, 200000},"EdigiScFi").GetPtr();
-  auto hEClusterScFi = d1.Histo1D({"hEClusterScFi", "Cluster Energy; Cluster Energy [GeV]; Events", 500, 0.0, 25.0},"EClusterScFi").GetPtr();
-  auto hNClusterScFi = d1.Histo1D({"hNClusterScFi", "Number of Clusters; # of Clusters; Events", 100, 0.0, 100.0}, "NClusterScFi").GetPtr();
-  auto hfsamScFi = d1.Histo1D({"hfsamScFi", "Cluster Energy/E true; Cluster Energy/E true; Events", 100, 0.8, 1.2},"fsamClusterScFi").GetPtr();
-  auto hfsamRecScFi = d1.Histo1D({"hfsamRecScFi", "Reco Hits Energy/E true; Reco Hits Energy/E true; Events", 50, 0.0, 0.25},"fsamRecScFi").GetPtr();
+  auto hEthr = d1.Histo1D({"hEthr", "Thrown Energy; Thrown Energy [GeV]; Events", 100, 0.0, 25.0},"Ethr");
+  auto hEdigiImg = d1.Histo1D({"hEdigiImg", "Digi energy deposit; Amplitude [QCD]; Events", 1000, 0, 200000},"EdigiImg");
+  auto hErecImg = d1.Histo1D({"hErecImg", "Reconstructed energy deposit; Energy Deposit [GeV]; Events", 500, 0.0, 0.5},"ErecImg");
+  auto hEClusterImg = d1.Histo1D({"hEClusterImg", "Cluster Energy; Cluster Energy [GeV]; Events", 200, 0.0, 25.0},"EClusterImg");
+  auto hNClusterImg = d1.Histo1D({"hNClusterImg", "Number of Clusters; # of Clusters; Events", 100, 0.0, 100.0}, "NClusterImg");
+  auto hfsamImg = d1.Histo1D({"hfsamImg", "Cluster Energy/E true; Cluster Energy/E true; Events", 100, 0.0, 1.5},"fsamClusterImg");
+  auto hfsamRecImg = d1.Histo1D({"hfsamRecImg", "Reco Hits Energy/E true; Reco Hits Energy/E true; Events", 50, 0.0, 0.1},"fsamRecImg");
+
+  auto hErecScFi = d1.Histo1D({"hErecScFi", "Reconstructed energy deposit; Energy Deposit [GeV]; Events", 500, 0.0, 15.0},"ErecScFi");
+  auto hEdigiScFi = d1.Histo1D({"hEdigiScFi", "Digi energy deposit; Amplitude [QCD]; Events", 1000, 0, 200000},"EdigiScFi");
+  auto hEClusterScFi = d1.Histo1D({"hEClusterScFi", "Cluster Energy; Cluster Energy [GeV]; Events", 500, 0.0, 25.0},"EClusterScFi");
+  auto hNClusterScFi = d1.Histo1D({"hNClusterScFi", "Number of Clusters; # of Clusters; Events", 100, 0.0, 100.0}, "NClusterScFi");
+  auto hfsamScFi = d1.Histo1D({"hfsamScFi", "Cluster Energy/E true; Cluster Energy/E true; Events", 100, 0.8, 1.2},"fsamClusterScFi");
+  auto hfsamRecScFi = d1.Histo1D({"hfsamRecScFi", "Reco Hits Energy/E true; Reco Hits Energy/E true; Events", 50, 0.0, 0.25},"fsamRecScFi");
 
   // Event Counts
   auto nevents_thrown = d1.Count();
@@ -156,25 +156,25 @@ std::tuple <double, double, double, double, double, double, double, double> extr
   hEdigiImg->SetLineWidth(2);
   hEdigiImg->SetLineColor(kBlue);
   hEdigiImg->DrawClone();
-  set_histo_range(hEdigiImg.GetPtr());
+  set_histo_range(hEdigiImg->GetPtr());
   c2->cd(2);
   hEdigiScFi->GetYaxis()->SetTitleOffset(1.4);
   hEdigiScFi->SetLineWidth(2);
   hEdigiScFi->SetLineColor(kBlue);
   hEdigiScFi->DrawClone();
-  set_histo_range(hEdigiScFi.GetPtr());
+  set_histo_range(hEdigiScFi->GetPtr());
   c2->cd(3);
   hErecImg->GetYaxis()->SetTitleOffset(1.4);
   hErecImg->SetLineWidth(2);
   hErecImg->SetLineColor(kBlue);
   hErecImg->DrawClone();
-  set_histo_range(hErecImg.GetPtr());
+  set_histo_range(hErecImg->GetPtr());
   c2->cd(4);
   hErecScFi->GetYaxis()->SetTitleOffset(1.4);
   hErecScFi->SetLineWidth(2);
   hErecScFi->SetLineColor(kBlue);
   hErecScFi->DrawClone();
-  set_histo_range(hErecScFi.GetPtr());
+  set_histo_range(hErecScFi->GetPtr());
   save_canvas(c2, "E_digi_rec", E_label, particle_label);
 {
   TCanvas* c3 = new TCanvas("c3", "c3", 1400, 500);
@@ -184,13 +184,13 @@ std::tuple <double, double, double, double, double, double, double, double> extr
   hfsamRecImg->SetLineWidth(2);
   hfsamRecImg->SetLineColor(kBlue);
   hfsamRecImg->DrawClone();
-  set_histo_range(hfsamRecImg.GetPtr());
+  set_histo_range(hfsamRecImg->GetPtr());
   c3->cd(2);
   hfsamRecScFi->GetYaxis()->SetTitleOffset(1.4);
   hfsamRecScFi->SetLineWidth(2);
   hfsamRecScFi->SetLineColor(kBlue);
   hfsamRecScFi->DrawClone();
-  set_histo_range(hfsamRecScFi.GetPtr());
+  set_histo_range(hfsamRecScFi->GetPtr());
   save_canvas(c3, "fsam_digi_rec", E_label, particle_label);
 }  
 {
@@ -199,7 +199,7 @@ std::tuple <double, double, double, double, double, double, double, double> extr
   hEClusterScFi->SetLineWidth(2);
   hEClusterScFi->SetLineColor(kBlue);
   hEClusterScFi->DrawClone();
-  set_histo_range(hEClusterScFi.GetPtr());
+  set_histo_range(hEClusterScFi->GetPtr());
   save_canvas(c5, "EClusterSCFi", E_label, particle_label);
 }
 {
@@ -209,7 +209,7 @@ std::tuple <double, double, double, double, double, double, double, double> extr
   hEClusterImg->SetLineWidth(2);
   hEClusterImg->SetLineColor(kBlue);
   hEClusterImg->DrawClone();
-  set_histo_range(hEClusterImg.GetPtr()); 
+  set_histo_range(hEClusterImg->GetPtr()); 
   save_canvas(c6, "EClusterImg", E_label, particle_label);
 }
 
@@ -222,7 +222,7 @@ std::tuple <double, double, double, double, double, double, double, double> extr
   double down_fit = hfsamImg->GetMean() - 5*hfsamImg->GetStdDev();
   if(down_fit <=0 ) down_fit = hfsamImg->GetXaxis()->GetBinUpEdge(1);
   hfsamImg->Fit("gaus", "", "", down_fit, up_fit);
-  set_histo_range(hfsamImg.GetPtr());
+  set_histo_range(hfsamImg->GetPtr());
   TF1 *gausImg = hfsamImg->GetFunction("gaus");
   gausImg->SetLineWidth(2);
   gausImg->SetLineColor(kRed);    
@@ -242,7 +242,7 @@ std::tuple <double, double, double, double, double, double, double, double> extr
   down_fit = hfsamScFi->GetMean() - 5*hfsamScFi->GetStdDev();
   if(down_fit <=0 ) down_fit = hfsamScFi->GetXaxis()->GetBinUpEdge(1);
   hfsamScFi->Fit("gaus", "", "", down_fit, up_fit);
-  set_histo_range(hfsamScFi.GetPtr());
+  set_histo_range(hfsamScFi->GetPtr());
   TF1 *gaus = hfsamScFi->GetFunction("gaus");
   gaus->SetLineWidth(2);
   gaus->SetLineColor(kRed);    
-- 
GitLab