From 96a9aef6857d74927fd7f7c208867ff5e6bb045c Mon Sep 17 00:00:00 2001
From: gwm17 <gmccann@fsu.edu>
Date: Wed, 31 Aug 2022 10:05:13 -0400
Subject: [PATCH] Fix a bug in SABRE where the detectors were tilted backwards.
 Cleanup some code

---
 src/Detectors/SabreArray.cpp | 4 +---
 src/Detectors/SabreArray.h   | 2 +-
 src/Plotters/RootPlotter.cpp | 5 -----
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Detectors/SabreArray.cpp b/src/Detectors/SabreArray.cpp
index ca5a35e..9390b86 100644
--- a/src/Detectors/SabreArray.cpp
+++ b/src/Detectors/SabreArray.cpp
@@ -221,8 +221,6 @@ void SabreArray::DrawDetectorSystem(const std::string& filename)
  		}
  	}
 
- 	output<<"SABRE Geometry File -- Coordinates for Detectors"<<std::endl;
-	output<<"Edges: x y z"<<std::endl;
 	for(unsigned int i=0; i<ringxs.size(); i++)
 		output<<ringxs[i]<<" "<<ringys[i]<<" "<<ringzs[i]<<std::endl;
 	for(unsigned int i=0; i<wedgexs.size(); i++)
@@ -279,7 +277,6 @@ DetectorResult SabreArray::IsSabre(Mask::Nucleus& nucleus)
 		if(m_deadMap.IsDead(detector.GetDetectorID(), channel.first, 0) || m_deadMap.IsDead(detector.GetDetectorID(), channel.second, 1))
 				break; //dead channel check
 
-		observation.detectFlag = true;
 		observation.direction = detector.GetTrajectoryCoordinates(nucleus.vec4.Theta(), nucleus.vec4.Phi());
 		thetaIncident = std::acos(observation.direction.Dot(detector.GetNormTilted())/(observation.direction.R()));
 
@@ -293,6 +290,7 @@ DetectorResult SabreArray::IsSabre(Mask::Nucleus& nucleus)
 
 		observation.det_name = "SABRE"+std::to_string(detector.GetDetectorID());
 		observation.energy_deposited = m_detectorEloss.GetEnergyLossTotal(nucleus.Z, nucleus.A, ke, M_PI - thetaIncident);
+		observation.detectFlag = true;
 		return observation;
 	}
 
diff --git a/src/Detectors/SabreArray.h b/src/Detectors/SabreArray.h
index 49eb313..2ae54bc 100644
--- a/src/Detectors/SabreArray.h
+++ b/src/Detectors/SabreArray.h
@@ -32,7 +32,7 @@ private:
     bool m_degradedDetectors[5];
 
 	//Sabre constants
-    static constexpr double s_tilt = 40.0;
+    static constexpr double s_tilt = -40.0;
     static constexpr double s_zOffset = -0.1245;
     static constexpr int s_nDets = 5;
     static constexpr double s_centerPhiList[s_nDets] = {306.0, 18.0, 234.0, 162.0, 90.0};
diff --git a/src/Plotters/RootPlotter.cpp b/src/Plotters/RootPlotter.cpp
index 34b5068..9a07dc9 100644
--- a/src/Plotters/RootPlotter.cpp
+++ b/src/Plotters/RootPlotter.cpp
@@ -13,11 +13,6 @@ static double FullPhi(double phi)
 RootPlotter::RootPlotter()
 {
 	TH1::AddDirectory(kFALSE);
-	//Enforce dictionary linking
-	if(Mask::EnforceDictionaryLinked())
-	{
-		std::cout<<"Dictionary Linked"<<std::endl;
-	}
 }
 
 RootPlotter::~RootPlotter() {}