Changeset 7550

Timestamp:

03/01/06 10:05:14 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mastro/MAstro.cc (modified) (1 diff)
• mbase/MTime.cc (modified) (1 diff)
• mpointing/MPointingPos.cc (modified) (3 diffs)
• mpointing/MPointingPos.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/03/01 Thomas Bretz
+
+   * mastro/MAstro.cc, mbase/MTime.cc:
+     - added a comment in GetMagicPeriod
+
+   * mpointing/MPointingPos.cc:
+     - added new member function GetString
+     - moved code from Print to GetString
+
+
+
  2006/02/28 Daniela Dorner
 

trunk/MagicSoft/Mars/mastro/MAstro.cc

@@ -572 +572 @@
 //   GetMagicPeriod(t.GetMjd());
 //
+// To get a floating point magic period use
+//   GetMoonPeriod(mjd)-284
+//
 Int_t MAstro::GetMagicPeriod(Double_t mjd)
 {

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -171 +171 @@
 //   GetMagicPeriod(t.GetMjd());
 //
+// To get a floating point magic period use
+//   GetMoonPeriod()-284
 //
 //  see MAstro::GetMagicPeriod

trunk/MagicSoft/Mars/mpointing/MPointingPos.cc

@@ -46 +46 @@
 #include "MTime.h"
 #include "MAstro.h"
+#include "MString.h"
 #include "MObservatory.h"
 #include "MPointingDev.h"
@@ -85 +86 @@
 }
 
-void MPointingPos::Print(Option_t *o) const
+TString MPointingPos::GetString(Option_t *o) const
 {
     TString opt(o);
@@ -92 +93 @@
         opt = "radeczdaz";
 
-    *fLog << GetDescriptor() << ":";
+    TString rc;
 
     if (opt.Contains("ra", TString::kIgnoreCase))
-        *fLog << " Ra=" << MAstro::GetStringHor(fRa);
+        rc += MString::Form(" Ra=%s", MAstro::GetStringHor(fRa).Data());
+
     if (opt.Contains("ha", TString::kIgnoreCase))
-        *fLog << " Ha=" << MAstro::GetStringHor(fHa);
+        rc += MString::Form(" Ha=%s", MAstro::GetStringHor(fHa).Data());
+
     if (opt.Contains("dec", TString::kIgnoreCase))
-        *fLog << " Dec=" << MAstro::GetStringDeg(fDec);
+        rc += MString::Form(" Dec=%s", MAstro::GetStringDeg(fDec).Data());
+
     if (opt.Contains("zd", TString::kIgnoreCase))
-        *fLog << " Zd=" << MAstro::GetStringDeg(fZd);
+        rc += MString::Form(" Zd=%s", MAstro::GetStringDeg(fZd).Data());
+
     if (opt.Contains("az", TString::kIgnoreCase))
-        *fLog << " Az=" << MAstro::GetStringDeg(fAz);
+        rc += MString::Form(" Az=%s", MAstro::GetStringDeg(fAz).Data());
 
     if (fTitle!=gsDefTitle)
-        *fLog << " <" << fTitle << ">";
+        rc += MString::Form(" <%s>", fTitle.Data());
 
-    *fLog << endl;
+    return rc.Strip(TString::kBoth);
 }
+
+void MPointingPos::Print(Option_t *o) const
+{
+    *fLog << GetDescriptor() << ": " << GetString(o) << endl;
+}

trunk/MagicSoft/Mars/mpointing/MPointingPos.h

@@ -39 +39 @@
     }
 
+    Bool_t IsInitialized() const { return !(fZd==0 && fAz==0 && fRa==0 && fHa==0 && fDec==0); }
+
     void Print(Option_t *o="") const;
+
+    TString GetString(Option_t *o="") const;
 
     void SetLocalPosition(Double_t zd, Double_t az) { fZd=zd; fAz=az; }