diff --git a/ClassDigitizer.cpp b/ClassDigitizer.cpp
index 4fd7db6..061b7e8 100644
--- a/ClassDigitizer.cpp
+++ b/ClassDigitizer.cpp
@@ -279,7 +279,9 @@ int Digitizer::CloseDigitizer(){
isConnected = false;
ret = CAEN_DGTZ_SWStopAcquisition(handle);
printf("-------- Closing Digtizer Board : %d Port : %d \n", boardID, portID);
- printf(" Model %s with handle %d using %s\n", BoardInfo.ModelName, handle, LinkType == CAEN_DGTZ_USB ? "USB" : "Optical Link");
+ if( LinkType == CAEN_DGTZ_USB ) printf(" Model %s with handle %d using USB\n", BoardInfo.ModelName, handle);
+ if( LinkType == CAEN_DGTZ_OpticalLink ) printf(" Model %s with handle %d using Optical Fiber\n", BoardInfo.ModelName, handle);
+ if( LinkType == CAEN_DGTZ_USB_A4818 ) printf(" Model %s with handle %d using A4818\n", BoardInfo.ModelName, handle);
ret |= CAEN_DGTZ_CloseDigitizer(handle);
return ret;
diff --git a/FSUDAQ.cpp b/FSUDAQ.cpp
index bb89c18..21b8856 100644
--- a/FSUDAQ.cpp
+++ b/FSUDAQ.cpp
@@ -1171,8 +1171,8 @@ void FSUDAQ::StartACQ(){
}
lbScalarACQStatus->setText("ACQ On");
- if( singleHistograms ) singleHistograms->startWork();
- if( onlineAnalyzer ) onlineAnalyzer->startWork();
+ if( singleHistograms ) singleHistograms->startTimer();
+ if( onlineAnalyzer ) onlineAnalyzer->startTimer();
bnStartACQ->setEnabled(false);
bnStartACQ->setStyleSheet("");
@@ -1240,8 +1240,8 @@ void FSUDAQ::StopACQ(){
}
if( scalar ) scalarTimer->stop();
- if( singleHistograms ) singleHistograms->stopWork();
- if( onlineAnalyzer ) onlineAnalyzer->stopWork();
+ if( singleHistograms ) singleHistograms->stopTimer();
+ if( onlineAnalyzer ) onlineAnalyzer->stopTimer();
lbScalarACQStatus->setText("ACQ Off");
@@ -1734,8 +1734,8 @@ void FSUDAQ::OpenScope(){
scalarTimer->start(ScalarUpdateinMiliSec);
}
- if( singleHistograms ) singleHistograms->startWork();
- if( onlineAnalyzer ) onlineAnalyzer->startWork();
+ if( singleHistograms ) singleHistograms->startTimer();
+ if( onlineAnalyzer ) onlineAnalyzer->startTimer();
}else{
if( influx && chkInflux->isChecked() && !elogName.isEmpty()) influx->AddDataPoint("SavingData,ExpName=" + elogName.toStdString() + " value=0");
@@ -1745,8 +1745,8 @@ void FSUDAQ::OpenScope(){
scalarTimer->stop();
}
- if( singleHistograms ) singleHistograms->stopWork();
- if( onlineAnalyzer ) onlineAnalyzer->stopWork();
+ if( singleHistograms ) singleHistograms->stopTimer();
+ if( onlineAnalyzer ) onlineAnalyzer->stopTimer();
}
@@ -1818,7 +1818,7 @@ void FSUDAQ::OpenAnalyzer(){
if( id == 5 ) onlineAnalyzer = new NeutronGamma(digi, nDigi, rawDataPath);
if( id >= 0 ) onlineAnalyzer->show();
- if( isACQStarted ) onlineAnalyzer->startWork();
+ if( isACQStarted ) onlineAnalyzer->startTimer();
}else{
@@ -1834,7 +1834,7 @@ void FSUDAQ::OpenAnalyzer(){
if( id >= 0 ){
onlineAnalyzer->show();
onlineAnalyzer->activateWindow();
- if( isACQStarted ) onlineAnalyzer->stopWork();
+ if( isACQStarted ) onlineAnalyzer->stopTimer();
}
}
diff --git a/SingleSpectra.h b/SingleSpectra.h
index 4e1be36..9a0d19d 100644
--- a/SingleSpectra.h
+++ b/SingleSpectra.h
@@ -46,11 +46,11 @@ public:
public slots:
void FillHistograms();
void ChangeHistView();
- void startWork(){
+ void startTimer(){
// printf("timer start\n");
timer->start(maxFillTimeinMilliSec);
}
- void stopWork(){
+ void stopTimer(){
// printf("timer stop\n");
timer->stop();
ClearInternalDataCount();
diff --git a/analyzers/Analyser.h b/analyzers/Analyser.h
index 436120f..75dade6 100644
--- a/analyzers/Analyser.h
+++ b/analyzers/Analyser.h
@@ -64,13 +64,13 @@ public:
virtual void UpdateHistograms(); // where event-building, analysis, and ploting
public slots:
- void startWork(){
+ void startTimer(){
// printf("start timer\n");
mb->ForceStop(false);
mb->ClearEvents();
anaTimer->start(waitTimeinSec*1000);
}
- void stopWork(){
+ void stopTimer(){
// printf("stop worker\n");
anaTimer->stop();
mb->ForceStop(true);
diff --git a/main.cpp b/main.cpp
index bdaee58..22e28cb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,6 +3,7 @@
#include
#include
#include
+#include
#include "FSUDAQ.h"
@@ -27,6 +28,8 @@ int main(int argc, char *argv[]){
// CustomApplication a(argc, argv);
QApplication a(argc, argv);
+ QLocale::setDefault(QLocale::system());
+
setpriority(PRIO_PROCESS, 0, -20);
bool isLock = false;