Changeset 8725 for trunk/MagicSoft/Mars/mpointing/MPointing.h

Timestamp:

09/02/07 14:53:56 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpointing/MPointing.h (modified) (13 diffs)

trunk/MagicSoft/Mars/mpointing/MPointing.h

@@ -4 +4 @@
 #ifndef ROOT_TArrayD
 #include <TArrayD.h>
+#endif
+
+#ifndef ROOT_TVector2
+#include <TVector2.h>
 #endif
 
@@ -19 +23 @@
 //#include "coord.h"
 //#else
-#include <TVector2.h>
 class AltAz : public TVector2
 {
@@ -51 +54 @@
 {
 private:
-    static const Int_t fgNumPar;
+    enum {
+        kIA,           // [rad] Index Error in Elevation
+        kIE,           // [rad] Index Error in Azimuth
+        kFLOP,         // [rad] Vertical Sag
+        kAN,           // [rad] Az-El Nonperpendicularity
+        kAW,           // [rad] Left-Right Collimation Error
+        kNPAE,         // [rad] Azimuth Axis Misalignment (N-S)
+        kCA,           // [rad] Azimuth Axis Misalignment (E-W)
+        kTF,           // [rad] Tube fluxture (sin)
+        kTX,           // [rad] Tube fluxture (tan)
+        kECES,         // [rad] Nasmyth rotator displacement, horizontal
+        kACES,         // [rad] Nasmyth rotator displacement, vertical
+        kECEC,         // [rad] Alt/Az Coude Displacement (N-S)
+        kACEC,         // [rad] Alt/Az Coude Displacement (E-W)
+        kNRX,          // [rad] Elevation Centering Error (sin)
+        kNRY,          // [rad] Azimuth Centering Error (sin)
+        kCRX,          // [rad] Elevation Centering Error (cos)
+        kCRY,          // [rad] Azimuth Centering Error (cos)
+        kMAGIC1,       // [rad] Magic Term (what is it?)
+        kMAGIC2,       // [rad] Magic Term (what is it?)
+        kPX,           // [rad] Starguider calibration fixed offset x
+        kPY,           // [rad] Starguider calibration fixed offset y
+        kDX,           // [rad] Starguider calibration additional offset dx
+        kDY,           // [rad] Starguider calibration additional offset dy
+        kNumPar   // Number of elements
+    };
+
 
     Double_t fIe   ; // [rad] Index Error in Elevation
@@ -73 +102 @@
     Double_t fMagic2; // [rad] Magic Term (what is it?)
 
+    Double_t fPx;    // [rad] Starguider calibration fixed offset x
+    Double_t fPy;    // [rad] Starguider calibration fixed offset y
+    Double_t fDx;    // [rad] Starguider calibration additional offset dx
+    Double_t fDy;    // [rad] Starguider calibration additional offset dy
+
     Double_t **fCoeff; //!
     TString   *fNames; //!
@@ -83 +117 @@
     void Clear(Option_t *o="")
     {
-        for (int i=0; i<fgNumPar; i++)
+        for (int i=0; i<kNumPar; i++)
         {
             *fCoeff[i] = 0;
-            fError[i] = 0;
+            fError[i] = -1;
         }
     }
@@ -94 +128 @@
 
 public:
-    MPointing() { fError.Set(fgNumPar); Init(); Clear(); }
-    MPointing(const char *name) { fError.Set(fgNumPar); Init(); Clear(); Load(name); }
+    MPointing() : fError(kNumPar) { Init(); Clear(); }
+    MPointing(const char *name) : fError(kNumPar) { Init(); Clear(); Load(name); }
     virtual ~MPointing() { delete [] fNames; delete [] fCoeff; delete [] fDescr; }
 
@@ -117 +151 @@
     ZdAz operator()(const ZdAz &zdaz, void (*fcn)(ZdAz &zdaz, Double_t *par)) const
     {
-        Double_t par[fgNumPar];
+        Double_t par[kNumPar];
         GetParameters(par);
         ZdAz za = zdaz;
@@ -126 +160 @@
     AltAz operator()(const AltAz &aaz, void (*fcn)(AltAz &aaz, Double_t *par)) const
     {
-        Double_t par[fgNumPar];
+        Double_t par[kNumPar];
         GetParameters(par);
         AltAz aa = aaz;
@@ -135 +169 @@
     TVector3 operator()(const TVector3 &aaz, void (*fcn)(TVector3 &aaz, Double_t *par)) const
     {
-        Double_t par[fgNumPar];
+        Double_t par[kNumPar];
         GetParameters(par);
         TVector3 v = aaz;
@@ -174 +208 @@
     }
 
-    void SetParameters(const Double_t *par, Int_t n=fgNumPar);
-    void GetParameters(Double_t *par, Int_t n=fgNumPar) const;
+    void SetParameters(const Double_t *par, Int_t n=kNumPar);
+    void GetParameters(Double_t *par, Int_t n=kNumPar) const;
 
     void SetParameters(const TArrayD &par)
@@ -183 +217 @@
     void GetParameters(TArrayD &par) const
     {
-        par.Set(fgNumPar);
+        par.Set(kNumPar);
         GetParameters(par.GetArray());
     }
@@ -189 +223 @@
     {
         par = fError;
-        for (int i=0; i<fgNumPar; i++)
+        for (int i=0; i<kNumPar; i++)
             par[i] *= TMath::RadToDeg();
     }
@@ -217 +251 @@
      */
 
-    static const Int_t GetNumPar() { return fgNumPar; }
-
-    ClassDef(MPointing, 1) // Pointing Model for MAGIC
+    TVector2 GetDxy() const { return TVector2(fDx, fDy)*TMath::RadToDeg(); }
+
+    Double_t GetPx() const { return fPx*TMath::RadToDeg(); }
+    Double_t GetPy() const { return fPy*TMath::RadToDeg(); }
+
+    Bool_t IsPxValid() const { return fError[kPX]>0; }
+    Bool_t IsPyValid() const { return fError[kPY]>0; }
+
+    static const Int_t GetNumPar() { return kNumPar; }
+
+    ClassDef(MPointing, 2) // Pointing Model for MAGIC
 };