Changeset 18820

Timestamp:

04/14/17 12:18:40 (8 years ago)

Author:

tbretz

Message:

Slightly modified the interface to access the observatory. This allows simpler calles than before if any other than the default observatory should be used.

Location:

trunk

Files:

• FACT++/src/InterpreterV8.cc (modified) (3 diffs)
• FACT++/src/Time.cc (modified) (2 diffs)
• FACT++/src/drivectrl.cc (modified) (2 diffs)
• Mars/mcore/nova.h (modified) (7 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -2183 +2183 @@
     const Time utc(v/1000, v%1000);
 
-    Nova::LnLatPosn obs = Nova::ORM();
+    Nova::LnLatPosn obs = Nova::kORM;
 
     ln_rst_time sun;
@@ -2195 +2195 @@
 {
     if (args.Length()>1)
-        return ThrowException(String::New("Moon.horizon must not be called with one argument."));
+        return ThrowException(String::New("Moon.horizon must not be called with more than one argument."));
 
     if (args.Length()==1 && !args[0]->IsDate())
@@ -2210 +2210 @@
     const Time utc(v/1000, v%1000);
 
-    Nova::LnLatPosn obs = Nova::ORM();
+    Nova::LnLatPosn obs = Nova::kORM;
 
     ln_rst_time moon;

trunk/FACT++/src/Time.cc

@@ -314 +314 @@
 {
 #ifdef HAVE_LIBNOVA
-    Nova::LnLatPosn obs = Nova::ORM();
+    Nova::LnLatPosn obs = Nova::kORM;
 
     ln_rst_time sun_day;
@@ -347 +347 @@
 {
 #ifdef HAVE_LIBNOVA
-    Nova::LnLatPosn obs = Nova::ORM();
+    Nova::LnLatPosn obs = Nova::kORM;
 
     ln_rst_time sun_day;

trunk/FACT++/src/drivectrl.cc

@@ -368 +368 @@
         out.mjd = _mjd;
 
-        const double elong  = Nova::ORM().lng * M_PI/180;
-        const double lat    = Nova::ORM().lat * M_PI/180;
+        const double elong  = Nova::kORM.lng * M_PI/180;
+        const double lat    = Nova::kORM.lat * M_PI/180;
         const double height = 2200;
 
@@ -2373 +2373 @@
             fTrackingCounter = 0;
 
-        const double ha = fmod(fDrive.GetSeTime(),1)*24 - Nova::ORM().lng/15;
+        const double ha = fmod(fDrive.GetSeTime(),1)*24 - Nova::kORM.lng/15;
 
         array<double, 12> dim;

trunk/Mars/mcore/nova.h

@@ -1 +1 @@
 #ifndef MARS_Nova
 #define MARS_Nova
+
+#include <map>
+#include <string>
 
 #include <libnova/solar.h>
@@ -10 +13 @@
 namespace Nova
 {
-    typedef ln_lnlat_posn LnLatPosn;
-    typedef ln_rst_time   RstTime; // Note that times are in JD not Mjd
-    //typedef ln_hrz_posn   HrzPosn;
-    //typedef ln_equ_posn   EquPosn;
+    typedef ln_rst_time RstTime; // Note that times are in JD not Mjd
 
     struct ZdAzPosn;
     struct RaDecPosn;
 
+    const static ln_lnlat_posn kORM
+#ifndef __CINT__
+        = { -(17.+53./60+26.525/3600), 28.+45./60+42.462/3600 } // 2200m
+#endif
+    ;
+    const static ln_lnlat_posn kHAWC
+#ifndef __CINT__
+        = { -97.3084, 18.9947 } // 4100m;
+#endif
+    ;
+    const static ln_lnlat_posn kSPM
+#ifndef __CINT__
+        = { -115.4637, 31.0439 } // 2800m;
+#endif
+    ;
+
+    struct LnLatPosn : public ln_lnlat_posn
+    {
+        LnLatPosn() { }
+        LnLatPosn(const ln_lnlat_posn &pos) : ln_lnlat_posn(pos) { }
+        LnLatPosn(const std::string &obs)
+        {
+#ifndef __CINT__
+            static const std::map<std::string, ln_lnlat_posn> lut =
+            {
+                { "orm",  kORM  },
+                { "hawc", kHAWC },
+                { "spm",  kSPM  },
+            };
+
+            const auto it = lut.find(obs);
+            *this = it==lut.end() ? ln_lnlat_posn({0,0}) : it->second;
+#endif
+        }
+    };
 
     // Warning: 0deg=South, 90deg=W
@@ -61 +96 @@
 
     EquPosn::EquPosn(const RaDecPosn &rd) { ra = rd.ra*15; dec = rd.dec; }
-
-
-
-    const LnLatPosn &ORM()
-    {
-        //static LnLatPosn obs;
-        //obs.lng = -(17.+53./60+26.525/3600);
-        //obs.lat =   28.+45./60+42.462/3600;
-        const static LnLatPosn obs = { -(17.+53./60+26.525/3600), 28.+45./60+42.462/3600 };
-        return obs;
-    }
 
     HrzPosn GetHrzFromEqu(const EquPosn &equ, const LnLatPosn &obs, double jd)
@@ -81 +105 @@
     HrzPosn GetHrzFromEqu(const EquPosn &equ, double jd)
     {
-        return GetHrzFromEqu(equ, ORM(), jd);
+        return GetHrzFromEqu(equ, kORM, jd);
     }
 
@@ -92 +116 @@
     EquPosn GetEquFromHrz(const HrzPosn &hrz, double jd)
     {
-        return GetEquFromHrz(hrz, ORM(), jd);
+        return GetEquFromHrz(hrz, kORM, jd);
     }
 
@@ -103 +127 @@
     RstTime GetSolarRst(double jd, double hrz=LN_SOLAR_STANDART_HORIZON)
     {
-        return GetSolarRst(jd, ORM(), hrz);
-    }
-
-    RstTime GetLunarRst(double jd, const LnLatPosn &obs=ORM())
+        return GetSolarRst(jd, kORM, hrz);
+    }
+
+    RstTime GetLunarRst(double jd, const LnLatPosn &obs=kORM)
     {
         RstTime rst;
@@ -171 +195 @@
         double fEarthDist;
 
-        SolarObjects(const double &jd, const LnLatPosn &obs=Nova::ORM())
+        SolarObjects(const double &jd, const LnLatPosn &obs=Nova::kORM)
         {
             fJD = jd;