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

bugfix NeutronGamma; if scalarThred running + Analyzer created -> start updateHistograms thread

Browse Source
This commit is contained in:
Ryan Tang 2024-08-22 12:42:08 -04:00
parent 82de3763a9
commit 1cb60d1aa4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FSUDAQ.cpp
View File

@ -1833,6 +1833,9 @@ void FSUDAQ::OpenAnalyzer(){
if( id == 4 ) onlineAnalyzer = new MUSIC(digi, nDigi); if( id == 4 ) onlineAnalyzer = new MUSIC(digi, nDigi);
if( id == 5 ) onlineAnalyzer = new NeutronGamma(digi, nDigi, rawDataPath); if( id == 5 ) onlineAnalyzer = new NeutronGamma(digi, nDigi, rawDataPath);
if( id >= 0 ) onlineAnalyzer->show(); if( id >= 0 ) onlineAnalyzer->show();
if( scalarThread->isRunning() ) onlineAnalyzer->StartThread();
}else{ }else{
delete onlineAnalyzer; delete onlineAnalyzer;
@ -1842,11 +1845,12 @@ void FSUDAQ::OpenAnalyzer(){
if( id == 2 ) onlineAnalyzer = new Encore(digi, nDigi); if( id == 2 ) onlineAnalyzer = new Encore(digi, nDigi);
if( id == 3 ) onlineAnalyzer = new RAISOR(digi, nDigi); if( id == 3 ) onlineAnalyzer = new RAISOR(digi, nDigi);
if( id == 4 ) onlineAnalyzer = new MUSIC(digi, nDigi); if( id == 4 ) onlineAnalyzer = new MUSIC(digi, nDigi);
if( id == 4 ) onlineAnalyzer = new NeutronGamma(digi, nDigi, rawDataPath); if( id == 5 ) onlineAnalyzer = new NeutronGamma(digi, nDigi, rawDataPath);
if( id >= 0 ){ if( id >= 0 ){
onlineAnalyzer->show(); onlineAnalyzer->show();
onlineAnalyzer->activateWindow(); onlineAnalyzer->activateWindow();
if( scalarThread->isRunning() ) onlineAnalyzer->StartThread();
} }
} }

2
analyzers/NeutronGamma.h
View File

@ -118,7 +118,6 @@ inline void NeutronGamma::SetUpCanvas(){
connect( cbDigi, &RComboBox::currentIndexChanged, this, [=](int index){ connect( cbDigi, &RComboBox::currentIndexChanged, this, [=](int index){
isSignalSlotActive = false; isSignalSlotActive = false;
cbCh->clear(); cbCh->clear();
cbCh->addItem("All Ch", digi[index]->GetNumInputCh() );
for( int i = 0; i < digi[index]->GetNumInputCh(); i++) cbCh->addItem("ch-" + QString::number( i ), i); for( int i = 0; i < digi[index]->GetNumInputCh(); i++) cbCh->addItem("ch-" + QString::number( i ), i);
hist2D->Clear(); hist2D->Clear();
@ -185,6 +184,7 @@ inline void NeutronGamma::ClearInternalDataCount(){
} }
inline void NeutronGamma::UpdateHistograms(){ inline void NeutronGamma::UpdateHistograms(){
printf("%s | %d \n", __func__, fillHistograms);
if( !fillHistograms ) return; if( !fillHistograms ) return;
if( this->isVisible() == false ) return; if( this->isVisible() == false ) return;