Changeset 10021 for trunk

Timestamp:

10/21/10 11:15:34 (14 years ago)

Author:

tbretz

Message:

Added conversion from apparent to mean place for celestial objects to get the meaning of Ra/Dec consistent with the ones in the base classes.

Location:

trunk/Cosy/catalog

Files:

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

trunk/Cosy/catalog/SlaPlanets.cc

@@ -33 +33 @@
 // coordinates of planet: topocentric, equatorial, J2000
 //
-RaDec SlaPlanets::CalcPlanetRaDec(ePlanets_t planet)
+RaDec SlaPlanets::CalcPlanetRaDec(ePlanets_t planet) const
 {
     // coordinates of planet: topocentric, equatorial, J2000
@@ -42 +42 @@
     slaRdplan(GetTT(), planet, GetElong(), GetPhi(), &ra, &dec, &diam);
 
-    return RaDec(ra, dec);
+    //
+    // ---- apparent to mean ----
+    //
+    // This is a stupid workaround because SlaStars assumes
+    // RA/DEC to be mean values rather than apparent
+    //
+    double rm=0, dm=0;
+    slaAmpqk (ra, dec, (double*)fAmprms, &rm, &dm);
+
+    return RaDec(rm, dm);
 }
 

trunk/Cosy/catalog/SlaPlanets.h

@@ -40 +40 @@
     void SetMjd(double mjd);
 
-    RaDec CalcPlanetRaDec(ePlanets_t planet);
+    RaDec CalcPlanetRaDec(ePlanets_t planet) const;
     void  UpdatePlanetPos(ePlanets_t planet);
     ZdAz  GetPlanetPos(ePlanets_t planet) const { return fZdAz[planet]; }