Changeset 14307

Timestamp:

08/02/12 15:42:49 (12 years ago)

Author:

tbretz

Message:

Added sun angle.

File:

• trunk/FACT++/src/moon.cc (modified) (3 diffs)

trunk/FACT++/src/moon.cc

@@ -45 +45 @@
         observer.lng = lon;
         observer.lat = lat;
-
-        //observer.lng.degrees = -5;
-        //observer.lng.minutes = 36;
-        //observer.lng.seconds = 30;
-        //observer.lat.degrees = 42;
-        //observer.lat.minutes = 35;
-        //observer.lat.seconds = 40;
 
         ln_rst_time moon;
@@ -137 +130 @@
 #if BOOST_VERSION >= 104200
          ->required()
-#endif                             
+#endif
                                    , "SQL time (UTC)")
         ;
@@ -183 +176 @@
     cout << setprecision(15);
     cout << time.GetAsStr() << '\n';
-    cout << moon.visible    << '\n';
-    cout << moon.disk       << '\n';
-    cout << moon.zd         << '\n';
+
+    ln_equ_posn pos;
+    ln_hrz_posn hrz;
+    ln_get_solar_equ_coords(time.JD(), &pos);
+    ln_get_hrz_from_equ(&pos, &observer, time.JD(), &hrz);
+    cout << 90-hrz.alt   << '\n';
+
+    cout << moon.visible << '\n';
+    cout << moon.disk    << '\n';
+    cout << moon.zd      << '\n';
 
     if (conf.Has("ra") && conf.Has("dec"))
     {
-        ln_equ_posn pos;
         pos.ra  = conf.Get<double>("ra")*15;
         pos.dec = conf.Get<double>("dec");
 
-        ln_hrz_posn hrz;
         ln_get_hrz_from_equ(&pos, &observer, time.JD(), &hrz);
         cout << moon.Angle(pos.ra/15, pos.dec) << '\n';