Changeset 10252 for trunk/FACT++/src/Time.cc

Timestamp:

03/23/11 10:47:22 (11 years ago)

Author:

tbretz

Message:

Added new manipulators with out the fractional part of the seconds and fixed setting of MJD.

File:

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

trunk/FACT++/src/Time.cc

@@ -35 +35 @@
 
 // strftime
-const _time_format Time::reset = 0;
-const _time_format Time::def   = "%c";
-const _time_format Time::std   = "%x %X%F";
-const _time_format Time::sql   = "%Y-%m-%d %H:%M:%S.%f";
-const _time_format Time::iso   = "%Y%m%dT%H%M%S%F%q";
-const _time_format Time::magic = "%Y %m %d %H %M %S %f";
+const _time_format Time::reset  = 0;
+const _time_format Time::def    = "%c";
+const _time_format Time::std    = "%x %X%F";
+const _time_format Time::sql    = "%Y-%m-%d %H:%M:%S.%f";
+const _time_format Time::ssql   = "%Y-%m-%d %H:%M:%S";
+const _time_format Time::iso    = "%Y%m%dT%H%M%S%F%q";
+const _time_format Time::magic  = "%Y %m %d %H %M %S %f";
+const _time_format Time::smagic = "%Y %m %d %H %M %S";
 
 /*
@@ -118 +120 @@
 void Time::Mjd(double mjd)
 {
+    // Convert MJD to seconds since offset
     mjd -= 40587;
     mjd *= 24*60*60;
@@ -141 +144 @@
 
     const int exp = tod.num_fractional_digits();
-    const double sec = tod.fractional_seconds()/pow(10, exp);
+
+    const double frac = tod.fractional_seconds()/pow(10, exp);
+    const double sec  = tod.total_seconds()+frac;
 
     return date().modjulian_day()+sec/(24*60*60);