Changeset 2750 for trunk/MagicSoft/Mars/mtemp

Timestamp:

12/29/03 18:19:38 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp

Files:

• MObservatory.cc (modified) (3 diffs)
• MObservatory.h (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/MObservatory.cc

@@ -30 +30 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MObservatory.h"
+
+#include "MAstro.h"
 
 #include "MLog.h"
@@ -63 +65 @@
         // Values taken from the GPS Receiver (avg 20h)
         // on 26/11/2003 at 17h30 in the counting house
-        fLatitude  = Dms2Rad( 28, 45, 42.576);
-        fLongitude = Dms2Rad(-17, 53, 26.460);
+        fLatitude  = MAstro::Dms2Rad(28, 45, 42.576, '+');
+        fLongitude = MAstro::Dms2Rad(17, 53, 26.460, '-');
         fHeight    = 2196.5; // m
         fObservatoryName = "Observatorio del Roque de los Muchachos (Magic1)";
@@ -70 +72 @@
 
     case kWuerzburgCity:
-        fLatitude  = Dms2Rad(51, 38, 48.0);
-        fLongitude = Dms2Rad( 9, 56, 36.0);
+        fLatitude  = MAstro::Dms2Rad(51, 38, 48.0);
+        fLongitude = MAstro::Dms2Rad( 9, 56, 36.0);
         fHeight    = 300;
         fObservatoryName = "Wuerzburg City";

trunk/MagicSoft/Mars/mtemp/MObservatory.h

@@ -50 +50 @@
     LocationName_t GetObservatoryKey() const { return fObservatoryKey; }
 
-    static Double_t Dms2Rad(Int_t deg, UInt_t min, Double_t sec)
-    {
-        /* pi/(180*3600):  arcseconds to radians */
-#define DAS2R 4.8481368110953599358991410235794797595635330237270e-6
-        return DAS2R * (60.0 * (60.0 * (Double_t)deg + (Double_t)min) + sec);
-    }
-
-    static Double_t Hms2Rad(Int_t hor, UInt_t min, Double_t sec)
-    {
-        /* pi/(12*3600):  seconds of time to radians */
-#define DS2R 7.2722052166430399038487115353692196393452995355905e-5
-        return DS2R * (60.0 * (60.0 * (Double_t)hor + (Double_t)min) + sec);
-    }
-
     ClassDef(MObservatory, 0)