From 55bbb5a7cbd115622697d1e3615dcff60b916a3a Mon Sep 17 00:00:00 2001
From: "Calem@RAISOR" <calem@Raisor>
Date: Thu, 5 Sep 2024 15:04:12 -0500
Subject: [PATCH] few  FSUDAQ updates

---
 FSUDAQ.cpp          | 11 ++++++++++-
 FSUDAQ_Qt6.pro      |  3 +++
 analyzers/RAISOR2.h | 14 +++++++-------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/FSUDAQ.cpp b/FSUDAQ.cpp
index 635f4ac..3dd349a 100644
--- a/FSUDAQ.cpp
+++ b/FSUDAQ.cpp
@@ -24,9 +24,12 @@
 #include "analyzers/MCP.h"
 #include "analyzers/MCPandPSD.h"
 #include "analyzers/PID.h"
+#include "analyzers/Cross.h"
+#include "analyzers/Target.h"
+#include "analyzers/BeamTune.h"
 
 
-std::vector<std::string> onlineAnalyzerList = {"Coincident","Splie-Pole", "Encore", "RAISOR1", "MCP", "PID", "RAISOR2", "TEST", "MCPandPSD" };
+std::vector<std::string> onlineAnalyzerList = {"Coincident","Splie-Pole", "Encore", "RAISOR1", "MCP", "PID", "RAISOR2", "TEST", "MCPandPSD", "Cross", "Target", "BeamTune" };
 
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent){
   DebugPrint("%s", "FSUDAQ");
@@ -1825,6 +1828,9 @@ void MainWindow::OpenAnalyzer(){
     if( id == 6 ) onlineAnalyzer = new RAISOR2(digi, nDigi);
     if( id == 7 ) onlineAnalyzer = new TEST(digi, nDigi);
     if( id == 8 ) onlineAnalyzer = new MCPandPSD(digi, nDigi);
+    if( id == 9 ) onlineAnalyzer = new Cross(digi, nDigi);
+    if( id == 10 ) onlineAnalyzer = new Target(digi, nDigi);
+    if( id == 11 ) onlineAnalyzer = new BeamTune(digi, nDigi);
     if( id >=  0 ) onlineAnalyzer->show();
   }else{
 
@@ -1839,6 +1845,9 @@ void MainWindow::OpenAnalyzer(){
 	if( id == 6 ) onlineAnalyzer = new RAISOR2(digi, nDigi);
 	if( id == 7 ) onlineAnalyzer = new TEST(digi, nDigi);
 	if( id == 8 ) onlineAnalyzer = new MCPandPSD(digi, nDigi);
+	if( id == 9 ) onlineAnalyzer = new Cross(digi, nDigi);
+	if( id == 10 ) onlineAnalyzer = new Target(digi, nDigi);
+	if( id == 11 ) onlineAnalyzer = new BeamTune(digi, nDigi);
     if( id >= 0 ){
       onlineAnalyzer->show();
       onlineAnalyzer->activateWindow();
diff --git a/FSUDAQ_Qt6.pro b/FSUDAQ_Qt6.pro
index c3444e0..ec35cc4 100644
--- a/FSUDAQ_Qt6.pro
+++ b/FSUDAQ_Qt6.pro
@@ -49,6 +49,9 @@ HEADERS += ClassData.h \
            analyzers/TEST.h \
            analyzers/MCPandPSD.h \
            analyzers/MCP.h \
+           analyzers/Cross.h\
+           analyzers/Target.h\
+           analyzers/BeamTune.h\
            analyzers/PID.h 
 SOURCES += ClassDigitizer.cpp \
            DigiSettingsPanel.cpp \
diff --git a/analyzers/RAISOR2.h b/analyzers/RAISOR2.h
index f58ae25..7205307 100644
--- a/analyzers/RAISOR2.h
+++ b/analyzers/RAISOR2.h
@@ -210,8 +210,8 @@ inline void RAISOR2::UpdateHistograms(){
 	hXY->Fill(((e0-e1)/(e0+e1)),((e3-e2)/(e2+e3)));
 	hXE->Fill(e0+e1);
 	hYE->Fill(e2+e3);
-	hX->Fill(((e0-e1)/(e0+e1)));
-	hY->Fill(((e3-e2)/(e2+e3)));
+	hX->Fill(((e0-e1)/(e0+e1))); 					// X position
+	hY->Fill(((e3-e2)/(e2+e3))); 					// Y position
 	hXPE->Fill(((e0-e1)/(e0+e1)),(e0+e1));
 	hYPE->Fill(((e3-e2)/(e2+e3)),(e2+e3));
 	hXEdE1->Fill((e0+e1),dE1);
@@ -267,11 +267,11 @@ inline void RAISOR2::UpdateHistograms(){
   hXY->UpdatePlot();
   hXX->UpdatePlot();
   hYY->UpdatePlot();
-  hXE->UpdatePlot();
-  hYE->UpdatePlot();
-  hX->UpdatePlot();
-  hY->UpdatePlot();
-  hXPE->UpdatePlot();
+  hXE->UpdatePlot(); 	// X Energy
+  hYE->UpdatePlot(); 	// Y Energy
+  hX->UpdatePlot(); 	// X position
+  hY->UpdatePlot(); 	// Y position
+  hXPE->UpdatePlot(); 	
   hYPE->UpdatePlot();
   hXEdE1->UpdatePlot();
   hYEdE1->UpdatePlot();