Changeset 15209 for trunk/FACT++

Timestamp:

03/31/13 02:51:04 (12 years ago)

Author:

tbretz

Message:

Updated to use new nova C++ wrapper

File:

• trunk/FACT++/src/makeplots.cc (modified) (6 diffs)

trunk/FACT++/src/makeplots.cc

@@ -1 @@
-#include <libnova/solar.h>
-#include <libnova/lunar.h>
-#include <libnova/rise_set.h>
-#include <libnova/transform.h>
+#include "externals/nova.h"
 
 #include "Database.h"
@@ -123 +120 @@
     // ------------------ Eval config ---------------------
 
-    const double lon = -(17.+53./60+26.525/3600);
-    const double lat =   28.+45./60+42.462/3600;
-
-    ln_lnlat_posn observer;
-    observer.lng = lon;
-    observer.lat = lat;
-
     Time time;
     if (conf.Has("date-time"))
@@ -139 +129 @@
 
     // -12: nautical
-    ln_rst_time sun_set;   // Sun set with the same date than th provided date
-    ln_rst_time sun_rise;  // Sun rise on the following day
-    ln_get_solar_rst_horizon(time.JD()-0.5, &observer, -12, &sun_set);
-    ln_get_solar_rst_horizon(time.JD()+0.5, &observer, -12, &sun_rise);
+    // Sun set with the same date than th provided date
+    // Sun rise on the following day
+    const Nova::RstTime sun_set  = Nova::GetSolarRst(time.JD()-0.5, -12);
+    const Nova::RstTime sun_rise = Nova::GetSolarRst(time.JD()+0.5, -12);
 
     const double jd  = floor(time.Mjd())+2400001;
@@ -159 +149 @@
     // ------------------ Precalc moon coord ---------------------
 
-    vector<pair<ln_equ_posn, double>> fMoonCoords;
+    vector<pair<Nova::EquPosn, double>> fMoonCoords;
 
     for (double h=0; h<1; h+=1./(24*12))
     {
-        ln_equ_posn  moon;
-        ln_get_lunar_equ_coords_prec(jd+h, &moon, 0.01);
-
-        const double disk = ln_get_lunar_disk(jd+h);
+        const Nova::EquPosn moon = Nova::GetLunarEquCoords(jd+h, 0.01);
+
+        const double disk = Nova::GetLunarDisk(jd+h);
 
         fMoonCoords.push_back(make_pair(moon, disk));
@@ -260 +249 @@
         const string name = (*v)[0].c_str();
 
-        ln_equ_posn pos;
+        Nova::EquPosn pos;
         pos.ra  = double((*v)[1])*15;
         pos.dec = double((*v)[2]);
@@ -298 +287 @@
 
             // get local position of source
-            ln_hrz_posn hrz;
-            ln_get_hrz_from_equ(&pos, &observer, jd+h, &hrz);
+            const Nova::HrzPosn hrz = Nova::GetHrzFromEqu(pos, jd+h);
 
             // Get moon properties and
-            ln_equ_posn moon  = fMoonCoords[i].first;
+            const Nova::EquPosn moon = fMoonCoords[i].first;
             const double disk = fMoonCoords[i].second;
 
-            ln_hrz_posn hrzm;
-            ln_get_hrz_from_equ(&moon, &observer, jd+h, &hrzm);
+            const Nova::HrzPosn hrzm = Nova::GetHrzFromEqu(moon, jd+h);
+
+            if (v==res.begin())
+                cout << Time(jd+h) <<" " << 90-hrzm.alt <<  endl;
 
             // Distance between source and moon