Changeset 6277 for trunk/MagicSoft/Mars/mastro

Timestamp:

02/07/05 11:48:14 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mastro

Files:

• MAstro.cc (modified) (1 diff)
• MAstro.h (modified) (1 diff)

trunk/MagicSoft/Mars/mastro/MAstro.cc

@@ -241 +241 @@
     ret = Dms2Deg(d, m, s, sgn);
     return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Returns val=-12.5 as string '-12:30:00'
+//
+TString MAstro::Angle2Coordinate(Double_t val)
+{
+    Char_t  sgn;
+    UShort_t d,m,s;
+
+    Deg2Dms(val, sgn, d, m, s);
+
+    return Form("%c%02d:%02d:%02d", sgn, d, m, s);
 }
 

trunk/MagicSoft/Mars/mastro/MAstro.h

@@ -29 +29 @@
     static Double_t Hms2Hor(Int_t hor, UInt_t min, Double_t sec, Char_t sgn='+');
 
-    static void Day2Hms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
+    static void Day2Hms(Double_t day, Char_t &sgn, UShort_t &hor, UShort_t &min, UShort_t &sec);
     static void Rad2Dms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
-    static void Rad2Hms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
-    static void Deg2Dms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
-    static void Deg2Hms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
-    static void Hor2Dms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
-    static void Hor2Hms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
+    static void Rad2Hms(Double_t rad, Char_t &sgn, UShort_t &hor, UShort_t &min, UShort_t &sec);
+    static void Deg2Dms(Double_t deg, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
+    static void Deg2Hms(Double_t deg, Char_t &sgn, UShort_t &hor, UShort_t &min, UShort_t &sec);
+    static void Hor2Dms(Double_t hor, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
+    static void Hor2Hms(Double_t hor, Char_t &sgn, UShort_t &hor, UShort_t &min, UShort_t &sec);
 
-    static void Day2Hm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
+    static void Day2Hm(Double_t day, Char_t &sgn, UShort_t &hor, Double_t &min);
     static void Rad2Dm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
-    static void Rad2Hm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
-    static void Deg2Dm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
-    static void Deg2Hm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
+    static void Rad2Hm(Double_t rad, Char_t &sgn, UShort_t &hor, Double_t &min);
+    static void Deg2Dm(Double_t deg, Char_t &sgn, UShort_t &deg, Double_t &min);
+    static void Deg2Hm(Double_t deg, Char_t &sgn, UShort_t &hor, Double_t &min);
     static void Hor2Dm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
-    static void Hor2Hm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
+    static void Hor2Hm(Double_t rad, Char_t &sgn, UShort_t &hor, 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 Bool_t  String2Angle(TString &str, Double_t &ret);
+    static Bool_t  Coordinate2Angle(const TString &str, Double_t &ret);
+    static TString Angle2Coordinate(Double_t val);
 
     static Double_t AngularDistance(Double_t theta0, Double_t phi0, Double_t theta1, Double_t phi1);