Changeset 1760 for trunk/MagicSoft/Cosy/base

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/base

Files:

• MStarList.h (modified) (1 diff)
• coord.h (modified) (1 diff)
• timer.cc (modified) (5 diffs)
• timer.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/base/MStarList.h

@@ -20 +20 @@
         new (fStars[idx]) MStar(meanx, meany, mag);
     }
-    void Add(Double_t meanx, Double_t meany, Double_t mag)
+    void Add(Double_t meanx, Double_t meany, Double_t mag=0)
     {
         AddAt(fStars.GetLast()+1, meanx, meany, mag);

trunk/MagicSoft/Cosy/base/coord.h

@@ -5 +5 @@
 #include <fstream.h>
 
+#include "MAGIC.h"
+
 /* pi/180:  degrees to radians */
 const double kDeg2Rad = 0.017453292519943295769236907684886127134428718885417;
 
 /* 180/pi:  radians to degrees */
-const double kRad2Deg = 57.295779513082320876798154814105170332405472466564;
+//const double kRad2Deg = 57.295779513082320876798154814105170332405472466564;
 
 /* pi/2:  90 degrees in radians */

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);
 }
 

trunk/MagicSoft/Cosy/base/timer.h

@@ -22 +22 @@
     char fDateStr[30];
 
-    void Set(const long mjd);
+    //void Set(const long mjd);
 
 public:
@@ -36 +36 @@
 
     double Now(); //[s]
-    double GetMjd() const { return fMjd+fDiv; }
+    double GetMjd() const { return fMjd/*+fDiv*/; }
 
     virtual void SetMjd(double mjd);