rtang/FSUDAQ_Qt6
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

few FSUDAQ updates

Browse Source
This commit is contained in:
Calem@RAISOR 2024-09-05 15:04:12 -05:00
parent 60da1a4bd6
commit 55bbb5a7cb
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FSUDAQ.cpp
View File

@ -24,9 +24,12 @@
#include "analyzers/MCP.h" #include "analyzers/MCP.h"
#include "analyzers/MCPandPSD.h" #include "analyzers/MCPandPSD.h"
#include "analyzers/PID.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){ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent){
DebugPrint("%s", "FSUDAQ"); DebugPrint("%s", "FSUDAQ");
@ -1825,6 +1828,9 @@ void MainWindow::OpenAnalyzer(){
if( id == 6 ) onlineAnalyzer = new RAISOR2(digi, nDigi); if( id == 6 ) onlineAnalyzer = new RAISOR2(digi, nDigi);
if( id == 7 ) onlineAnalyzer = new TEST(digi, nDigi); if( id == 7 ) onlineAnalyzer = new TEST(digi, nDigi);
if( id == 8 ) onlineAnalyzer = new MCPandPSD(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(); if( id >= 0 ) onlineAnalyzer->show();
}else{ }else{
@ -1839,6 +1845,9 @@ void MainWindow::OpenAnalyzer(){
if( id == 6 ) onlineAnalyzer = new RAISOR2(digi, nDigi); if( id == 6 ) onlineAnalyzer = new RAISOR2(digi, nDigi);
if( id == 7 ) onlineAnalyzer = new TEST(digi, nDigi); if( id == 7 ) onlineAnalyzer = new TEST(digi, nDigi);
if( id == 8 ) onlineAnalyzer = new MCPandPSD(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 ){ if( id >= 0 ){
onlineAnalyzer->show(); onlineAnalyzer->show();
onlineAnalyzer->activateWindow(); onlineAnalyzer->activateWindow();

3
FSUDAQ_Qt6.pro
View File

@ -49,6 +49,9 @@ HEADERS += ClassData.h \
analyzers/TEST.h \ analyzers/TEST.h \
analyzers/MCPandPSD.h \ analyzers/MCPandPSD.h \
analyzers/MCP.h \ analyzers/MCP.h \
analyzers/Cross.h\
analyzers/Target.h\
analyzers/BeamTune.h\
analyzers/PID.h analyzers/PID.h
SOURCES += ClassDigitizer.cpp \ SOURCES += ClassDigitizer.cpp \
DigiSettingsPanel.cpp \ DigiSettingsPanel.cpp \

12
analyzers/RAISOR2.h
View File

@ -210,8 +210,8 @@ inline void RAISOR2::UpdateHistograms(){
hXY->Fill(((e0-e1)/(e0+e1)),((e3-e2)/(e2+e3))); hXY->Fill(((e0-e1)/(e0+e1)),((e3-e2)/(e2+e3)));
hXE->Fill(e0+e1); hXE->Fill(e0+e1);
hYE->Fill(e2+e3); hYE->Fill(e2+e3);
hX->Fill(((e0-e1)/(e0+e1))); hX->Fill(((e0-e1)/(e0+e1))); // X position
hY->Fill(((e3-e2)/(e2+e3))); hY->Fill(((e3-e2)/(e2+e3))); // Y position
hXPE->Fill(((e0-e1)/(e0+e1)),(e0+e1)); hXPE->Fill(((e0-e1)/(e0+e1)),(e0+e1));
hYPE->Fill(((e3-e2)/(e2+e3)),(e2+e3)); hYPE->Fill(((e3-e2)/(e2+e3)),(e2+e3));
hXEdE1->Fill((e0+e1),dE1); hXEdE1->Fill((e0+e1),dE1);
@ -267,10 +267,10 @@ inline void RAISOR2::UpdateHistograms(){
hXY->UpdatePlot(); hXY->UpdatePlot();
hXX->UpdatePlot(); hXX->UpdatePlot();
hYY->UpdatePlot(); hYY->UpdatePlot();
hXE->UpdatePlot(); hXE->UpdatePlot(); // X Energy
hYE->UpdatePlot(); hYE->UpdatePlot(); // Y Energy
hX->UpdatePlot(); hX->UpdatePlot(); // X position
hY->UpdatePlot(); hY->UpdatePlot(); // Y position
hXPE->UpdatePlot(); hXPE->UpdatePlot();
hYPE->UpdatePlot(); hYPE->UpdatePlot();
hXEdE1->UpdatePlot(); hXEdE1->UpdatePlot();