WebSVN – f9daq – Diff – /lab/sipmscan/trunk/src/connections.cpp

 /*             if( (gScopeDaq->scopeUseType == 1) && (sCamaclink->IsDown()) )
                   StartScopeAcq();*/ // TODO
+            }
             meas_data->Fill();
             n++;
-sleep(1);
             // Start making a scope measurement
 /*          if( (gScopeDaq->scopeUseType == 2) && (sCamaclink->IsDown()) )
+            {
                StartScopeAcq();
       sprintf(cmd, "sudo %s/src/MIKRO/mikro_ctrl -n 3 -r && sudo %s/src/MIKRO/mikro_ctrl -n 3 -i 3 && sudo %s/src/MIKRO/mikro_ctrl -n 3 -h", rootdir, rootdir, rootdir);        // Z-axis
 #if WORKSTAT == 'I'
       retTemp = system(cmd);
       printf("Positioning table reset, initialization and homing complete.\n");
+#else
+      printf("Cmd: %s\n",cmd);
+#endif
+      PositionSet(1);
+   }
+   // Abort any motion
+   else if(opt == 4)
+   {
+      sprintf(cmd, "sudo %s/src/MIKRO/mikro_ctrl -n 1 -c ab", rootdir); // X-axis
+#if WORKSTAT == 'I'
+      printf("Emergency stop of the current movement of all linear tables.\n");
+      retTemp = system(cmd);
+#else
+      printf("Cmd: %s\n",cmd);
+#endif
+      sprintf(cmd, "sudo %s/src/MIKRO/mikro_ctrl -n 2 -c ab", rootdir); // Y-axis
+#if WORKSTAT == 'I'
+      retTemp = system(cmd);
+#else
+      printf("Cmd: %s\n",cmd);
+#endif
+      sprintf(cmd, "sudo %s/src/MIKRO/mikro_ctrl -n 3 -c ab", rootdir); // Z-axis
+#if WORKSTAT == 'I'
+      retTemp = system(cmd);
 #else
       printf("Cmd: %s\n",cmd);
 #endif
       PositionSet(1);
+   }
       retTemp = system(cmd);
       sleep(15);        // wait for the motor to change position from wherever to 0
       sprintf(cmd, "sudo %s/src/MIKRO/mikro_ctrl -n 4 -r && sudo %s/src/MIKRO/mikro_ctrl -n 4 -i 2", rootdir, rootdir);
       retTemp = system(cmd);
       printf("Rotation platform reset, initalization and homing complete.\n");
+#else
+      printf("Cmd: %s\n",cmd);
+#endif
+      RotationSet(1);
+   }
+   // Abort any motion
+   else if(opt == 4)
+   {
+      sprintf(cmd, "sudo %s/src/MIKRO/mikro_ctrl -n 4 -c ab", rootdir);
+#if WORKSTAT == 'I'
+      printf("Emergency stop of the current movement of the rotation platform.\n");
+      retTemp = system(cmd);
 #else
       printf("Cmd: %s\n",cmd);
 #endif
       RotationSet(1);
+   }
+}
 // File browser for selecting the save file
 void TGAppMainFrame::SaveFile()
+{
+//   char *cTemp;
    TGFileInfo file_info;
    const char *filetypes[] = {"Histograms",histextall,0,0};
-   char *cTemp;
    file_info.fFileTypes = filetypes;
-   cTemp = new char[1024];
+//   cTemp = new char[1024];
-   sprintf(cTemp, "%s/results", rootdir);
+//   sprintf(cTemp, "%s/results", rootdir);
-   file_info.fIniDir = StrDup(cTemp);
+//   file_info.fIniDir = StrDup(cTemp);
+   file_info.fIniDir = StrDup(currentMeasDir);
    new TGFileDialog(gClient->GetDefaultRoot(), fMain, kFDSave, &file_info);
-   delete[] cTemp;
+//   delete[] cTemp;
    if(file_info.fFilename != NULL)
+   {
       fileName->widgetTE->SetText(file_info.fFilename);
+      remove_from_last(file_info.fFilename, '/', currentMeasDir);
+   }
+}
 // Start the acquisition
 void TGAppMainFrame::StartAcq()
+{
             // If step is not correctly set, stop the acqusition
             else
+            {
                // TODO
                printf("Stopping current voltage scan...\n");
                gROOT->SetInterrupt();
                measProgress->widgetTB[0]->SetText("Start acquisition");
                acqStarted = false;
                repetition = 0;
+            }
+         }
          if(DBGSIG) printf("StartAcq(): Voltage repetition (%lf,%lf,%lf) = %d\n", minVoltage, maxVoltage, stepVoltage, repetition);
          measProgress->widgetTB[0]->SetText("Stop acquisition");
          acqStarted = true;
          progVal = 0.00;
          measProgress->widgetPB->SetPosition(progVal);
          gVirtualX->Update(1);
+         int nrAverMeas = -1;
          clkt0 = clock();
          timet0 = time(NULL);
          // Scan over Z axis
                   else if( repetX == 0 ) break;
                   progVal = (float)(100.00/(abs(repetX)*abs(repetY)*abs(repetZ)))*(k*abs(repetX)*abs(repetY) + j*abs(repetX) + i);
                   measProgress->widgetPB->SetPosition(progVal);
-                  TimeEstimate(clkt0, timet0, progVal, cmd, doublewait*((abs(repetX)+2)*abs(repetY)+2)*abs(repetZ));
+//                TimeEstimate(clkt0, timet0, progVal, cmd, doublewait*((abs(repetX)+2)*abs(repetY)+2)*abs(repetZ));
-                  measProgress->widgetTE->SetText(cmd);
+//                measProgress->widgetTE->SetText(cmd);
                   gVirtualX->Update(1);
                   // X-axis change
                   if( posUnits->widgetCB->GetSelected() == 0)
 #endif
                   fflush(stdout);
                   printf("Next X position...\n");
                   fflush(stdout);
+TimeEstimateNew(nrAverMeas, clkt0, timet0, repetX, repetY, repetZ, doublewait, 2*doublewait, 2*doublewait, cmd);
+measProgress->widgetTE->SetText(cmd);
                   printf("Waiting for position change...\n");
                   sleep(doublewait);
                   xPos->widgetNE[0]->SetNumber(minXpos + stepXpos*i);
                   printf("Continuing...\n");
                // Here comes function to start histogramming <<<<<<<<<<<<<<<<<<<<<<<<
+clkt0 = clock();
                   RunMeas((void*)0, (j*repetX + i), scanon);
+nrAverMeas++;
                   fflush(stdout);
                   i++;
+               }
    const char *filetypes[] = {"Histograms",histextall,0,0};
    file_info.fFileTypes = filetypes;
 //   cTemp = new char[1024];
 //   sprintf(cTemp, "%s/results", rootdir);
 //   file_info.fIniDir = StrDup(cTemp);
-   file_info.fIniDir = StrDup(currentOpenDir);
+   file_info.fIniDir = StrDup(currentAnalDir);
    file_info.fMultipleSelection = kTRUE;
    new TGFileDialog(gClient->GetDefaultRoot(), fMain, kFDOpen, &file_info);
 //   delete[] cTemp;
    TList *files = file_info.fFileNamesList;
       TString fname;
       TIter next(files);
       while(file=(TSystemFile*)next())
+      {
          fname = file->GetName();
-         remove_from_last((char*)fname.Data(), '/', currentOpenDir);
+         remove_from_last((char*)fname.Data(), '/', currentAnalDir);
          fileList->AddEntry(fname.Data(), i);
          i++;
+      }
+   }
    fileList->Layout();

Subversion Repositories f9daq

(root)/lab/sipmscan/trunk/src/connections.cpp – Rev 167 → 172