diff --git a/FSUDAQ.cpp b/FSUDAQ.cpp index bf3728a..b543c17 100644 --- a/FSUDAQ.cpp +++ b/FSUDAQ.cpp @@ -1833,6 +1833,9 @@ void FSUDAQ::OpenAnalyzer(){ if( id == 4 ) onlineAnalyzer = new MUSIC(digi, nDigi); if( id == 5 ) onlineAnalyzer = new NeutronGamma(digi, nDigi, rawDataPath); if( id >= 0 ) onlineAnalyzer->show(); + + if( scalarThread->isRunning() ) onlineAnalyzer->StartThread(); + }else{ delete onlineAnalyzer; @@ -1842,11 +1845,12 @@ void FSUDAQ::OpenAnalyzer(){ if( id == 2 ) onlineAnalyzer = new Encore(digi, nDigi); if( id == 3 ) onlineAnalyzer = new RAISOR(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 ){ onlineAnalyzer->show(); onlineAnalyzer->activateWindow(); + if( scalarThread->isRunning() ) onlineAnalyzer->StartThread(); } } diff --git a/analyzers/NeutronGamma.h b/analyzers/NeutronGamma.h index 6b505ed..cdc1c18 100644 --- a/analyzers/NeutronGamma.h +++ b/analyzers/NeutronGamma.h @@ -118,7 +118,6 @@ inline void NeutronGamma::SetUpCanvas(){ connect( cbDigi, &RComboBox::currentIndexChanged, this, [=](int index){ isSignalSlotActive = false; 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); hist2D->Clear(); @@ -185,6 +184,7 @@ inline void NeutronGamma::ClearInternalDataCount(){ } inline void NeutronGamma::UpdateHistograms(){ + printf("%s | %d \n", __func__, fillHistograms); if( !fillHistograms ) return; if( this->isVisible() == false ) return;