Changeset 3897 for trunk/MagicSoft/Cosy/catalog

Timestamp:

04/29/04 19:48:18 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/catalog

Files:

• SlaPlanets.cc (modified) (2 diffs)
• SlaStars.cc (modified) (1 diff)
• Slalib.cc (modified) (1 diff)
• Slalib.h (modified) (1 diff)

trunk/MagicSoft/Cosy/catalog/SlaPlanets.cc

@@ -19 +19 @@
     Slalib::SetMjd(mjd);
 
-    fTt = mjd + slaDtt(mjd)/60./60./24.;
+    fTt = GetMjd() + slaDtt(GetMjd())/60./60./24.;
 
     //
@@ -28 +28 @@
     double veh[3]; // heliocentric velocity
 
-    slaEvp(mjd + fDt, 2000.0, veb, ceb, veh, fEarth);
+    slaEvp(GetMjd() + fDt, 2000.0, veb, ceb, veh, fEarth);
 }
 

trunk/MagicSoft/Cosy/catalog/SlaStars.cc

@@ -40 +40 @@
 
     // prepare calculation: Mean Place to geocentric apperent
-    slaMappa(2000.0, mjd, fAmprms);        // Epoche, TDB
+    slaMappa(2000.0, GetMjd(), fAmprms);   // Epoche, TDB
 
     // prepare: Apperent to observed place
-    slaAoppa(mjd, 0,                       // mjd, Delta UT=UT1-UTC
-             // GetElong(), GetPhi(), 148, // göttingen long, lat, height
-             GetElong(), GetPhi(), GetHeight(), // göttingen long, lat, height
+    slaAoppa(GetMjd(), 0,                  // mjd, Delta UT=UT1-UTC
+             GetElong(), GetPhi(), GetHeight(), // long, lat, height
              0, 0,                         // polar motion x, y-coordinate (radians)
              // 273.155, 1013.25, 0.5,     // temp, pressure, humidity

trunk/MagicSoft/Cosy/catalog/Slalib.cc

@@ -29 +29 @@
 {
     fTime.SetMjd(mjd);
-    fAlpha = slaGmst(mjd) + GetElong();
-}
+
+    fAlpha = slaGmst(GetMjd()) + GetElong();
+}
+
+void Slalib::Now(double offset)
+{
+    fTime.Now();
+    SetMjd(fTime.GetMjd()+offset/(24*60*60));
+}
+
 
 ZdAz Slalib::XYZ2ZdAz(double coord[3]) const

trunk/MagicSoft/Cosy/catalog/Slalib.h

@@ -23 +23 @@
     virtual void SetMjd(double mjd);
     Double_t GetMjd() const { return fTime.GetMjd(); }
-    void Now() { fTime.Now(); }
+    void Now(double offset=0);
     const MTime &GetTime() const { return fTime; }