Changeset 9516 for trunk/MagicSoft/Cosy/catalog

Timestamp:

10/21/09 10:49:36 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/catalog

Files:

• SlaPlanets.cc (modified) (3 diffs)
• SlaPlanets.h (modified) (3 diffs)
• SlaStars.cc (modified) (4 diffs)
• SlaStars.h (modified) (3 diffs)

trunk/MagicSoft/Cosy/catalog/SlaPlanets.cc

@@ -9 +9 @@
 using namespace std;
 
-SlaPlanets::SlaPlanets(MObservatory::LocationName_t key) : Slalib(key), fDt(slaDt(2000.0)/60./60./24.)
-{
-}
-
-SlaPlanets::~SlaPlanets()
+SlaPlanets::SlaPlanets(MObservatory::LocationName_t key) : SlaStars(key), fDt(slaDt(2000.0)/60./60./24.)
 {
 }
@@ -19 +15 @@
 void SlaPlanets::SetMjd(double mjd)
 {
-    Slalib::SetMjd(mjd);
+    SlaStars::SetMjd(mjd);
 
     fTt = GetMjd() + slaDtt(GetMjd())/60./60./24.;
@@ -33 +29 @@
 }
 
-void SlaPlanets::UpdatePlanetPos(ePlanets_t planet)
+// --------------------------------------------------------------------------
+//
+// coordinates of planet: topocentric, equatorial, J2000
+//
+RaDec SlaPlanets::CalcPlanetRaDec(ePlanets_t planet)
 {
-    //
     // coordinates of planet: topocentric, equatorial, J2000
-    //
     double ra, dec, diam;
 
-    // One can use TT instead of TDB for all planets
-    // (except the moon)
+    // 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);
 
+    return RaDec(ra, dec);
+}
+
+void SlaPlanets::UpdatePlanetPos(ePlanets_t planet)
+{
+    // coordinates of planet: topocentric, equatorial, J2000
+    const RaDec rd = CalcPlanetRaDec(planet);
+
     double az, el;
-    slaDe2h(GetAlpha()-ra, dec, GetPhi(), &az, &el);
+    slaDe2h(GetAlpha()-rd.Ra(), rd.Dec(), GetPhi(), &az, &el);
 
     fZdAz[planet].Set(TMath::Pi()/2-el, az);
 }
+

trunk/MagicSoft/Cosy/catalog/SlaPlanets.h

@@ -2 +2 @@
 #define COSY_SlaPlanets
 
-#ifndef COSY_Slalib
-#include "Slalib.h"
+#ifndef COSY_SlaStars
+#include "SlaStars.h"
 #endif
 
@@ -24 +24 @@
 } ePlanets_t;
 
-class SlaPlanets : public Slalib
+class SlaPlanets : public SlaStars
 {
 private:
@@ -38 +38 @@
 public:
     SlaPlanets(MObservatory::LocationName_t key);
-    virtual ~SlaPlanets();
 
     void SetMjd(double mjd);
 
-    void UpdatePlanetPos(ePlanets_t planet);
-    ZdAz GetPlanetPos(ePlanets_t planet) const { return fZdAz[planet]; }
+    RaDec CalcPlanetRaDec(ePlanets_t planet);
+    void  UpdatePlanetPos(ePlanets_t planet);
+    ZdAz  GetPlanetPos(ePlanets_t planet) const { return fZdAz[planet]; }
+
+    void SetPlanet(ePlanets_t planet) { Set(CalcPlanetRaDec(planet)/TMath::DegToRad()); }
 
     ClassDef(SlaPlanets, 0)

trunk/MagicSoft/Cosy/catalog/SlaStars.cc

@@ -3 +3 @@
 #include "slalib.h"
 
+#include "MAstro.h"
 #include "MPointing.h"
 
@@ -29 +30 @@
 void SlaStars::Set(const RaDec &radec)
 {
+    double ha;
+
     fRaDec = radec * TMath::DegToRad();
-    fAltAz = CalcAltAz(fRaDec);
+    fAltAz = CalcAltAz(fRaDec, &ha);
+
+    fHourAngle = ha;
 }
 
@@ -136 +141 @@
 }
 
-ZdAz SlaStars::CalcZdAz(const RaDec &radec) const
+ZdAz SlaStars::CalcZdAz(const RaDec &radec, double *ha) const
 {
     //
@@ -167 +172 @@
               &r1);   // observed right ascension (radians)
 
+    if (ha)
+        *ha = h0*MAstro::RadToHor();
+
     return ZdAz(zd, az);
 }
-AltAz SlaStars::CalcAltAz(const RaDec &radec) const
+AltAz SlaStars::CalcAltAz(const RaDec &radec, double *ha) const
 {
-    ZdAz zdaz = CalcZdAz(radec);
+    ZdAz zdaz = CalcZdAz(radec, ha);
     return AltAz(TMath::Pi()/2-zdaz.Zd(), zdaz.Az());
 }

trunk/MagicSoft/Cosy/catalog/SlaStars.h

@@ -13 +13 @@
 {
 private:
-    AltAz    fAltAz;    // [rad]
-    RaDec    fRaDec;    // [rad]
+    AltAz    fAltAz;     // [rad]
+    RaDec    fRaDec;     // [rad]
+
+    Double_t fHourAngle; // [h]
 
     double   fAmprms[21];
@@ -24 +26 @@
 
     //    const AltAz GetAltAz() const { return fAltAz*360/D2PI; }
-    //    const ZdAz  GetZdAz()  const { return ZdAz(DPI/2-fAltAz.Alt(), fAltAz.Az())*360/D2PI; }
-    //    const RaDec GetRaDec() const { return fRaDec*360/D2PI; }
+    const ZdAz   GetZdAz()  const     { return ZdAz(TMath::Pi()/2-fAltAz.Alt(), fAltAz.Az())*TMath::DegToRad(); }
+    const RaDec  GetRaDec() const     { return fRaDec/TMath::DegToRad(); }
+    const double GetHourAngle() const { return fHourAngle; }
 
     virtual void SetMjd(double mjd);
@@ -41 +44 @@
     RaDec  CalcRaDecFast(const ZdAz  &altaz) const;
 
-    AltAz  CalcAltAz(const RaDec &radec) const;
-    ZdAz   CalcZdAz (const RaDec &radec) const;
+    AltAz  CalcAltAz(const RaDec &radec, double *ha=0) const;
+    ZdAz   CalcZdAz (const RaDec &radec, double *ha=0) const;
 
-    AltAz  CalcAltAz(const RaDec &radec, double mjd)
-    { SetMjd(mjd); return CalcAltAz(radec); }
-    ZdAz   CalcZdAz (const RaDec &radec, double mjd)
-    { SetMjd(mjd); return CalcZdAz(radec); }
+    AltAz  CalcAltAz(const RaDec &radec, double mjd, double *ha=0)
+    { SetMjd(mjd); return CalcAltAz(radec, ha); }
+    ZdAz   CalcZdAz (const RaDec &radec, double mjd, double *ha=0)
+    { SetMjd(mjd); return CalcZdAz(radec, ha); }
 
     AltAz  CalcAltAzFast(const RaDec &radec) const;