Changeset 19391


Ignore:
Timestamp:
Nov 13, 2018, 4:17:59 PM (8 months ago)
Author:
tbretz
Message:
For convenience print the selected PRESET_OBSERVATORY when the programs start which write the files.
Location:
trunk/FACT++/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/datalogger.cc

    r19215 r19391  
    7878
    7979#include "Description.h"
    80 //#include "DimNetwork.h"
    8180
    8281#ifdef HAVE_FITS
     
    8786
    8887#ifdef HAVE_NOVA
    89 #include <libnova/solar.h>
    90 #include <libnova/rise_set.h>
     88#include "externals/nova.h"
    9189#endif
    9290
     
    928926    //the next closing time is 30 minutes after upcoming sunrise.
    929927    //If we are within 30 minutes after sunrise, closing time is soon
    930     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
     928    fCurrentDay = timeNow.GetNextSunRise();//GetSunRise(timeNow-boost::posix_time::minutes(30))+boost::posix_time::minutes(30);
    931929    lastFlush = Time();
    932930
     
    10321030     fDestructing = false;
    10331031
    1034      fPreviousOldRunNumberCheck = Time().Mjd();
     1032     fPreviousOldRunNumberCheck = Time();
    10351033
    10361034     fDailyFileDayChangedAlready = true;
     
    23062304    if (conf.Has("service-list-interval"))
    23072305        fCurrentSubscriptionUpdateRate = conf.Get<int32_t>("service-list-interval");
     2306
     2307    Info("Preset observatory: "+Nova::LnLatPosn::preset()+" [PRESET_OBSERVATORY]");
     2308
    23082309    return -1;
    23092310}
  • trunk/FACT++/src/fadctrl.cc

    r19383 r19391  
    1919
    2020#include "zofits.h"
     21
     22#ifdef HAVE_NOVA
     23#include "externals/nova.h"
     24#endif
    2125
    2226namespace ba = boost::asio;
     
    20262030        fDebugTx = conf.Get<bool>("debug-tx");
    20272031
     2032#ifdef HAVE_NOVA
     2033        T::Info("Preset observatory: "+Nova::LnLatPosn::preset()+" [PRESET_OBSERVATORY]");
     2034#endif
     2035
    20282036        // --------- Setup compression of FITS files -----------
    20292037        if (conf.Has("zfits.num-threads"))
Note: See TracChangeset for help on using the changeset viewer.