Changeset 18820 for trunk/FACT++/src

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/FACT++/src

Files:

• InterpreterV8.cc (modified) (3 diffs)
• Time.cc (modified) (2 diffs)
• drivectrl.cc (modified) (2 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;