Changeset 18629 for trunk

Timestamp:

09/18/16 14:55:45 (8 years ago)

Author:

tbretz

Message:

Disentengle from root and Mars were appropriate, some tidying.

Location:

trunk/FACT++/drive

Files:

• TPointStar.cc (modified) (5 diffs)
• TPointStar.h (modified) (3 diffs)

trunk/FACT++/drive/TPointStar.cc

@@ -1 +1 @@
 #include "TPointStar.h"
 
+#include <iostream>
 #include <TMath.h>
 
-#include "MLog.h"
-#include "MLogManip.h"
-
 #include "MPointing.h"
-
-ClassImp(TPointStar);
 
 using namespace std;
@@ -43 +39 @@
 AltAz TPointStar::GetRawAltAz() const   { return AltAz(fRawEl, fRawAz); }
 
-void TPointStar::AdjustEl(Double_t del) { fStarEl += del*TMath::DegToRad(); }
-void TPointStar::AdjustAz(Double_t daz) { fStarAz += daz*TMath::DegToRad(); }
-
 void TPointStar::Adjust(const MPointing &bend)
 {
@@ -73 +66 @@
     {
         // Error of one pixel in the CCD
-        const Double_t e1 = 32./3600*TMath::DegToRad()   * 0.5;
+        const Double_t e1 = 45./3600*TMath::DegToRad()  /4 * 0.5;
 
-        // Error of one SE unit
-        const Double_t e2 = 360./16384*TMath::DegToRad() * 0.5;
+        // Error of the SE readout
+        const Double_t e2 = 360./16384*TMath::DegToRad()/4 * 0.5;
 
         const Double_t e11 =  sin(del)+cos(fRawEl)*sin(fStarEl)*(1-cos(daz));
@@ -109 +102 @@
     if (n<4)
     {
-        gLog << err << "Read: ERROR - Not enough numbers" << endl;
+        cout << "Read: ERROR - Not enough numbers" << endl;
         return fin;
     }
@@ -120 +113 @@
     set.fRawEl  = v[3]*TMath::DegToRad();
 
+
+
     if (fin)
     {
         Double_t res, err;
         res = set.GetResidual(&err);
-        gLog << inf << "Read: " << v[0] << " " << v[1] << "  :  " << v[2] << " " << v[3] << "  :  " << v[2]-v[0] << " " << v[3]-v[1] << "  :  " << res << " " << err << " " << err/res << endl;
+        cout << "Read: " << v[0] << " " << v[1] << "  :  " << v[2] << " " << v[3] << "  :  " << v[2]-v[0] << " " << v[3]-v[1] << "  :  " << res << " " << err << " " << err/res << endl;
     }
 

trunk/FACT++/drive/TPointStar.h

@@ -5 +5 @@
 #include <TNamed.h>
 #endif
-
-//class istream;
-//class ostream;
 
 class ZdAz;
@@ -42 +39 @@
     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(); }
@@ -60 +56 @@
     AltAz GetRawAltAz() const;//   { return AltAz(fRawEl, fRawAz); }
 
-    void AdjustEl(Double_t del);// { fStarEl += del*TMath::DegToRad(); }
-    void AdjustAz(Double_t daz);// { fStarAz += daz*TMath::DegToRad(); }
-
-    void Adjust(const MPointing &bend);/*
-    {
-        AltAz p = bend(GetStarAltAz());
-        fStarEl = p.Alt();
-        fStarAz = p.Az();
-    }*/
-    void AdjustBack(const MPointing &bend);/*
-    {
-        AltAz p = bend.CorrectBack(GetRawAltAz());
-        fRawEl = p.Alt();
-        fRawAz = p.Az();
-    }*/
-    ClassDef(TPointStar, 1)
+    void Adjust(const MPointing &bend);
+    void AdjustBack(const MPointing &bend);
 };
-
-/*
-class TPoint : public TPointStar
-{
-public:
-    TPoint(Double_t sel=0, Double_t saz=0, Double_t rel=0, Double_t raz=0)
-        : TPointStar(sel, saz, rel, raz)
-    {
-    }
-    ClassDef(TPoint, 1)
-};
-*/
 
 std::istream &operator>>(std::istream &fin, TPointStar &set);