Changeset 15009

Timestamp:

03/10/13 12:02:29 (12 years ago)

Author:

tbretz

Message:

Replaced WriteFitsImp by fData.WriteFitsImp; added storage of begin and end time of runs in the corresponding new data members; when the dim service is updated, use a reasonable time-stamp for it.

File:

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

trunk/FACT++/src/DataCalib.cc

@@ -45 +45 @@
 
     fData.fStep = 1;
+    fData.fDateRunBeg[2] = "1970-01-01T00:00:00";
+    fData.fDateRunEnd[2] = "1970-01-01T00:00:00";
+    fData.fDateEnd = fDateRunEnd[1];
     Update(dim, runs);
     fData.fStep = 2;
@@ -75 +78 @@
 #warning Time marker channels not sent
 
+    const Time time(fData.fDateObs);
+
     dim.setQuality(fData.fStep);
-    dim.Update(buf);
+    dim.setData(buf);
+    dim.Update(time);
 
     runs.setQuality(fData.fStep);
     runs.setData(buf.data(), 4*sizeof(uint32_t));
-    runs.Update();
+    runs.Update(time);
 }
 
@@ -212 +218 @@
     }
 }
-
+/*
 void DataCalib::WriteFitsImp(const string &filename, const vector<float> &vec) const
 {
@@ -262 +268 @@
     file.WriteRow(vec.data()+1, n*sizeof(float));
 }
-
+*/
 bool DataCalib::Close(RUN_TAIL *tail)
 {
@@ -313 +319 @@
     }
 
+    const Time beg(fTstart[0], fTstart[1]);
+    const Time end(fTstop[0],  fTstop[1]);
+
+    if (fData.fStep==0)
+        fData.fDateObs = beg;
+    fData.fDateEnd = end;
+
+    fData.fDateRunBeg[fData.fStep] = beg;
+    fData.fDateRunEnd[fData.fStep] = end;
+
     if (fData.fStep<=2)
     {
@@ -318 +334 @@
         try
         {
-            WriteFitsImp(filename, fStats);
+            fData.WriteFitsImp(filename, fStats);
+
+            //WriteFitsImp(filename, fStats);
 
             ostringstream str;