Changeset 1760 for trunk/MagicSoft/Cosy/base/timer.cc

Timestamp:

02/16/03 17:02:06 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/base/timer.cc (modified) (5 diffs)

trunk/MagicSoft/Cosy/base/timer.cc

@@ -13 +13 @@
     fMs = tv_usec;
 
+    SetMjd((fMs+fSecs)/(60*60*24) + 40587);
+
     fSec  = tv_sec%60;
     tv_sec /= 60;
@@ -22 +24 @@
     tv_sec /= 24;
 
-    Set(tv_sec + 40587);
-
-    fDiv = fmod((fMs+fSecs)/(60*60*24), 1.0);
+//    fDiv = fmod((fMs+fSecs)/(60*60*24), 1.0);
 }
-
+/*
 void Timer::Set(const long mjd)
 {
+    SetMjd(mjd);
+
     //
     // Express day in Gregorian calendar
     //  (taken from slalib slaDjcl)
     //
-    fMjd = mjd;
-
     const long jd   = mjd + 2400001;
     const long n4   = (((((jd*4-17918)/146097)*6)/4+1)/2+jd-37)*4;
@@ -43 +43 @@
     fDay = (nd10%306)/10 + 1;
 }
-
+*/
 void Timer::SetTimer(const struct timeval *tv)
 {
@@ -77 +77 @@
 void Timer::SetMjd(double mjd)
 {
-    Set((long)mjd);
+    //
+    // Express day in Gregorian calendar
+    //  (taken from slalib slaDjcl)
+    //
+    fMjd = mjd;
+
+    const long jd   = (long)mjd + 2400001;
+    const long n4   = (((((jd*4-17918)/146097)*6)/4+1)/2+jd-37)*4;
+    const long nd10 = (((n4-237)%1461)/4)*10+5;
+
+    fYea = n4/1461 - 4712;
+    fMon = ((nd10/306+2)%12) + 1;
+    fDay = (nd10%306)/10 + 1;
 
     fDiv = fmod(mjd, 1.0);
@@ -84 +96 @@
 
     mjd *= 24;
-    fHor = (int)mjd;
+    fHor = (int)fmod(mjd, 24);
 
     mjd *= 60;
-    fMin = (int)mjd;
+    fMin = (int)fmod(mjd, 60);
 
     mjd *= 60;
-    fSec = (int)mjd;
+    fSec = (int)fmod(mjd, 60);
 
-    fMs = mjd * 1000;
+    fMs = fmod(mjd * 1000, 1000);
 }