Changeset 15205 for trunk

Timestamp:

03/30/13 16:39:16 (12 years ago)

Author:

tbretz

Message:

Use some simplifications coming with the new C++ wrapper for libnova.

File:

• trunk/FACT++/src/Time.cc (modified) (4 diffs)

trunk/FACT++/src/Time.cc

@@ -307 +307 @@
 {
 #ifdef HAVE_LIBNOVA
+    Nova::LnLatPosn obs = Nova::ORM();
+
     ln_rst_time sun_day;
-    if (ln_get_solar_rst_horizon(JD()-0.5, &Nova::ORM(), horizon, &sun_day)==1)
+    if (ln_get_solar_rst_horizon(JD()-0.5, &obs, horizon, &sun_day)==1)
         throw runtime_error("ln_get_solar_rst_horizon reported the sun to be circumpolar at the coordinates of La Palma!");
 
@@ -314 +316 @@
         return Time(sun_day.rise);
 
-    if (ln_get_solar_rst_horizon(JD()-1.5, &Nova::ORM(), horizon, &sun_day)==1)
+    if (ln_get_solar_rst_horizon(JD()-1.5, &obs, horizon, &sun_day)==1)
         throw runtime_error("ln_get_solar_rst_horizon reported the sun to be circumpolar at the coordinates of La Palma!");
 
@@ -338 +340 @@
 {
 #ifdef HAVE_LIBNOVA
+    Nova::LnLatPosn obs = Nova::ORM();
+
     ln_rst_time sun_day;
-    if (ln_get_solar_rst_horizon(JD()-0.5, &Nova::ORM(), horizon, &sun_day)==1)
+    if (ln_get_solar_rst_horizon(JD()-0.5, &obs, horizon, &sun_day)==1)
         throw runtime_error("ln_get_solar_rst_horizon reported the sun to be circumpolar at the coordinates of La Palma!");
 
@@ -345 +349 @@
         return Time(sun_day.rise);
 
-    if (ln_get_solar_rst_horizon(JD()+0.5, &Nova::ORM(), horizon, &sun_day)==1)
+    if (ln_get_solar_rst_horizon(JD()+0.5, &obs, horizon, &sun_day)==1)
         throw runtime_error("ln_get_solar_rst_horizon reported the sun to be circumpolar at the coordinates of La Palma!");