Changeset 19215

Timestamp:

09/07/18 12:05:10 (6 years ago)

Author:

tbretz

Message:

The precompiler directive to check for libnova should be identical everywhere.

Location:

trunk/FACT++/src

Files:

• Time.cc (modified) (5 diffs)
• datalogger.cc (modified) (2 diffs)
• smartfact.cc (modified) (3 diffs)

trunk/FACT++/src/Time.cc

@@ -30 +30 @@
 using namespace boost::posix_time;
 
-#ifdef HAVE_LIBNOVA
+#ifdef HAVE_NOVA
 #include "externals/nova.h"
 #endif
@@ -314 +314 @@
 Time Time::GetPrevSunRise(double horizon, const string &obs) const
 {
-#ifdef HAVE_LIBNOVA
+#ifdef HAVE_NOVA
     const Nova::LnLatPosn posn(obs);
     if (!posn.isValid())
@@ -350 +350 @@
 Time Time::GetNextSunRise(double horizon, const string &obs) const
 {
-#ifdef HAVE_LIBNOVA
+#ifdef HAVE_NOVA
     const Nova::LnLatPosn posn(obs);
     if (!posn.isValid())
@@ -377 +377 @@
 Time Time::GetPrevSunRise(const string &obs) const
 {
-#ifdef HAVE_LIBNOVA
+#ifdef HAVE_NOVA
     return GetPrevSunRise(LN_SOLAR_STANDART_HORIZON, obs);
 #else
@@ -390 +390 @@
 Time Time::GetNextSunRise(const string &obs) const
 {
-#ifdef HAVE_LIBNOVA
+#ifdef HAVE_NOVA
     return GetNextSunRise(LN_SOLAR_STANDART_HORIZON, obs);
 #else

trunk/FACT++/src/datalogger.cc

@@ -86 +86 @@
 #include "DimState.h"
 
-#ifdef HAVE_LIBNOVA
+#ifdef HAVE_NOVA
 #include <libnova/solar.h>
 #include <libnova/rise_set.h>
@@ -1278 +1278 @@
 Time DataLogger::GetSunRise(const Time &time)
 {
-#ifdef HAVE_LIBNOVA
+#ifdef HAVE_NOVA
     const double lon = -(17.+53./60+26.525/3600);
     const double lat =   28.+45./60+42.462/3600;

trunk/FACT++/src/smartfact.cc

@@ -110 +110 @@
     bool visible;
 
-#ifdef HAVE_LIBNOVA
+#ifdef HAVE_NOVA
     Nova::RstTime Rst(double jd, double hrz=LN_SOLAR_STANDART_HORIZON)
     {
@@ -135 +135 @@
     Sun(const Time &t) :  time(t)
     {
-#ifdef HAVE_LIBNOVA
+#ifdef HAVE_NOVA
         // get Julian day from local time
         const double JD = time.JD();
@@ -343 +343 @@
     Moon(const Time &t) : time(t)
     {
-#ifdef HAVE_LIBNOVA
+#ifdef HAVE_NOVA
         const double JD = time.JD();