Changeset 1784 for trunk/MagicSoft/Mars/mtemp

Timestamp:

02/21/03 19:40:04 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp

Files:

• MObservatory.cc (modified) (2 diffs)
• MObservatory.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mtemp/MObservatory.cc

@@ -61 +61 @@
     {
     case kMagic1:
-        fLatitude  =  Daf2rad( 28, 45, 30.0);
-        fLongitude =  Daf2rad(-17, 52, 48.0);
+        fLatitude  = Dms2Rad( 28, 45, 30.0);
+        fLongitude = Dms2Rad(-17, 52, 48.0);
         fHeight    = 2326; // m
         fObservatoryName = "Observatorio del Roque de los Muchachos (Magic1)";
@@ -68 +68 @@
 
     case kWuerzburgCity:
-        fLatitude  = Daf2rad(51, 38, 48.0);
-        fLongitude = Daf2rad( 9, 56, 36.0);
+        fLatitude  = Dms2Rad(51, 38, 48.0);
+        fLongitude = Dms2Rad( 9, 56, 36.0);
         fHeight    = 300;
         fObservatoryName = "Wuerzburg City";

trunk/MagicSoft/Mars/mtemp/MObservatory.h

@@ -27 +27 @@
     void Init(const char *name, const char *title);
 
-    Double_t Daf2rad(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);
-    }
-
 public:
     MObservatory(const char *name=NULL, const char *title=NULL);
@@ -57 +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)