From 6815d3d2e7cb2481eebf3963a37362bf22658508 Mon Sep 17 00:00:00 2001
From: gwm17 <gmccann@fsu.edu>
Date: Mon, 1 May 2023 09:26:46 -0400
Subject: [PATCH] Bugfixes for ThreeStepSystem, add some utility plots to
 RootPlot

---
 src/Detectors/DetectorApp.cpp | 2 ++
 src/Mask/ThreeStepSystem.cpp  | 4 ++--
 src/Plotters/RootPlotter.cpp  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Detectors/DetectorApp.cpp b/src/Detectors/DetectorApp.cpp
index 6499d50..766ecab 100644
--- a/src/Detectors/DetectorApp.cpp
+++ b/src/Detectors/DetectorApp.cpp
@@ -141,5 +141,7 @@ void DetectorApp::Run()
 		else if(m_fileWriter.Write())
 				++count;
 	}
+
+    std::cout << std::endl;
 	
 }
\ No newline at end of file
diff --git a/src/Mask/ThreeStepSystem.cpp b/src/Mask/ThreeStepSystem.cpp
index d66710e..65e1206 100644
--- a/src/Mask/ThreeStepSystem.cpp
+++ b/src/Mask/ThreeStepSystem.cpp
@@ -56,8 +56,8 @@ namespace Mask {
 		m_nuclei[3] = CreateNucleus(zr, ar); //residual
 		m_nuclei[4] = CreateNucleus(step2Params.Z[1], step2Params.A[1]); //breakup1
 		m_nuclei[5] = CreateNucleus(zb2, ab2); //breakup2
-		m_nuclei[5] = CreateNucleus(step3Params.Z[1], step3Params.A[1]); //breakup3
-		m_nuclei[5] = CreateNucleus(zb4, ab4); //breakup4
+		m_nuclei[6] = CreateNucleus(step3Params.Z[1], step3Params.A[1]); //breakup3
+		m_nuclei[7] = CreateNucleus(zb4, ab4); //breakup4
 
 		m_step1.BindNuclei(&(m_nuclei[0]), &(m_nuclei[1]), &(m_nuclei[2]), &(m_nuclei[3]));
 		m_step2.BindNuclei(&(m_nuclei[3]), nullptr, &(m_nuclei[4]), &(m_nuclei[5]));
diff --git a/src/Plotters/RootPlotter.cpp b/src/Plotters/RootPlotter.cpp
index a07287e..1b56ab3 100644
--- a/src/Plotters/RootPlotter.cpp
+++ b/src/Plotters/RootPlotter.cpp
@@ -92,7 +92,8 @@ void RootPlotter::FillData(const Mask::Nucleus& nuc)
 	MyFill(th_vs_ph_name, th_vs_ph_title, nuc.vec4.Theta()*s_rad2deg, FullPhi(nuc.vec4.Phi())*s_rad2deg, 2);
 	MyFill(ex_name, ex_title, 260, -1.0, 25, nuc.GetExcitationEnergy());
 	MyFill(angdist_name, angdist_title, 20, -1.0, 1.0, std::cos(nuc.thetaCM));
-	if(nuc.isDetected)
+	MyFill(hist_ke_th_name, hist_ke_th_title, 180, 0.0, 180.0, 400, 0.0, 20.0, nuc.vec4.Theta()*s_rad2deg, nuc.GetKE());
+	if(nuc.isDetected && nuc.detectedKE > 0.25)
 	{
 		MyFill(ke_vs_th_name_det, ke_vs_th_title_det, nuc.vec4.Theta()*s_rad2deg, nuc.detectedKE, 2);
 		MyFill(ke_vs_ph_name_det, ke_vs_ph_title_det, FullPhi(nuc.vec4.Phi())*s_rad2deg, nuc.detectedKE, 4);