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

bugs fix for online histograms

Browse Source
This commit is contained in:
Ryan Tang 2024-08-20 11:20:12 -04:00
parent 0895ad57ed
commit a58ddbc6d4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FSUDAQ.cpp
View File

@ -89,7 +89,7 @@ FSUDAQ::FSUDAQ(QWidget *parent) : QMainWindow(parent){
for( int i = 0; i < (int) onlineAnalyzerList.size() ; i++) cbAnalyzer->addItem(onlineAnalyzerList[i].c_str(), i); for( int i = 0; i < (int) onlineAnalyzerList.size() ; i++) cbAnalyzer->addItem(onlineAnalyzerList[i].c_str(), i);
connect(cbAnalyzer, &RComboBox::currentIndexChanged, this, &FSUDAQ::OpenAnalyzer); connect(cbAnalyzer, &RComboBox::currentIndexChanged, this, &FSUDAQ::OpenAnalyzer);
bnCanvas = new QPushButton("Online 1D Histograms", this); bnCanvas = new QPushButton("Online Histograms", this);
layout->addWidget(bnCanvas, 1, 2); layout->addWidget(bnCanvas, 1, 2);
connect(bnCanvas, &QPushButton::clicked, this, &FSUDAQ::OpenCanvas); connect(bnCanvas, &QPushButton::clicked, this, &FSUDAQ::OpenCanvas);

6
SingleSpectra.cpp
View File

@ -185,7 +185,7 @@ SingleSpectra::SingleSpectra(Digitizer ** digi, unsigned int nDigi, QString rawD
QPushButton * bnSaveButton = new QPushButton("Save Hist. Settings", this); QPushButton * bnSaveButton = new QPushButton("Save Hist. Settings", this);
ctrlLayout->addWidget(bnSaveButton, 1, 6, 1, 2); ctrlLayout->addWidget(bnSaveButton, 1, 6, 1, 2);
connect(bnSaveButton, &QPushButton::click, this, &SingleSpectra::SaveSetting); connect(bnSaveButton, &QPushButton::clicked, this, &SingleSpectra::SaveSetting);
} }
@ -367,7 +367,7 @@ void SingleSpectra::FillHistograms(){
hist[ID][ch]->Fill( data ); hist[ID][ch]->Fill( data );
if( digi[i]->GetDPPType() == DPPTypeCode::DPP_PSD_CODE ){ if( digi[i]->GetDPPType() == DPPTypeCode::DPP_PSD_CODE ){
hist[ID][ch]->Fill( digi[ID]->GetData()->GetEnergy2(ch, lastFilledIndex[ID][ch])); hist[ID][ch]->Fill( digi[ID]->GetData()->GetEnergy2(ch, lastFilledIndex[ID][ch]), 1);
} }
hist2D[ID]->Fill(ch, data); hist2D[ID]->Fill(ch, data);
} }
@ -423,9 +423,11 @@ void SingleSpectra::SaveSetting(){
file.write("##========== End of file\n"); file.write("##========== End of file\n");
file.close(); file.close();
printf("Saved Histogram Settings to %s\n", settingPath.toStdString().c_str());
}else{ }else{
printf("%s|cannot open HistogramSettings.txt\n", __func__); printf("%s|cannot open HistogramSettings.txt\n", __func__);
} }
} }
void SingleSpectra::LoadSetting(){ void SingleSpectra::LoadSetting(){