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

bug fix on Event builder. added CoincidentAnalyzer, try to improve 2D historgeam color

Browse Source
This commit is contained in:
splitPoleDAQ 2023-11-16 19:20:29 -05:00
parent eb178620f2
commit 6534dec196
13 changed files with 323 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataGenerator.cpp → Aux/DataGenerator.cpp
View File

@ -1,8 +1,8 @@
#include <cstdio> #include <cstdio>
#include <random> #include <random>
#include "macro.h" #include "../macro.h"
#include "ClassDigitizer.h" #include "../ClassDigitizer.h"
int main(){ int main(){

4
DataReaderScript.cpp → Aux/DataReaderScript.cpp
View File

@ -4,8 +4,8 @@ This can be loaded to root and run the DataReader()
***********/ ***********/
#include "ClassData.h" #include "../ClassData.h"
#include "MultiBuilder.h" #include "../MultiBuilder.h"
void DataReader(std::string fileName, int DPPType){ void DataReader(std::string fileName, int DPPType){

4
DumpFSU2ROOT.cpp → Aux/DumpFSU2ROOT.cpp
View File

@ -4,8 +4,8 @@ This can be loaded to root and run the DataReader()
***********/ ***********/
#include "ClassData.h" #include "../ClassData.h"
#include "MultiBuilder.h" #include "../MultiBuilder.h"
#include "TROOT.h" #include "TROOT.h"
#include "TFile.h" #include "TFile.h"

18
EventBuilder.cpp → Aux/EventBuilder.cpp
View File

@ -72,14 +72,20 @@ int main(int argc, char **argv) {
int snPos = inFileName[i].Index("_"); // first "_" int snPos = inFileName[i].Index("_"); // first "_"
//snPos = inFileName[i].Index("_", snPos + 1); //snPos = inFileName[i].Index("_", snPos + 1);
int sn = atoi(&inFileName[i][snPos+5]); int sn = atoi(&inFileName[i][snPos+5]);
TString typeStr = &inFileName[i][snPos+9];
int typePos = inFileName[i].Index("_", snPos+5);
TString typeStr = &inFileName[i][typePos+1];
typeStr.Resize(3); typeStr.Resize(3);
printf("sn %d %s \n", sn, typeStr.Data());
if( typeStr == "PHA" ) type[i] = DPPType::DPP_PHA_CODE; if( typeStr == "PHA" ) type[i] = DPPType::DPP_PHA_CODE;
if( typeStr == "PSD" ) type[i] = DPPType::DPP_PSD_CODE; if( typeStr == "PSD" ) type[i] = DPPType::DPP_PSD_CODE;
if( typeStr == "QDC" ) type[i] = DPPType::DPP_QDC_CODE;
int order = atoi(&inFileName[i][snPos+13]); int orderPos = inFileName[i].Index("_", typePos + 1);
ID[i] = sn + order * 1000; int order = atoi(&inFileName[i][orderPos+1]);
ID[i] = sn + order * 100000;
FILE * temp = fopen(inFileName[i].Data(), "rb"); FILE * temp = fopen(inFileName[i].Data(), "rb");
if( temp == NULL ) { if( temp == NULL ) {
@ -96,7 +102,7 @@ int main(int argc, char **argv) {
} }
quickSort(&(ID[0]), &(type[0]), &(inFileName[0]), 0, nFile-1); quickSort(&(ID[0]), &(type[0]), &(inFileName[0]), 0, nFile-1);
for( int i = 0 ; i < nFile; i++){ for( int i = 0 ; i < nFile; i++){
printf("%d | %6d | %3d | %s | %u Bytes = %.2f MB\n", i, ID[i], type[i], inFileName[i].Data(), fileSize[i], fileSize[i]/1024./1024.); printf("%d | %6d | %3d | %30s | %u Bytes = %.2f MB\n", i, ID[i], type[i], inFileName[i].Data(), fileSize[i], fileSize[i]/1024./1024.);
} }
//*======================================= Sort files in to group //*======================================= Sort files in to group
@ -104,11 +110,11 @@ int main(int argc, char **argv) {
std::vector<int> typeList; // store the DPP type of the group std::vector<int> typeList; // store the DPP type of the group
std::vector<std::vector<TString>> fileList; // store the file list of the group std::vector<std::vector<TString>> fileList; // store the file list of the group
for( int i = 0; i < nFile; i++){ for( int i = 0; i < nFile; i++){
if( ID[i] / 1000 == 0 ) { if( ID[i] / 100000 == 0 ) {
std::vector<TString> temp = {inFileName[i]}; std::vector<TString> temp = {inFileName[i]};
fileList.push_back(temp); fileList.push_back(temp);
typeList.push_back(type[i]); typeList.push_back(type[i]);
snList.push_back(ID[i]%1000); snList.push_back(ID[i]%100000);
}else{ }else{
for( int p = 0; p < (int) snList.size(); p++){ for( int p = 0; p < (int) snList.size(); p++){
if( (ID[i] % 1000) == snList[p] ) { if( (ID[i] % 1000) == snList[p] ) {

0
fsuReader.h → Aux/fsuReader.h
View File

6
test.cpp → Aux/test.cpp
View File

@ -1,6 +1,6 @@
#include "macro.h" #include "../macro.h"
#include "ClassData.h" #include "../ClassData.h"
#include "ClassDigitizer.h" #include "../ClassDigitizer.h"
#include <TROOT.h> #include <TROOT.h>
#include <TSystem.h> #include <TSystem.h>

4
test_indep.cpp → Aux/test_indep.cpp
View File

@ -8,8 +8,8 @@
#include "CAENDigitizer.h" #include "CAENDigitizer.h"
#include "CAENDigitizerType.h" #include "CAENDigitizerType.h"
#include "macro.h" #include "../macro.h"
#include "RegisterAddress.h" #include "../RegisterAddress.h"
using namespace std; using namespace std;

17
FSUDAQ.cpp
View File

@ -14,11 +14,12 @@
#include <QProcess> #include <QProcess>
#include <QMessageBox> #include <QMessageBox>
#include "analyzers/CoincidentAnalyzer.h"
#include "analyzers/SplitPoleAnalyzer.h" #include "analyzers/SplitPoleAnalyzer.h"
#include "analyzers/EncoreAnalyzer.h" #include "analyzers/EncoreAnalyzer.h"
#include "analyzers/RAISOR.h" #include "analyzers/RAISOR.h"
std::vector<std::string> onlineAnalyzerList = {"Splie-Pole", "Encore", "RAISOR"}; std::vector<std::string> onlineAnalyzerList = {"Coincident","Splie-Pole", "Encore", "RAISOR"};
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent){ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent){
@ -1577,17 +1578,19 @@ void MainWindow::OpenAnalyzer(){
if( onlineAnalyzer == nullptr ) { if( onlineAnalyzer == nullptr ) {
//onlineAnalyzer = new Analyzer(digi, nDigi); //onlineAnalyzer = new Analyzer(digi, nDigi);
if( id == 0 ) onlineAnalyzer = new SplitPole(digi, nDigi); if( id == 0 ) onlineAnalyzer = new CoincidentAnalyzer(digi, nDigi);
if( id == 1 ) onlineAnalyzer = new Encore(digi, nDigi); if( id == 1 ) onlineAnalyzer = new SplitPole(digi, nDigi);
if( id == 2 ) onlineAnalyzer = new RAISOR(digi, nDigi); if( id == 2 ) onlineAnalyzer = new Encore(digi, nDigi);
if( id == 3 ) onlineAnalyzer = new RAISOR(digi, nDigi);
if( id >= 0 ) onlineAnalyzer->show(); if( id >= 0 ) onlineAnalyzer->show();
}else{ }else{
delete onlineAnalyzer; delete onlineAnalyzer;
if( id == 0 ) onlineAnalyzer = new SplitPole(digi, nDigi); if( id == 0 ) onlineAnalyzer = new CoincidentAnalyzer(digi, nDigi);
if( id == 1 ) onlineAnalyzer = new Encore(digi, nDigi); if( id == 1 ) onlineAnalyzer = new SplitPole(digi, nDigi);
if( id == 2 ) onlineAnalyzer = new RAISOR(digi, nDigi); if( id == 2 ) onlineAnalyzer = new Encore(digi, nDigi);
if( id == 3 ) onlineAnalyzer = new RAISOR(digi, nDigi);
if( id >= 0 ){ if( id >= 0 ){
onlineAnalyzer->show(); onlineAnalyzer->show();

5
FSUDAQ_Qt6.pro
View File

@ -40,9 +40,10 @@ HEADERS += ClassData.h \
qcustomplot.h \ qcustomplot.h \
analyzers/Isotope.h \ analyzers/Isotope.h \
analyzers/Analyser.h \ analyzers/Analyser.h \
analyzers/CoincidentAnalyzer.h \
analyzers/SplitPoleAnalyzer.h \ analyzers/SplitPoleAnalyzer.h \
analyzers/EncoreAnalyzer.h analyzers/EncoreAnalyzer.h \
analyzers/RAISOR.h analyzers/RAISOR.h
SOURCES += ClassDigitizer.cpp \ SOURCES += ClassDigitizer.cpp \
DigiSettingsPanel.cpp \ DigiSettingsPanel.cpp \
FSUDAQ.cpp \ FSUDAQ.cpp \

2
Histogram1D.h
View File

@ -215,6 +215,8 @@ public:
overFlow = 0; overFlow = 0;
UpdatePlot(); UpdatePlot();
} }
void SetXTitle(QString xTitle) { xAxis->setLabel(xTitle); }
void Rebin(int xbin, double xmin, double xmax){ void Rebin(int xbin, double xmin, double xmax){
xMin = xmin; xMin = xmin;

18
Histogram2D.h
View File

@ -179,9 +179,25 @@ public:
//^=================================== //^===================================
void SetXTitle(QString xTitle) { xAxis->setLabel(xTitle); }
void SetYTitle(QString yTitle) { yAxis->setLabel(yTitle); }
void Rebin(int xbin, double xmin, double xmax, int ybin, double ymin, double ymax); void Rebin(int xbin, double xmin, double xmax, int ybin, double ymin, double ymax);
void UpdatePlot(){ colorMap->rescaleDataRange(); replot(); } void UpdatePlot(){
QCPColorGradient color;
color.clearColorStops();
color.setColorStopAt( 0.0, QColor("white" ));
color.setColorStopAt( 1.0/entry[1][1], QColor("purple" ));
color.setColorStopAt( 0.2, QColor("blue"));
color.setColorStopAt( 0.4, QColor("cyan"));
color.setColorStopAt( 0.6, QColor("green"));
color.setColorStopAt( 0.8, QColor("yellow"));
color.setColorStopAt( 1.0, QColor("red"));
colorMap->setGradient(color);
colorMap->rescaleDataRange();
replot();
}
void Clear(); // Clear Data and histrogram void Clear(); // Clear Data and histrogram

54
Makefile_Aux
View File

@ -1,54 +0,0 @@
########################################################################
#
#
#########################################################################
CC = g++
#COPTS = -fPIC -DLINUX -O2 -std=c++17 -lpthread
COPTS = -fPIC -DLINUX -g -O2 -Wall -std=c++17 -lpthread
CAENLIBS = -lCAENDigitizer
ROOTLIBS = `root-config --cflags --glibs`
OBJS = ClassDigitizer.o MultiBuilder.o
ALL = test test_indep DataGenerator EventBuilder DataReader DumpFSU2ROOT
#########################################################################
all : $(ALL)
clean :
/bin/rm -f $(OBJS) $(ALL)
MultiBuilder.o : MultiBuilder.cpp MultiBuilder.h
$(CC) $(COPTS) -c MultiBuilder.cpp
ClassDigitizer.o : ClassDigitizer.cpp ClassDigitizer.h RegisterAddress.h macro.h ClassData.h
$(CC) $(COPTS) -c ClassDigitizer.cpp
test : test.cpp ClassDigitizer.o
@echo "--------- making test"
$(CC) $(COPTS) -o test test.cpp ClassDigitizer.o $(CAENLIBS) $(ROOTLIBS)
test_indep : test_indep.cpp RegisterAddress.h macro.h
@echo "--------- making test_indep"
$(CC) $(COPTS) -o test_indep test_indep.cpp $(CAENLIBS)
DataGenerator : DataGenerator.cpp ClassDigitizer.o
@echo "--------- making DataGenerator"
$(CC) $(COPTS) -o DataGenerator DataGenerator.cpp ClassDigitizer.o $(CAENLIBS)
DataReader : DataReaderScript.cpp ClassData.h MultiBuilder.o
@echo "--------- making DataReader"
$(CC) $(COPTS) -o DataReader DataReaderScript.cpp ClassData.h MultiBuilder.o
EventBuilder : EventBuilder.cpp ClassData.h MultiBuilder.o
@echo "--------- making EventBuilder"
$(CC) $(COPTS) -o EventBuilder EventBuilder.cpp MultiBuilder.o $(ROOTLIBS)
DumpFSU2ROOT : DumpFSU2ROOT.cpp ClassData.h MultiBuilder.o
@echo "--------- making DumpFSU2ROOT"
$(CC) $(COPTS) -o DumpFSU2ROOT DumpFSU2ROOT.cpp ClassData.h MultiBuilder.o $(ROOTLIBS)

268
analyzers/CoincidentAnalyzer.h Normal file
View File

@ -0,0 +1,268 @@
#ifndef COINCIDENTANLAYZER_H
#define COINCIDENTANLAYZER_H
#include "Analyser.h"
//^===========================================
class CoincidentAnalyzer : public Analyzer{
Q_OBJECT
public:
CoincidentAnalyzer(Digitizer ** digi, unsigned int nDigi, QMainWindow * parent = nullptr): Analyzer(digi, nDigi, parent){
this->digi = digi;
this->nDigi = nDigi;
SetUpdateTimeInSec(1.0);
//RedefineEventBuilder({0}); // only build for the 0-th digitizer, otherwise, it will build event accross all digitizers
SetBackwardBuild(false, 100); // using normal building (acceding in time) or backward building, int the case of backward building, default events to be build is 100.
evtbder = GetEventBuilder();
evtbder->SetTimeWindow(500);
//========== use the influx from the Analyzer
influx = new InfluxDB("https://fsunuc.physics.fsu.edu/influx/");
dataBaseName = "testing";
SetUpCanvas();
}
void SetUpCanvas();
public slots:
void UpdateHistograms();
private:
Digitizer ** digi;
unsigned int nDigi;
MultiBuilder *evtbder;
// declaie histograms
Histogram2D * h2D;
Histogram1D * h1;
Histogram1D * h1g;
Histogram1D * hMulti;
QCheckBox * runAnalyzer;
RSpinBox * sbUpdateTime;
QCheckBox * backWardBuilding;
RSpinBox * sbBackwardCount;
RSpinBox * sbBuildWindow;
// data source for the h2D
RComboBox * xDigi;
RComboBox * xCh;
RComboBox * yDigi;
RComboBox * yCh;
// data source for the h1
RComboBox * aDigi;
RComboBox * aCh;
};
inline void CoincidentAnalyzer::SetUpCanvas(){
setGeometry(0, 0, 1600, 1000);
{//^====== magnet and reaction setting
QGroupBox * box = new QGroupBox("Configuration", this);
layout->addWidget(box, 0, 0);
QGridLayout * boxLayout = new QGridLayout(box);
boxLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
box->setLayout(boxLayout);
runAnalyzer = new QCheckBox("Run Analyzer", this);
boxLayout->addWidget(runAnalyzer, 0, 0);
QLabel * lbUpdateTime = new QLabel("Update Period [s]", this);
lbUpdateTime->setAlignment(Qt::AlignRight | Qt::AlignCenter);
boxLayout->addWidget(lbUpdateTime, 0, 1);
sbUpdateTime = new RSpinBox(this, 1);
sbUpdateTime->setMinimum(0.1);
sbUpdateTime->setMaximum(5);
sbUpdateTime->setValue(1);
boxLayout->addWidget(sbUpdateTime, 0, 2);
backWardBuilding = new QCheckBox("Use Backward builder", this);
boxLayout->addWidget(backWardBuilding, 1, 0);
QLabel * lbBKWindow = new QLabel("No. Backward Event", this);
lbBKWindow->setAlignment(Qt::AlignRight | Qt::AlignCenter);
boxLayout->addWidget(lbBKWindow, 1, 1);
sbBackwardCount = new RSpinBox(this, 0);
sbBackwardCount->setMinimum(1);
sbBackwardCount->setMaximum(9999);
sbBackwardCount->setValue(100);
boxLayout->addWidget(sbBackwardCount, 1, 2);
backWardBuilding->setChecked(false);
sbBackwardCount->setEnabled(false);
QLabel * lbBuildWindow = new QLabel("Event Window [tick]", this);
lbBuildWindow->setAlignment(Qt::AlignRight | Qt::AlignCenter);
boxLayout->addWidget(lbBuildWindow, 2, 1);
sbBuildWindow = new RSpinBox(this, 0);
sbBuildWindow->setMinimum(1);
sbBuildWindow->setMaximum(9999999999);
boxLayout->addWidget(sbBuildWindow, 2, 2);
QFrame *separator = new QFrame(box);
separator->setFrameShape(QFrame::HLine);
separator->setFrameShadow(QFrame::Sunken);
boxLayout->addWidget(separator, 3, 0, 1, 4);
QLabel * lbXDigi = new QLabel("X-Digi", this);
lbXDigi->setAlignment(Qt::AlignRight | Qt::AlignCenter);
boxLayout->addWidget(lbXDigi, 4, 0);
xDigi = new RComboBox(this);
for(unsigned int i = 0; i < nDigi; i ++ ){
xDigi->addItem("Digi-" + QString::number(digi[i]->GetSerialNumber()), i);
}
boxLayout->addWidget(xDigi, 4, 1);
QLabel * lbXCh = new QLabel("X-Ch", this);
lbXCh->setAlignment(Qt::AlignRight | Qt::AlignCenter);
boxLayout->addWidget(lbXCh, 4, 2);
xCh = new RComboBox(this);
for( int i = 0; i < digi[0]->GetNumInputCh(); i++) xCh->addItem("Ch-" + QString::number(i));
boxLayout->addWidget(xCh, 4, 3);
QLabel * lbYDigi = new QLabel("Y-Digi", this);
lbYDigi->setAlignment(Qt::AlignRight | Qt::AlignCenter);
boxLayout->addWidget(lbYDigi, 5, 0);
yDigi = new RComboBox(this);
for(unsigned int i = 0; i < nDigi; i ++ ){
yDigi->addItem("Digi-" + QString::number(digi[i]->GetSerialNumber()), i);
}
boxLayout->addWidget(yDigi, 5, 1);
QLabel * lbYCh = new QLabel("Y-Ch", this);
lbYCh->setAlignment(Qt::AlignRight | Qt::AlignCenter);
boxLayout->addWidget(lbYCh, 5, 2);
yCh = new RComboBox(this);
for( int i = 0; i < digi[0]->GetNumInputCh(); i++) yCh->addItem("Ch-" + QString::number(i));
boxLayout->addWidget(yCh, 5, 3);
QFrame *separator1 = new QFrame(box);
separator1->setFrameShape(QFrame::HLine);
separator1->setFrameShadow(QFrame::Sunken);
boxLayout->addWidget(separator1, 6, 0, 1, 4);
QLabel * lbaDigi = new QLabel("ID-Digi", this);
lbaDigi->setAlignment(Qt::AlignRight | Qt::AlignCenter);
boxLayout->addWidget(lbaDigi, 7, 0);
aDigi = new RComboBox(this);
for(unsigned int i = 0; i < nDigi; i ++ ){
aDigi->addItem("Digi-" + QString::number(digi[i]->GetSerialNumber()), i);
}
boxLayout->addWidget(yDigi, 7, 1);
QLabel * lbaCh = new QLabel("1D-Ch", this);
lbaCh->setAlignment(Qt::AlignRight | Qt::AlignCenter);
boxLayout->addWidget(lbaCh, 7, 2);
aCh = new RComboBox(this);
for( int i = 0; i < digi[0]->GetNumInputCh(); i++) aCh->addItem("Ch-" + QString::number(i));
boxLayout->addWidget(aCh, 7, 3);
}
//============ histograms
hMulti = new Histogram1D("Multiplicity", "", 10, 0, 10, this);
layout->addWidget(hMulti, 0, 1);
// the "this" make the histogram a child of the SplitPole class. When SplitPole destory, all childs destory as well.
h2D = new Histogram2D("Coincident Plot", "XXX", "YYY", 100, 0, 5000, 100, 0, 5000, this);
//layout is inheriatge from Analyzer
layout->addWidget(h2D, 1, 0, 2, 1);
h1 = new Histogram1D("1D Plot", "XXX", 300, 30, 70, this);
h1->SetColor(Qt::darkGreen);
h1->AddDataList("Test", Qt::red); // add another histogram in h1, Max Data List is 10
layout->addWidget(h1, 1, 1);
h1g = new Histogram1D("1D Plot (PID gated)", "XXX", 300, -2, 10, this);
layout->addWidget(h1g, 2, 1);
layout->setColumnStretch(0, 1);
layout->setColumnStretch(1, 1);
}
inline void CoincidentAnalyzer::UpdateHistograms(){
if( this->isVisible() == false ) return;
if( runAnalyzer->isChecked() == false ) return;
BuildEvents(); // call the event builder to build events
//============ Get events, and do analysis
long eventBuilt = evtbder->eventBuilt;
if( eventBuilt == 0 ) return;
//============ Get the cut list, if any
QList<QPolygonF> cutList = h2D->GetCutList();
const int nCut = cutList.count();
unsigned long long tMin[nCut] = {0xFFFFFFFFFFFFFFFF}, tMax[nCut] = {0};
unsigned int count[nCut]={0};
//============ Processing data and fill histograms
long eventIndex = evtbder->eventIndex;
long eventStart = eventIndex - eventBuilt + 1;
if(eventStart < 0 ) eventStart += MaxNEvent;
for( long i = eventStart ; i <= eventIndex; i ++ ){
std::vector<Hit> event = evtbder->events[i];
//printf("-------------- %ld\n", i);
hMulti->Fill((int) event.size());
//if( event.size() < 9 ) return;
if( event.size() == 0 ) return;
for( int k = 0; k < (int) event.size(); k++ ){
//event[k].Print();
}
//check events inside any Graphical cut and extract the rate, using tSR only
for(int p = 0; p < cutList.count(); p++ ){
if( cutList[p].isEmpty() ) continue;
// if( cutList[p].containsPoint(QPointF(hit.eSL, hit.eSR), Qt::OddEvenFill) ){
// if( hit.tSR < tMin[p] ) tMin[p] = hit.tSR;
// if( hit.tSR > tMax[p] ) tMax[p] = hit.tSR;
// count[p] ++;
// //printf(".... %d \n", count[p]);
// if( p == 0 ) h1g->Fill(hit.eSR);
// }
}
}
h2D->UpdatePlot();
h1->UpdatePlot();
hMulti->UpdatePlot();
h1g->UpdatePlot();
QList<QString> cutNameList = h2D->GetCutNameList();
for( int p = 0; p < cutList.count(); p ++){
if( cutList[p].isEmpty() ) continue;
// double dT = (tMax[p]-tMin[p]) * tick2ns / 1e9; // tick to sec
// double rate = count[p]*1.0/(dT);
//printf("%llu %llu, %f %d\n", tMin[p], tMax[p], dT, count[p]);
//printf("%10s | %d | %f Hz \n", cutNameList[p].toStdString().c_str(), count[p], rate);
// influx->AddDataPoint("Cut,name=" + cutNameList[p].toStdString()+ " value=" + std::to_string(rate));
// influx->WriteData(dataBaseName);
// influx->ClearDataPointsBuffer();
}
}
#endif