Changeset 9523 for trunk/MagicSoft/Cosy/catalog

Timestamp:

12/01/09 13:03:41 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/catalog

Files:

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

trunk/MagicSoft/Cosy/catalog/SlaPlanets.cc

@@ -9 +9 @@
 using namespace std;
 
-SlaPlanets::SlaPlanets(MObservatory::LocationName_t key) : SlaStars(key), fDt(slaDt(2000.0)/60./60./24.)
+SlaPlanets::SlaPlanets(MObservatory::LocationName_t key) : SlaStars(key)//, fDt(slaDt(2000.0)/60./60./24.)
 {
 }
@@ -17 +17 @@
     SlaStars::SetMjd(mjd);
 
-    fTt = GetMjd() + slaDtt(GetMjd())/60./60./24.;
-
     //
-    // coordinates of earth: heliocentric, equatoril, J2000
+    // coordinates of earth: heliocentric, equatorial, J2000
     //
+    /*
     double veb[3]; // barycentric velocity
     double ceb[3]; // barycentric coordinates
@@ -27 +26 @@
 
     slaEvp(GetMjd() + fDt, 2000.0, veb, ceb, veh, fEarth);
+    */
 }
 
@@ -40 +40 @@
     // One can use TT instead of TDB for all planets (except the moon?)
     // TDB, planet, elong, phi, *ra, *dec, *diam
-    slaRdplan(fTt, planet, GetElong(), GetPhi(), &ra, &dec, &diam);
+    slaRdplan(GetTT(), planet, GetElong(), GetPhi(), &ra, &dec, &diam);
 
     return RaDec(ra, dec);

trunk/MagicSoft/Cosy/catalog/SlaPlanets.h

@@ -27 +27 @@
 {
 private:
-    double fDt;        // [mjd] const: rootcint/TMemberInspector
-    double fTt;        // [mjd] timescale TT
+    //double fDt;        // [mjd] The result is a rough estimate of ET-UT (after 1984, TT-UT1) at the given epoch, in seconds
 
     ZdAz fZdAz[10];    // [rad]
 
-    double fEarth[3];  // heliocentric coordinates
+    //double fEarth[3];  // heliocentric coordinates
 
-    ZdAz   GetMoonPos() const;
+    //ZdAz   GetMoonPos() const;
 
 public:

trunk/MagicSoft/Cosy/catalog/SlaStars.cc

@@ -12 +12 @@
 }
 
-SlaStars::~SlaStars()
-{
-}
-
 void SlaStars::Set(const AltAz &altaz)
 {
@@ -42 +38 @@
     Slalib::SetMjd(mjd);
 
+    fTt = GetMjd() + slaDtt(GetMjd())/60./60./24.;
+
     //
     // ----- calculate star independent parameters ----------
@@ -47 +45 @@
 
     // prepare calculation: Mean Place to geocentric apperent
-    slaMappa(2000.0, GetMjd(), fAmprms);   // Epoche, TDB
+    // (UTC would also do, except for the moon?)
+    slaMappa(2000.0, fTt, fAmprms);        // Epoche, TDB
 
     // prepare: Apperent to observed place
@@ -54 +53 @@
              0, 0,                         // polar motion x, y-coordinate (radians)
              // 273.155, 1013.25, 0.5,     // temp, pressure, humidity
-             273.155+10, 780.0, 0.25,     // temp, pressure, humidity
+             273.155+10, 780.0, 0.25,      // temp, pressure, humidity
              // 0.2, 0.0065,               // wavelength, tropo lapse rate
              0.55, 0.0065,                 // wavelength, tropo lapse rate
              fAoprms);
+
+    // Delta UT should be less than 0.9s which is its definition
+    // so we can fairly assume it to be neglegible
 }
 

trunk/MagicSoft/Cosy/catalog/SlaStars.h

@@ -21 +21 @@
     double   fAoprms[14];
 
+    double   fTt;        // [mjd] timescale TT
+
 public:
     SlaStars(MObservatory::LocationName_t key);
-    virtual ~SlaStars();
+    virtual ~SlaStars() { }
 
     //    const AltAz GetAltAz() const { return fAltAz*360/D2PI; }
@@ -31 +33 @@
     const RaDec  GetRaDecRad() const  { return fRaDec; }
     const double GetHourAngle() const { return fHourAngle; }
+
+    const double GetTT() const        { return fTt; }
 
     virtual void SetMjd(double mjd);