delete the timing thread in Analyzer
This commit is contained in:
parent
e780345557
commit
82de3763a9
|
@ -43,6 +43,16 @@ Analyzer::Analyzer(Digitizer ** digi, unsigned int nDigi, QMainWindow * parent )
|
||||||
}
|
}
|
||||||
|
|
||||||
Analyzer::~Analyzer(){
|
Analyzer::~Analyzer(){
|
||||||
|
|
||||||
|
if( buildTimerThread ){
|
||||||
|
if( !buildTimerThread->isStopped() ){
|
||||||
|
buildTimerThread->Stop();
|
||||||
|
buildTimerThread->quit();
|
||||||
|
buildTimerThread->wait();
|
||||||
|
}
|
||||||
|
delete buildTimerThread;
|
||||||
|
}
|
||||||
|
|
||||||
delete influx;
|
delete influx;
|
||||||
delete mb;
|
delete mb;
|
||||||
delete [] dataList;
|
delete [] dataList;
|
||||||
|
|
|
@ -167,7 +167,7 @@ inline void NeutronGamma::SetUpCanvas(){
|
||||||
// }
|
// }
|
||||||
// histLayout->addWidget(hist2D[0][0], 0, 0);
|
// histLayout->addWidget(hist2D[0][0], 0, 0);
|
||||||
|
|
||||||
hist2D = new Histogram2D("Neutron-Gamma", "PSD = (l-s)/l", "Short Energy [ch]", nBin, eMin, eMax, nBin, 0, 1);
|
hist2D = new Histogram2D("Neutron-Gamma", "Long Energy [ch]", "PSD = (l-s)/l", nBin, eMin, eMax, nBin, 0, 1);
|
||||||
|
|
||||||
histLayout->addWidget(hist2D, 0, 0);
|
histLayout->addWidget(hist2D, 0, 0);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user