Changeset 19391 for trunk

Timestamp:

11/13/18 16:17:59 (6 years ago)

Author:

tbretz

Message:

For convenience print the selected PRESET_OBSERVATORY when the programs start which write the files.

Location:

trunk/FACT++/src

Files:

• datalogger.cc (modified) (5 diffs)
• fadctrl.cc (modified) (2 diffs)

trunk/FACT++/src/datalogger.cc

@@ -78 +78 @@
 
 #include "Description.h"
-//#include "DimNetwork.h"
 
 #ifdef HAVE_FITS
@@ -87 +86 @@
 
 #ifdef HAVE_NOVA
-#include <libnova/solar.h>
-#include <libnova/rise_set.h>
+#include "externals/nova.h"
 #endif
 
@@ -928 +926 @@
     //the next closing time is 30 minutes after upcoming sunrise.
     //If we are within 30 minutes after sunrise, closing time is soon
-    fCurrentDay = Time().GetNextSunRise();//GetSunRise(Time()-boost::posix_time::minutes(30)) + boost::posix_time::minutes(30);//(int)(nowMinusTwelve.Mjd());//nowMinusTwelve.M()*31 + nowMinusTwelve.D();//assume 31 days per month. we do not really care, only want unique number per day of the year
+    fCurrentDay = timeNow.GetNextSunRise();//GetSunRise(timeNow-boost::posix_time::minutes(30))+boost::posix_time::minutes(30);
     lastFlush = Time();
 
@@ -1032 +1030 @@
      fDestructing = false;
 
-     fPreviousOldRunNumberCheck = Time().Mjd();
+     fPreviousOldRunNumberCheck = Time();
 
      fDailyFileDayChangedAlready = true;
@@ -2306 +2304 @@
     if (conf.Has("service-list-interval"))
         fCurrentSubscriptionUpdateRate = conf.Get<int32_t>("service-list-interval");
+
+    Info("Preset observatory: "+Nova::LnLatPosn::preset()+" [PRESET_OBSERVATORY]");
+
     return -1;
 }

trunk/FACT++/src/fadctrl.cc

@@ -19 +19 @@
 
 #include "zofits.h"
+
+#ifdef HAVE_NOVA
+#include "externals/nova.h"
+#endif
 
 namespace ba = boost::asio;
@@ -2026 +2030 @@
         fDebugTx = conf.Get<bool>("debug-tx");
 
+#ifdef HAVE_NOVA
+        T::Info("Preset observatory: "+Nova::LnLatPosn::preset()+" [PRESET_OBSERVATORY]");
+#endif
+
         // --------- Setup compression of FITS files -----------
         if (conf.Has("zfits.num-threads"))