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

Timestamp:

02/14/03 23:21:35 (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

@@ -4 +4 @@
 #include <iostream.h>
 
-#include "math.h"           // modf
+#include <math.h>           // modf
 #include "sys/time.h"       // struct timeval
 #include "slalib/slalib.h"  // slacldj
@@ -22 +22 @@
     tv_sec /= 24;
 
-    fDay = tv_sec%365;
-    tv_sec /= 365;
+    Set(tv_sec + 40587);
 
-    fYea = tv_sec+1970;
+    fDiv = fmod((fMs+fSecs)/(60*60*24), 1.0);
+}
 
-    fDay -= (fYea-1972)/4;
+void Timer::Set(const long mjd)
+{
+    //
+    // Express day in Gregorian calendar
+    //  (taken from slalib slaDjcl)
+    //
+    fMjd = mjd;
 
-    int days = fDay;
+    const long jd   = 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;
 
-    fMon=0;
-    do fDay -= fDays[fMon++];
-    while (fDay>0);
-
-    int i=1;
-    while (i<fMon)
-        days -= fDays[i++];
-
-    fDay = days;
-
-    double dummy;
-    fDiv = modf((fMs+fSecs)/(60*60*24), &dummy);
+    fYea = n4/1461 - 4712;
+    fMon = ((nd10/306+2)%12) + 1;
+    fDay = (nd10%306)/10 + 1;
 }
 
@@ -73 +72 @@
     fMon  = t.fMon;
     fYea  = t.fYea;
+    fMjd  = t.fMjd;
+}
+
+void Timer::SetMjd(double mjd)
+{
+    Set((long)mjd);
+
+    fDiv = fmod(mjd, 1.0);
+
+    mjd -= 40587;
+
+    mjd *= 24;
+    fHor = (int)mjd;
+
+    mjd *= 60;
+    fMin = (int)mjd;
+
+    mjd *= 60;
+    fSec = (int)mjd;
+
+    fMs = mjd * 1000;
 }
 
@@ -83 +103 @@
 
     return fMs+fSecs;
-}
-
-double Timer::CalcMjd()
-{
-    int status;
-    double mjd=0;
-    slaCldj(fYea, fMon, fDay, &mjd, &status);
-
-    if (status)
-        cout << "Warning: slaCldj returned " << status << endl;
-
-    return mjd + fDiv;
 }
 
@@ -115 +123 @@
 }
 
-const int Timer::fDays[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};