Changeset 10066 for trunk/Cosy

Timestamp:

12/01/10 09:35:50 (14 years ago)

Author:

tbretz

Message:

Propagate the TPoint file name to the output in telesto.

Location:

trunk/Cosy

Files:

• Changelog (modified) (2 diffs)
• tpoint/TPointGui.cc (modified) (3 diffs)
• tpoint/TPointStar.cc (modified) (3 diffs)
• tpoint/TPointStar.h (modified) (4 diffs)

trunk/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
- 2010/10/22 (La Palma)
+ 2010/12/01 Thomas Bretz
+
+   * tpoint/TPointGui.[h,cc]:
+     - propagate filename to output
+     - better formating of output
+
+   * tpoint/TPointStar.[h,cc]:
+     - now derived from TNamed to be able to store the filename
+
+
+
+ 2010/10/22 Thomas Bretz (La Palma)
 
    * devdrv/dkc.cc:
@@ -11 +22 @@
 
 
- 2010/10/21 (La Palma)
+ 2010/10/21 Thomas Bretz (La Palma)
 
    * catalog/SlaPlanets.[h,cc]:

trunk/Cosy/tpoint/TPointGui.cc

@@ -671 +671 @@
     }
 
+    TPointStar set(fname);
+
     while (1)
     {
-        TPointStar set;
-
         fin >> set;  // Read data from file [deg], it is stored in [rad]
         if (!fin)
@@ -907 +907 @@
 
     gLog << all << endl << "Sets with Residual exceeding " << fLimit << "deg:" << endl;
+    gLog << "   StarAz  StarEl      RawAz   RawEl      Mag Residual  Filename" << endl;
 
     //
@@ -946 +947 @@
 
         if (resi>fLimit) // 0.13
-            gLog << all << " " << orig << "  <" << resi << ">" << endl;
+            gLog << all << " " << orig << "  <" << Form("%5.3f", resi) << ">  " << orig.GetName() << endl;
 
         proaz.Fill(za.Az(), set0.GetResidual(&err));

trunk/Cosy/tpoint/TPointStar.cc

@@ -12 +12 @@
 using namespace std;
 
+void TPointStar::Init(const char *name, const char *title)
+{
+    fName  = name  ? name  : "TPointStar";
+    fTitle = title ? title : "A set of TPoints";
+}
+
 TPointStar::TPointStar(Double_t sel, Double_t saz, Double_t rel, Double_t raz) :
     fStarAz(saz*TMath::DegToRad()),
@@ -18 +24 @@
     fRawEl(rel*TMath::DegToRad()), fMag(-25)
 {
+    Init();
 }
 
@@ -137 +144 @@
 {
     out << Form("%8.3f", set.fStarAz*TMath::RadToDeg()) << " ";
-    out << Form("%8.3f", set.fStarEl*TMath::RadToDeg()) << " ";
+    out << Form("%7.3f", set.fStarEl*TMath::RadToDeg()) << "   ";
     out << Form("%8.3f", set.fRawAz*TMath::RadToDeg()) << " ";
-    out << Form("%8.1f", set.fRawEl*TMath::RadToDeg()) << " ";
-    out << set.fMag;
+    out << Form("%7.3f", set.fRawEl*TMath::RadToDeg()) << "   ";
+    out << Form("%6.3f", set.fMag);
 
     return out;

trunk/Cosy/tpoint/TPointStar.h

@@ -2 +2 @@
 #define COSY_TPointStar
 
-#ifndef ROOT_TObject
-#include <TObject.h>
+#ifndef ROOT_TNamed
+#include <TNamed.h>
 #endif
 
@@ -14 +14 @@
 class MPointing;
 
-class TPointStar : public TObject
+class TPointStar : public TNamed
 {
     friend istream &operator>>(istream &fin,  TPointStar &set);
@@ -26 +26 @@
 
     Double_t fMag;
+
+    void Init(const char *name=0, const char *title=0);
 public:
-    TPointStar(Double_t sel=0, Double_t saz=0, Double_t rel=0, Double_t raz=0);/*
-        fStarAz(saz*TMath::DegToRad()),
-        fStarEl(sel*TMath::DegToRad()),
-        fRawAz(raz*TMath::DegToRad()),
-        fRawEl(rel*TMath::DegToRad()), fMag(-25)
-    {
-    }*/
-
-    Double_t GetMag() const { return fMag; }
-    Double_t GetResidual(Double_t *err=0) const;
-    //Double_t GetResidual() const;
-
-    void operator=(TPointStar &set)
+    TPointStar(const char *name, const char *title=0) { Init(name, title); }
+    TPointStar(Double_t sel=0, Double_t saz=0, Double_t rel=0, Double_t raz=0);
+    TPointStar(const TPointStar &set) : TNamed(set)
     {
         fStarAz = set.fStarAz;
@@ -47 +39 @@
         fMag    = set.fMag;
     }
+
+    Double_t GetMag() const { return fMag; }
+    Double_t GetResidual(Double_t *err=0) const;
+    //Double_t GetResidual() const;
 
     Double_t GetDEl() const;//     { return (fRawEl-fStarEl)*TMath::RadToDeg(); }