tested endRunScript, fixed autoRun

ClassDigitizer2Gen.cpp

@@ -308,7 +308,7 @@ void Digitizer2Gen::SetPHADataFormat(unsigned short dataFormat){
   if( evt ) delete evt;
   evt = new Event();
   evt->SetDataType(dataFormat);
-  dataStartIndetifier += dataFormat;
+  dataStartIndetifier = 0xAAA0 + dataFormat;
 
   if( dataFormat == 0 ){  
     ret = CAEN_FELib_SetReadDataFormat(ep_handle, 

SOLARISpanel.cpp

@@ -42,7 +42,7 @@ SOLARISpanel::SOLARISpanel(Digitizer2Gen **digi, unsigned short nDigi,
   printf("################################# \n");
   for( int i = 0; i < (int) mapping.size() ; i++){
     for( int j = 0; j < (int) mapping[i].size(); j++ ){
-      printf("%3d,", mapping[i][j]);
+      printf("%4d,", mapping[i][j]);
       QList<int> haha ;
       haha << mapping[i][j] << ((i << 8 ) + j);
       if( mapping[i][j] >= 0 ) detIDListTemp <<  haha;

mainwindow.cpp

@@ -362,12 +362,19 @@ void MainWindow::StartACQ(){
 
       if(result == QDialog::Accepted ){
         startComment = lineEdit->text();
-        if( startComment == "") startComment = "Start Comment: No commet was typed.";
+        if( startComment == "") startComment = "No commet was typed.";
-        leRunComment->setText("Start Comment: " + startComment);
+        startComment = "Start Comment: " + startComment;
       }else{
         LogMsg("Start Run aborted. ");
         return;
       }
+
+      if( cbAutoRun -> currentData().toInt() != 0 ){
+        startComment = startComment +  ". AutoRun for " + cbAutoRun->currentText();
+      }
+
+      leRunComment->setText(startComment);
+
     }else{
       //==========TODO auto run comment
       startComment = "AutoRun for " + cbAutoRun->currentText();
@@ -461,14 +468,14 @@ void MainWindow::StopACQ(){
 
       if(result == QDialog::Accepted ){
         stopComment = lineEdit->text();
-        if( stopComment == "") stopComment = "Stop Comment: No commet was typed.";
+        if( stopComment == "") stopComment = "No commet was typed.";
-        leRunComment->setText("Stop Comment: " + stopComment);
+        stopComment = "Stop Comment: " + stopComment;
+        leRunComment->setText(stopComment);
       }else{
         LogMsg("Cancel Run aborted. ");
         return;
       }
     }else{
-      //TODO ============= 
       stopComment = "End of AutoRun for " + cbAutoRun->currentText();
       leRunComment->setText(stopComment);
     }
@@ -515,10 +522,7 @@ void MainWindow::StopACQ(){
         + "======================";
     AppendElog(msg, chromeWindowID);
 
-
+    QProcess::startDetached(settingFilePath + "/scripts/endRunScript.sh");
-    QProcess endRunScript;
-    endRunScript.start("/bin/bash", QStringList() << "scripts/endRunScript.sh");
-    //endRunScript.waitForFinished();
 
   }else{
     LogMsg("===========================  no-Save Run stopped.");
@@ -543,25 +547,27 @@ void MainWindow::AutoRun(){
   }
 
   needManualComment = true;
-  isRunning = true;
   ///=========== infinite single run
   if( cbAutoRun->currentData().toInt() == 0 ){
     StartACQ();
+    disconnect(runTimer,  &QTimer::timeout, nullptr, nullptr);
   }else{
     StartACQ();
     connect(runTimer, &QTimer::timeout, this, [=](){
-      if( isRunning ){
+      StopACQ();
-        StopACQ();
+      if( cbAutoRun->currentData().toInt() > 0 ) {
-        isRunning = false;
+        bnStartACQ->setEnabled(true);
-        if( cbAutoRun->currentData().toInt() > 0 ) {
+        bnStopACQ->setEnabled(false);
-          bnStartACQ->setEnabled(true);
+        bnComment->setEnabled(false);
-          bnStopACQ->setEnabled(false);
+      }else{
-          bnComment->setEnabled(false);
+
-        }
+        LogMsg("Wait for 10 sec for next Run....");
-      }else {
+        elapsedTimer.invalidate();
+        elapsedTimer.start();
+        while(elapsedTimer.elapsed() < 10000) QCoreApplication::processEvents();
+
         StartACQ();
-        isRunning = true;
+      } 
-      }
     });
   }
 
@@ -818,7 +824,7 @@ bool MainWindow::CheckSOLARISpanelOK(){
   while (!in.atEnd()) {
     QString line = in.readLine();
     if( line.contains("//^")) continue;
-    if( line.contains("//*=")){
+    if( line.contains("//C=")){
       int in1 = line.indexOf("{");
       int in2 = line.lastIndexOf("}");
       if( in2 > in1){
@@ -829,7 +835,7 @@ bool MainWindow::CheckSOLARISpanelOK(){
         return false;
       }
     }
-    if( line.contains("//*#")){
+    if( line.contains("//C#")){
       int in1 = line.indexOf("{");
       int in2 = line.lastIndexOf("}");
       if( in2 > in1){
@@ -841,12 +847,12 @@ bool MainWindow::CheckSOLARISpanelOK(){
         return false;
       }
     }
-    if( line.contains("//* ") ) {
+    if( line.contains("//C ") ) {
       startRecord = true;
       singleDigiMap.clear();
       continue;
     }
-    if( startRecord && line.contains("//*----")){
+    if( startRecord && line.contains("//C----")){
       startRecord = false;
       mapping.push_back(singleDigiMap);
       continue;
@@ -1918,7 +1924,7 @@ void MainWindow::WriteElog(QString htmlText, QString subject, QString category,
   QStringList arg;
   arg << "-h" << ElogIP << "-p" << "8080" << "-l" << expName << "-u" << "GeneralSOLARIS" << "solaris" 
       << "-a" << "Author=\'General SOLARIS\'" ;
-  if( runNumber > 0 ) arg << "-a" << "Run=" + QString::number(runNumber);
+  if( runNumber > 0 ) arg << "-a" << "RunNo=" + QString::number(runNumber);
   if( category != "" ) arg << "-a" << "Category=" + category;
 
   arg << "-a" << "Subject=" + subject 

mainwindow.h

@@ -12,6 +12,7 @@
 #include <QComboBox>
 #include <QLabel>
 #include <QTimer>
+#include <QThread>
 
 #include <QChart>
 #include <QLineSeries>
@@ -140,6 +141,7 @@ private:
   bool needManualComment;
   bool isRunning;
   QTimer * runTimer;
+  QElapsedTimer elapsedTimer;
   unsigned int autoRunStartRunID;
 
   //@----- digi Setting panel
@@ -192,6 +194,7 @@ private:
   //@------ custom comment;
   QPushButton * bnComment;
   void AppendComment();
+
 };
 
 

scripts/endRunScript.sh

@@ -3,6 +3,6 @@
 echo "################# end Run Script"
 
 #xterm -T endRunScript -hold -geometry 100x20+0+0  -sb  -sl 1000 -e "Process_Run" "lastRun"
-xterm -T endRunScript -geometry 100x20+0+0  -sb  -sl 1000 -e "Process_Run" "lastRun" "2"
+xterm -T endRunScript -geometry 100x20+0+0  -sb  -sl 1000 -e "source ~/Analysis/SOLARIS.sh; Process_Run lastRun 2 0"
 
 echo "################# done"