Changeset 16970 for trunk/Mars

Timestamp:

07/21/13 17:08:04 (11 years ago)

Author:

tbretz

Message:

Added RaDecPosn which stores ra/dec in h/deg instead of deg/deg as EquPosn

File:

• trunk/Mars/mcore/nova.h (modified) (3 diffs)

trunk/Mars/mcore/nova.h

@@ -11 +11 @@
 {
     typedef ln_lnlat_posn LnLatPosn;
+    typedef ln_rst_time   RstTime; // Note that times are in JD not Mjd
     //typedef ln_hrz_posn   HrzPosn;
-    typedef ln_equ_posn   EquPosn;
-    typedef ln_rst_time   RstTime; // Note that times are in JD not Mjd
+    //typedef ln_equ_posn   EquPosn;
 
     struct ZdAzPosn;
+    struct RaDecPosn;
+
 
     // Warning: 0deg=South, 90deg=W
@@ -26 +28 @@
     struct ZdAzPosn
     {
-        double zd;
-        double az;
+        double zd; // [deg]
+        double az; // [deg]
 
         ZdAzPosn() : zd(0), az(0) { }
@@ -37 +39 @@
 
     HrzPosn::HrzPosn(const ZdAzPosn &za) { alt = 90-za.zd; az = za.az-180; }
+
+
+    // Note that right ascension is stored in degree
+    struct EquPosn : public ln_equ_posn
+    {
+        EquPosn() { }
+        EquPosn(const ZdAzPosn &);
+    };
+
+    struct RaDecPosn
+    {
+        double ra;  // [h]
+        double dec; // [deg]
+
+        RaDecPosn() : ra(0), dec(0) { }
+        RaDecPosn(const EquPosn &equ) : ra(equ.ra/15), dec(equ.dec) { }
+
+        // This crahsed cint, but it could save up the dedicate structure HrzPosn :(
+        //operator HrzPosn() const { const HrzPosn p = { az-180, 90-zd}; return p; }
+    };
+
+    EquPosn::EquPosn(const RaDecPosn &rd) { ra = rd.ra*15; dec = rd.dec; }