Changeset 10460

Timestamp:

04/26/11 11:35:40 (14 years ago)

Author:

tbretz

Message:

Moved common part of Mjd(), GetUnixTime() into SecondsOfDay(); renamed GetUnixTime to UnixTime() and added RootTime()

Location:

trunk/FACT++/src

Files:

• Time.cc (modified) (3 diffs)
• Time.h (modified) (1 diff)

trunk/FACT++/src/Time.cc

@@ -130 +130 @@
 }
 
+double_t Time::SecondsOfDay() const
+{
+    const time_duration tod = time_of_day();
+
+    const int exp = tod.num_fractional_digits();
+
+    const double frac = tod.fractional_seconds()/pow(10, exp);
+    const double sec  = tod.total_seconds()+frac;
+
+    return sec;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -141 +153 @@
 double Time::Mjd() const
 {
-    const time_duration tod = time_of_day();
-
-    const int exp = tod.num_fractional_digits();
-
-    const double frac = tod.fractional_seconds()/pow(10, exp);
-    const double sec  = tod.total_seconds()+frac;
-
-    return date().modjulian_day()+sec/(24*60*60);
+    return date().modjulian_day()+SecondsOfDay()/(24*60*60);
 
     /*
@@ -161 +166 @@
 // Return seconds since 1970/1/1
 //
-time_t Time::GetUnixTime() const
-{
-    const time_duration unx = *this - ptime(fUnixOffset);
-    return unx.total_seconds();
+double Time::UnixTime() const
+{
+    return (date().modjulian_day()-40587)*24*60*60 + SecondsOfDay();
+}
+
+double Time::RootTime() const
+{
+    return (date().modjulian_day()-49718)*24*60*60 + SecondsOfDay();
 }
 

trunk/FACT++/src/Time.h

@@ -91 +91 @@
     unsigned int   us() const { return time_of_day().total_microseconds()%1000000; }
 
-    time_t GetUnixTime() const;
+    double SecondsOfDay() const;
 
+    double UnixTime() const;
+    double RootTime() const;
 };