Changeset 7389

Timestamp:

11/10/05 10:12:01 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mjobs/MDataSet.cc (modified) (1 diff)
• mjobs/MJCut.cc (modified) (1 diff)
• mpointing/MPointingPos.cc (modified) (2 diffs)
• mpointing/MPointingPos.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -421 +421 @@
                 line.Remove(i--, 1);
 
-        if (fNameSource!=line(0, fNameSource.Length()))
+        const Ssiz_t s = line.First(',');
+        if (s<0 || fNameSource!=line(0, s))
             continue;
 

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -452 +452 @@
             return kFALSE;
         plist.AddToList(&source);
-        *fLog << inf << "Using Source Position: " << source.GetTitle() << endl;
+        *fLog << inf << "Using Source Position: ";
+        source.Print("RaDec");
     }
     else

trunk/MagicSoft/Mars/mpointing/MPointingPos.cc

@@ -42 +42 @@
 #include "MPointingPos.h"
 
+#include "MLog.h"
+
 #include "MTime.h"
+#include "MAstro.h"
 #include "MObservatory.h"
 #include "MPointingDev.h"
@@ -78 +81 @@
         MAstroSky2Local(t, o).RotationAngle(GetRaRad(), GetDecRad());
 }
+
+void MPointingPos::Print(Option_t *o) const
+{
+    TString opt(o);
+
+    if (opt.IsNull())
+        opt = "radeczdaz";
+
+    *fLog << GetDescriptor() << ": ";
+
+    if (opt.Contains("ra", TString::kIgnoreCase))
+        *fLog << " Ra=" << MAstro::GetStringHor(fRa);
+    if (opt.Contains("ha", TString::kIgnoreCase))
+        *fLog << " Ha=" << MAstro::GetStringHor(fHa);
+    if (opt.Contains("dec", TString::kIgnoreCase))
+        *fLog << " Dec=" << MAstro::GetStringDeg(fDec);
+    if (opt.Contains("zd", TString::kIgnoreCase))
+        *fLog << " Zd=" << MAstro::GetStringDeg(fZd);
+    if (opt.Contains("az", TString::kIgnoreCase))
+        *fLog << " Az=" << MAstro::GetStringDeg(fAz);
+    *fLog << endl;
+}

trunk/MagicSoft/Mars/mpointing/MPointingPos.h

@@ -36 +36 @@
     }
 
+    void Print(Option_t *o="") const;
+
     void SetLocalPosition(Double_t zd, Double_t az) { fZd=zd; fAz=az; }
     void SetSkyPosition(Double_t ra, Double_t dec, Double_t ha=0) { fRa=ra; fDec=dec; fHa=ha; }