Changeset 3371 for trunk/MagicSoft/Mars/mastro

Timestamp:

03/01/04 15:33:06 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mastro

Files:

• MAstro.cc (modified) (5 diffs)
• MAstro.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mastro/MAstro.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 11/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -33 +33 @@
 #include <TVector3.h> // TVector3
 
+#include "MTime.h"    // MTime::GetGmst
+
 ClassImp(MAstro);
 
@@ -56 +58 @@
 {
     /* pi/(180*3600):  arcseconds to radians */
-#define DAS2R 4.8481368110953599358991410235794797595635330237270e-6
-    return Hms2Sec(deg, min, sec, sgn)*DAS2R;
+    //#define DAS2R 4.8481368110953599358991410235794797595635330237270e-6
+    return Hms2Sec(deg, min, sec, sgn)*TMath::Pi()/(180*3600)/**DAS2R*/;
 }
 
@@ -63 +65 @@
 {
     /* pi/(12*3600):  seconds of time to radians */
-#define DS2R 7.2722052166430399038487115353692196393452995355905e-5
-    return Hms2Sec(hor, min, sec, sgn)*DS2R;
+//#define DS2R 7.2722052166430399038487115353692196393452995355905e-5
+    return Hms2Sec(hor, min, sec, sgn)*TMath::Pi()/(12*3600)/**DS2R*/;
 }
 
@@ -295 +297 @@
     return v0.Angle(v1);
 }
+
+// --------------------------------------------------------------------------
+//
+// Calls MTime::GetGmst() Better use MTime::GetGmst() directly
+//
+Double_t MAstro::UT2GMST(Double_t ut1)
+{
+    return MTime(ut1).GetGmst();
+}

trunk/MagicSoft/Mars/mastro/MAstro.h

@@ -13 +13 @@
 
 public:
+    // Angle/Time conversion functions
     static Double_t Hms2Sec(Int_t deg, UInt_t min, Double_t sec, char sgn='+');
     static Double_t Dms2Rad(Int_t deg, UInt_t min, Double_t sec, Char_t sgn='+');
@@ -37 +38 @@
     static void Hor2Hm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
 
+    // Angle treatment functions
     static Bool_t String2Angle(TString &str, Double_t &ret);
     static Bool_t Coordinate2Angle(const TString &str, Double_t &ret);
 
     static Double_t AngularDistance(Double_t theta0, Double_t phi0, Double_t theta1, Double_t phi1);
- 
+
+    // Time treatment functions
     static void  Mjd2Ymd(UInt_t mjd, UShort_t &y, Byte_t &m, Byte_t &d);
     static Int_t Ymd2Mjd(UShort_t y, Byte_t m, Byte_t d);
+
+    static Double_t UT2GMST(Double_t ut1);
 
     ClassDef(MAstro, 0)