Changeset 12618

Timestamp:

11/22/11 23:39:34 (13 years ago)

Author:

tbretz

Message:

Implemented Time::UnixDate and use this instead of UnixTime when writing TSTART and TSTOP in FITS header -- units there are days not seconds.

Location:

trunk/FACT++/src

Files:

• DataWriteFits.cc (modified) (1 diff)
• Fits.cc (modified) (2 diffs)
• Time.cc (modified) (1 diff)
• Time.h (modified) (1 diff)

trunk/FACT++/src/DataWriteFits.cc

@@ -246 +246 @@
         const Time stop (fTstop[0],  fTstop[1]);
 
-        fFile.WriteKey("TSTARTI",  floor(start.UnixTime()),
+        fFile.WriteKey("TSTARTI",  uint32_t(floor(start.UnixDate())),
                        "Time when first event received (integral part)");
-        fFile.WriteKey("TSTARTF",  fmod(start.UnixTime(), 1),
+        fFile.WriteKey("TSTARTF",  fmod(start.UnixDate(), 1),
                        "Time when first event received (fractional part)");
-        fFile.WriteKey("TSTOPI",   floor(stop.UnixTime()),
+        fFile.WriteKey("TSTOPI",   uint32_t(floor(stop.UnixDate())),
                        "Time when last event received (integral part)");
-        fFile.WriteKey("TSTOPF",   fmod(stop.UnixTime(), 1),
+        fFile.WriteKey("TSTOPF",   fmod(stop.UnixDate(), 1),
                        "Time when last event received (fractional part)");
         fFile.WriteKey("DATE-OBS", start.Iso(),

trunk/FACT++/src/Fits.cc

@@ -322 +322 @@
         const double doubleValue = *reinterpret_cast<double*>(fStandardPointers[0]);
 
-        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)");
+        const double start = Time(doubleValue).UnixDate();
+        const double stop  = Time(fEndMjD).UnixDate();
+
+        fFile->WriteKeyNT("TSTARTI", uint32_t(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",  uint32_t(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(),
@@ -353 +353 @@
     if (fFile->IsOpen() && fFile->IsOwner())
     {
-        const double stop = Time(fEndMjD).UnixTime();
+        const double stop = Time(fEndMjD).UnixDate();
 
         // FIMXE: Check for error? (It is allowed that fFile is NULL)
-        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("TSTOPI", uint32_t(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(),

trunk/FACT++/src/Time.cc

@@ -186 +186 @@
 // --------------------------------------------------------------------------
 //
+// @returns days since 1970/1/1
+//
+double Time::UnixDate() const
+{
+    return (date().modjulian_day()-40587) + SecondsOfDay()/(24*60*60);
+}
+
+// --------------------------------------------------------------------------
+//
 // @returns seconds since 1970/1/1
 //

trunk/FACT++/src/Time.h

@@ -98 +98 @@
     time_t Time_t() const;
     double UnixTime() const;
+    double UnixDate() const;
     double RootTime() const;