Changeset 11732 for trunk

Timestamp:

07/31/11 12:03:39 (13 years ago)

Author:

tbretz

Message:

Added a check to make sure that the next run is not started while the previous is still processing.

File:

• trunk/FACT++/src/DataCalib.cc (modified) (8 diffs)

trunk/FACT++/src/DataCalib.cc

@@ -7 +7 @@
 using namespace std;
 
-int DataCalib::fStep = 0;
+int  DataCalib::fStep = 0;
+bool DataCalib::fProcessing = false;
 
 vector<int32_t> DataCalib::fOffset(1440*1024, 0);
@@ -43 +44 @@
 
     fStep = 0;
+    fProcessing = false;
 }
 
@@ -52 +54 @@
 bool DataCalib::Open(RUN_HEAD* h)
 {
+    if (h->NPix != 1440)
+    {
+        fMsg.Error("Number of pixels in header not 1440.");
+        return false;
+    }
+
+    if (h->Nroi != 1024)
+    {
+        fMsg.Error("Region of interest not 1024.");
+        return false;
+    }
+
+    if (fProcessing)
+    {
+        fMsg.Warn("Previous run not yet finished!");
+        return false;
+    }
+
     if (fStep==4)
     {
@@ -58 +78 @@
     }
 
-    if (h->NPix != 1440)
-    {
-        fMsg.Error("Number of pixels in header not 1440.");
-        return false;
-    }
-
-    if (h->Nroi != 1024)
-    {
-        fMsg.Error("Region of interest not 1024.");
-        return false;
-    }
+    fProcessing = true;
 
     ostringstream name;
@@ -76 +86 @@
     Reset();
     InitSize(1440, 1024);
-
-    fFileName = FormFileName(GetRunId(), "drs.fits");
 
     return true;
@@ -117 +125 @@
     file.AddColumn('F', "TriggerOffsetRms", 1024*1440);
 
+    fFileName = FormFileName(GetRunId(), "drs.fits");
+
     if (!file.OpenFile(fFileName))
         return;
@@ -148 +158 @@
     if (!file.WriteData(buf.data(), 1024*1440*sizeof(float)*6+3))
         return;
+
+    ostringstream str;
+    str << "Wrote DRS calibration data (step=" << fStep << ") to '" << fFileName << "'";
+    Info(str.str());
 #endif
 }
@@ -190 +204 @@
         WriteFits();
 
+    fProcessing = false;
+
     fDim.Update(fStats);
-
-    fStep++;
 
     return true;