Changeset 7179 for trunk/MagicSoft/Mars/mastro

Timestamp:

07/11/05 10:34:49 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mastro

Files:

• MAstro.cc (modified) (2 diffs)
• MAstro.h (modified) (1 diff)
• MAstroCatalog.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mastro/MAstro.cc

@@ -36 +36 @@
 
 #include "MTime.h"    // MTime::GetGmst
+#include "MString.h"
 
 #include "MAstroCatalog.h" // FIXME: replace by MVector3!
@@ -191 +192 @@
 {
     Day2Hm(h/24, sgn, deg, min);
+}
+
+TString MAstro::GetStringDeg(Double_t deg, const char *fmt)
+{
+    Char_t sgn;
+    UShort_t d, m, s;
+    Deg2Dms(deg, sgn, d, m, s);
+
+    MString str;
+    str.Print(fmt, sgn, d, m ,s);
+    return str;
+}
+
+TString MAstro::GetStringHor(Double_t deg, const char *fmt)
+{
+    Char_t sgn;
+    UShort_t h, m, s;
+    Hor2Hms(deg, sgn, h, m, s);
+
+    MString str;
+    str.Print(fmt, sgn, h, m ,s);
+    return str;
 }
 

trunk/MagicSoft/Mars/mastro/MAstro.h

@@ -45 +45 @@
     static void Hor2Hm(Double_t rad, Char_t &sgn, UShort_t &hor, Double_t &min);
 
+    // Print funtions
+    static TString GetStringDeg(Double_t deg, const char *fmt="%c%d:%02d:%02d");
+    static TString GetStringHor(Double_t deg, const char *fmt="%c%d:%02d:%02d");
+
     // Angle treatment functions
     static Bool_t  String2Angle(TString &str, Double_t &ret);

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -733 +733 @@
     const Double_t mag = -2.5*log10(v.Mag());
 
-    MString str;
-    str.Print("%s:  Ra=%.2fh  Dec=%.1fd  Mag=%.1f", v.GetName(), ra, dec, mag);
+    TString str(v.GetName());
+    if (!str.IsNull())
+        str += ":  ";
+    str += MString::Form("Ra=%.2fh  Dec=%.1fd  Mag=%.1f", ra, dec, mag);
     if (txt)
     {