Changeset 15208

Timestamp:

03/31/13 02:43:06 (12 years ago)

Author:

tbretz

Message:

Fixed a problem with the coordinate system... libnova's hrz has a different definition of the azimuth.

Location:

trunk/FACT++/src

Files:

• InterpreterV8.cc (modified) (3 diffs)
• smartfact.cc (modified) (3 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -1667 +1667 @@
         return ThrowException(String::New("Argument must be a Date"));
 
-    Nova::HrzPosn hrz;
-    hrz.alt = 90-GetDataMember(args, "zd");
-    hrz.az  =    GetDataMember(args, "az");
-
-    if (!finite(hrz.alt) || !finite(hrz.az))
+    Nova::ZdAzPosn hrz;
+    hrz.zd = GetDataMember(args, "zd");
+    hrz.az = GetDataMember(args, "az");
+
+    if (!finite(hrz.zd) || !finite(hrz.az))
         return ThrowException(String::New("zd and az must be finite."));
 
@@ -1717 +1717 @@
     const Time utc(v/1000, v%1000);
 
-    const Nova::HrzPosn hrz = Nova::GetHrzFromEqu(equ, utc.JD());
-
-    Handle<Value> arg[] = { Number::New(90-hrz.alt), Number::New(hrz.az), date };
+    const Nova::ZdAzPosn hrz = Nova::GetHrzFromEqu(equ, utc.JD());
+
+    Handle<Value> arg[] = { Number::New(hrz.zd), Number::New(hrz.az), date };
     return handle_scope.Close(fTemplateLocal->GetFunction()->NewInstance(3, arg));
 }
@@ -1744 +1744 @@
     const Time utc(v/1000, v%1000);
 
-    const Nova::HrzPosn hrz = Nova::GetHrzFromEqu(equ, utc.JD());
-
-    Handle<Value> arg[] = { Number::New(90-hrz.alt), Number::New(hrz.az), date };
+    const Nova::ZdAzPosn hrz = Nova::GetHrzFromEqu(equ, utc.JD());
+
+    Handle<Value> arg[] = { Number::New(hrz.zd), Number::New(hrz.az), date };
     return handle_scope.Close(fTemplateLocal->GetFunction()->NewInstance(3, arg));
 }

trunk/FACT++/src/smartfact.cc

@@ -257 +257 @@
             fSet = Time(moon.set);
 
-        const Nova::EquPosn pos = Nova::GetLunarEquCoords(JD);
-        const Nova::HrzPosn hrz = Nova::GetHrzFromEqu(pos, JD);
-
-        az =    hrz.az;
-        zd = 90-hrz.alt;
+        const Nova::EquPosn  pos = Nova::GetLunarEquCoords(JD);
+        const Nova::ZdAzPosn hrz = Nova::GetHrzFromEqu(pos, JD);
+
+        az = hrz.az;
+        zd = hrz.zd;
 
         ra  = pos.ra/15;
@@ -2149 +2149 @@
                 pos.dec = dec;
 
-                const Nova::HrzPosn hrz = Nova::GetHrzFromEqu(pos, now.JD());
+                const Nova::ZdAzPosn hrz = Nova::GetHrzFromEqu(pos, now.JD());
 
                 /*const*/ pair<vector<float>, pair<Time, float>> vis = GetVisibility(&pos, now.JD());
@@ -2176 +2176 @@
 
                 string col = HTML::kWhite;
-                if (hrz.alt>5)
+                if (hrz.zd<85)
                     col = HTML::kRed;
-                if (hrz.alt>25)
+                if (hrz.zd<65)
                     col = HTML::kYellow;
-                if (hrz.alt>60)
+                if (hrz.zd<30)
                     col = HTML::kGreen;
 
                 out2 << "<tr bgcolor='" << col << "'>";
                 out2 << "<td>" << name << "</td>";
-                if (hrz.alt>5)
+                if (hrz.zd<85)
                 {
-                    out2 << "<td>" << 90-hrz.alt << "&deg;</td>";
+                    out2 << "<td>" << hrz.zd << "&deg;</td>";
                     out2 << "<td>" << GetDir(hrz.az) << "</td>";
                 }