Changeset 12616

Timestamp:

11/22/11 14:13:53 (13 years ago)

Author:

tbretz

Message:

Changed TSTART/TSTOP according to match the latest changes in the raw data header.

File:

• trunk/FACT++/src/Fits.cc (modified) (3 diffs)

trunk/FACT++/src/Fits.cc

@@ -238 +238 @@
         return false;
 
-    if (!fFile->WriteKeyNT("TSTART", "", "Time of the first receied data"))
-        return false;
-
-    if (!fFile->WriteKeyNT("TSTOP",  "", "Time of the last receied data"))
+    if (!fFile->WriteKeyNT("TSTARTI",  0, "Time when first event received (integral part)")   ||
+        !fFile->WriteKeyNT("TSTARTF",  0, "Time when first event received (fractional part)") ||
+        !fFile->WriteKeyNT("TSTOPI",   0, "Time when last event received (integral part)")    ||
+        !fFile->WriteKeyNT("TSTOPF",   0, "Time when last event received (fractional part)")  ||
+        !fFile->WriteKeyNT("DATE-OBS", 0, "Time when first event received") ||
+        !fFile->WriteKeyNT("DATE-END", 0, "Time when last event received"))
         return false;
 
@@ -319 +321 @@
         // FIXME: Check error?
         const double doubleValue = *reinterpret_cast<double*>(fStandardPointers[0]);
-        fFile->WriteKeyNT("TSTART", Time(doubleValue).Iso(),
-                          "Time of the first received data");
-        fFile->WriteKeyNT("TSTOP", Time(fEndMjD).Iso(),
-                          "Time of the last receied data");
+
+        const double start = Time(doubleValue).UnixTime();
+        const double stop  = Time(fEndMjD).UnixTime();
+
+        fFile->WriteKeyNT("TSTARTI", floor(start),   "Time when first event received (integral part)");
+        fFile->WriteKeyNT("TSTARTF", fmod(start, 1), "Time when first event received (fractional part)");
+        fFile->WriteKeyNT("TSTOPI",  floor(stop),    "Time when last event received (integral part)");
+        fFile->WriteKeyNT("TSTOPF",  fmod(stop, 1),  "Time when last event received (fractional part)");
+
+        fFile->WriteKeyNT("DATE-OBS", Time(doubleValue).Iso(),
+                          "Time when first event received");
+
+        fFile->WriteKeyNT("DATE-END", Time(fEndMjD).Iso(),
+                          "Time when last event received");
     }
     fEndMjD = *reinterpret_cast<double*>(fStandardPointers[0]);
@@ -341 +353 @@
     if (fFile->IsOpen() && fFile->IsOwner())
     {
+        const double stop = Time(fEndMjD).UnixTime();
+
         // FIMXE: Check for error? (It is allowed that fFile is NULL)
-        fFile->WriteKeyNT("TSTOP", Time(fEndMjD).Iso(),
-                          "Time of the last receied data");
+        fFile->WriteKeyNT("TSTOPI", floor(stop),   "Time when last event received (integral part)");
+        fFile->WriteKeyNT("TSTOPF", fmod(stop, 1), "Time when last event received (fractional part)");
+
+        fFile->WriteKeyNT("DATE-END", Time(fEndMjD).Iso(),
+                          "Time when last event received");
     }