diff --git a/FSUDAQ.cpp b/FSUDAQ.cpp index 366a697..478b459 100644 --- a/FSUDAQ.cpp +++ b/FSUDAQ.cpp @@ -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); 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); connect(bnCanvas, &QPushButton::clicked, this, &FSUDAQ::OpenCanvas); diff --git a/SingleSpectra.cpp b/SingleSpectra.cpp index 3a4aa8c..c1b91de 100644 --- a/SingleSpectra.cpp +++ b/SingleSpectra.cpp @@ -185,7 +185,7 @@ SingleSpectra::SingleSpectra(Digitizer ** digi, unsigned int nDigi, QString rawD QPushButton * bnSaveButton = new QPushButton("Save Hist. Settings", this); 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 ); 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); } @@ -423,9 +423,11 @@ void SingleSpectra::SaveSetting(){ file.write("##========== End of file\n"); file.close(); + printf("Saved Histogram Settings to %s\n", settingPath.toStdString().c_str()); }else{ printf("%s|cannot open HistogramSettings.txt\n", __func__); } + } void SingleSpectra::LoadSetting(){