From 002a10b4e0883328fb102d380ae347314ef35566 Mon Sep 17 00:00:00 2001 From: MUSIC Date: Thu, 1 Aug 2024 16:03:50 -0500 Subject: [PATCH] bug fix on MUSICAnalyzer.h --- ClassDigitizer.cpp | 2 +- DigiSettingsPanel.cpp | 2 +- MultiBuilder.cpp | 2 ++ Scope.cpp | 2 +- SingleSpectra.cpp | 2 +- analyzers/Analyser.cpp | 2 +- analyzers/EncoreAnalyzer.h | 7 +++--- analyzers/MUSICAnalyzer.h | 44 +++++++++++++++++--------------------- 8 files changed, 31 insertions(+), 32 deletions(-) diff --git a/ClassDigitizer.cpp b/ClassDigitizer.cpp index 8d10f82..ecf7045 100644 --- a/ClassDigitizer.cpp +++ b/ClassDigitizer.cpp @@ -667,7 +667,7 @@ unsigned int Digitizer::CalByteForBufferCAEN(){ uint32_t AllocatedSize; ret = CAEN_DGTZ_MallocReadoutBuffer(handle, &BufferCAEN, &AllocatedSize); - delete BufferCAEN; + if( BufferCAEN) delete BufferCAEN; return AllocatedSize; } diff --git a/DigiSettingsPanel.cpp b/DigiSettingsPanel.cpp index ae95f35..75fbae3 100644 --- a/DigiSettingsPanel.cpp +++ b/DigiSettingsPanel.cpp @@ -269,7 +269,7 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer ** digi, unsigned int nDigi, QStr // connect(bnSaveSettingsToText, &QPushButton::clicked, this, [=](){ SaveSetting(1);}); //checkBox, to coupled or decouple the setting file. - chkCoupledSettingFile = new QCheckBox("Update Setting", this); + chkCoupledSettingFile = new QCheckBox("Live Setting Update", this); buttonLayout->addWidget(chkCoupledSettingFile, rowID, 2); chkCoupledSettingFile->setCheckState(Qt::CheckState::Unchecked); connect(chkCoupledSettingFile, &QCheckBox::stateChanged, this, [=](int state){ diff --git a/MultiBuilder.cpp b/MultiBuilder.cpp index c7c8228..1b76acc 100644 --- a/MultiBuilder.cpp +++ b/MultiBuilder.cpp @@ -279,6 +279,8 @@ void MultiBuilder::BuildEvents(bool isFinal, bool skipTrace, bool verbose){ if( timeWindow <= 0 ) break; } + if( events[eventIndex].size() == 0 ) continue; + if( events[eventIndex].size() > 1) { std::sort(events[eventIndex].begin(), events[eventIndex].end(), [](const Hit& a, const Hit& b) { return a.timestamp < b.timestamp; diff --git a/Scope.cpp b/Scope.cpp index 18d17f8..c25f1a9 100644 --- a/Scope.cpp +++ b/Scope.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +// #include QVector Scope::TrapezoidFilter(QVector data, int baseLineEndS, int riseTimeS, int flatTopS, float decayTime_ns){ DebugPrint("%s", "Scope"); diff --git a/SingleSpectra.cpp b/SingleSpectra.cpp index 605b5bd..cc2b849 100644 --- a/SingleSpectra.cpp +++ b/SingleSpectra.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +// #include SingleSpectra::SingleSpectra(Digitizer ** digi, unsigned int nDigi, QString rawDataPath, QMainWindow * parent) : QMainWindow(parent){ DebugPrint("%s", "SingleSpectra"); diff --git a/analyzers/Analyser.cpp b/analyzers/Analyser.cpp index 5156c66..9c8d666 100644 --- a/analyzers/Analyser.cpp +++ b/analyzers/Analyser.cpp @@ -98,7 +98,7 @@ void Analyzer::BuildEvents(bool verbose){ if( isBuildBackward ){ mb->BuildEventsBackWard(maxNumEventBuilt, verbose); }else{ - mb->BuildEvents(0, 0, verbose); + mb->BuildEvents(0, true, verbose); } for( unsigned int i = 0; i < nData; i++ ) digiMTX[idList[i]].unlock(); diff --git a/analyzers/EncoreAnalyzer.h b/analyzers/EncoreAnalyzer.h index 79a42b3..ad77632 100644 --- a/analyzers/EncoreAnalyzer.h +++ b/analyzers/EncoreAnalyzer.h @@ -6,7 +6,7 @@ #include #include -#include +// #include namespace EncoreChMap{ @@ -87,11 +87,12 @@ inline void Encore::SetUpCanvas(){ //====== resize window if screen too small QScreen * screen = QGuiApplication::primaryScreen(); QRect screenGeo = screen->geometry(); - if( screenGeo.width() < 1600 || screenGeo.height() < 1600) { + if( screenGeo.width() < 1000 || screenGeo.height() < 1000) { setGeometry(0, 0, screenGeo.width() - 100, screenGeo.height() -100); }else{ - setGeometry(0, 0, 1600, 1600); + setGeometry(0, 0, 1000, 1000); } + // setGeometry(0, 0, 1600, 1600); chkRunAnalyzer = new QCheckBox("Run Analyzer", this); layout->addWidget(chkRunAnalyzer, 0, 0); diff --git a/analyzers/MUSICAnalyzer.h b/analyzers/MUSICAnalyzer.h index b86626a..c1d0913 100644 --- a/analyzers/MUSICAnalyzer.h +++ b/analyzers/MUSICAnalyzer.h @@ -6,7 +6,7 @@ #include #include -#include +// #include namespace MUSICChMap{ @@ -60,7 +60,7 @@ public: SetUpdateTimeInSec(1.0); - 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. + SetBackwardBuild(true, 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(10000); @@ -94,19 +94,20 @@ inline void MUSIC::SetUpCanvas(){ //====== resize window if screen too small QScreen * screen = QGuiApplication::primaryScreen(); QRect screenGeo = screen->geometry(); - if( screenGeo.width() < 1600 || screenGeo.height() < 1600) { + if( screenGeo.width() < 1000 || screenGeo.height() < 1000) { setGeometry(0, 0, screenGeo.width() - 100, screenGeo.height() -100); }else{ - setGeometry(0, 0, 1600, 1600); + setGeometry(0, 0, 1000, 1000); } + // setGeometry(0, 0, 1600, 1600); chkRunAnalyzer = new QCheckBox("Run Analyzer", this); layout->addWidget(chkRunAnalyzer, 0, 0); - hLeft = new Histogram2D("Left", "Ch", "Energy", 17, 0, 16, 200, 0, 20000, this); + hLeft = new Histogram2D("Left", "Ch", "Energy", 16, 0, 16, 200, 0, 200, this); layout->addWidget(hLeft, 1, 0); - hRight = new Histogram2D("Right", "Ch", "Energy", 17, 0, 16, 200, 0, 20000, this); + hRight = new Histogram2D("Right", "Ch", "Energy", 16, 0, 16, 200, 0, 200, this); layout->addWidget(hRight, 1, 1); - hLR = new Histogram2D("Left + Right", "Ch", "Energy", 17, 0, 16, 200, 0, 20000, this); + hLR = new Histogram2D("Left + Right", "Ch", "Energy", 17, 0, 16, 200, 0, 200, this); layout->addWidget(hLR, 2, 0); hMulti = new Histogram1D("Multi", "multiplicity", 40, 0, 40); layout->addWidget(hMulti, 2, 1); @@ -118,9 +119,7 @@ inline void MUSIC::UpdateHistograms(){ if( this->isVisible() == false ) return; if( chkRunAnalyzer->isChecked() == false ) return; - BuildEvents(); // call the event builder to build events - - printf("MUSIC::%s----------- 1\n", __func__); + BuildEvents(false); // call the event builder to build events //============ Get events, and do analysis long eventBuilt = evtbder->eventBuilt; @@ -131,21 +130,19 @@ inline void MUSIC::UpdateHistograms(){ long eventStart = eventIndex - eventBuilt + 1; if(eventStart < 0 ) eventStart += MaxNEvent; - printf("MUSIC::%s----------- 2\n", __func__); + // printf("MUSIC::%s----------- 2 : %ld %ld \n", __func__, eventStart, eventIndex); for( long i = eventStart ; i <= eventIndex; i ++ ){ std::vector event = evtbder->events[i]; - //printf("-------------- %ld\n", i); + // printf("MUSIC::%s----------- %ld, %zu\n", __func__, i, event.size()); hMulti->Fill((int) event.size()); - //if( event.size() < 9 ) return; if( event.size() == 0 ) return; double sum[17] = {0}; for( int k = 0; k < (int) event.size(); k++ ){ - - printf("MUSIC::%s----------- i, k %d, %d\n", __func__, i, k); + + // printf("--- %d\n", k); int bd = MUSICChMap::SN2Bd.at(event[k].sn); - int ch = event[k].ch; int ID = MUSICChMap::mapping[bd][ch]; @@ -153,23 +150,22 @@ inline void MUSIC::UpdateHistograms(){ if( ID < 0 ) continue; double eC = event[k].energy; - if( 0 <= ID && ID < 100 ) { + if( 0 <= ID && ID < 16 ) { eC *= MUSICChMap::corr[ch][bd]; hLeft->Fill(ID, eC); sum[ID] += eC; } - if( 100 <= ID && ID < 200 ) { + if( 16 <= ID && ID < 32 ) { eC *= MUSICChMap::corr[ch][bd]; - hRight->Fill(ID-100, eC ); - sum[ID-100] += eC ; + hRight->Fill(ID-16, eC ); + sum[ID-16] += eC ; } } for( int ch = 0; ch < 17; ch++){ - if( sum[ch] > 0 ) hLR->Fill(ch, sum[ch]); - //printf("%d | sum %d\n", ch, sum[ch]); - } - + if( sum[ch] > 0 ) hLR->Fill(ch, sum[ch]); + //printf("%d | sum %d\n", ch, sum[ch]); + } } hLeft->UpdatePlot();