Changeset 7220 for trunk/MagicSoft/Mars/mpointing

Timestamp:

07/25/05 18:44:24 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpointing

Files:

• MPointingDev.h (modified) (3 diffs)
• MPointingDevCalc.cc (modified) (1 diff)
• MSrcPosCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mpointing/MPointingDev.h

@@ -4 +4 @@
 #ifndef MARS_MParContainer
 #include "MParContainer.h"
+#endif
+#ifndef ROOT_TVector2
+#include <TVector2.h>
 #endif
 
@@ -11 +14 @@
     Double_t fDevZd;  // [deg] Pointing offset zenith distance as calculated from starguider data
     Double_t fDevAz;  // [deg] Pointing offset azimuth as calculated from starguider dat
+
+    Double_t fDevX;   // [mm]
+    Double_t fDevY;   // [mm]
 
 public:
@@ -20 +26 @@
 
     void SetDevZdAz(Double_t devzd, Double_t devaz) { fDevZd=devzd; fDevAz=devaz; }
+    void SetDevXY(Double_t dx, Double_t dy) { fDevX=dx; fDevY=dy; }
 
     Double_t GetDevZd() const  { return fDevZd; }
     Double_t GetDevAz() const  { return fDevAz; }
+
+    Double_t GetDevX() const  { return fDevX; }
+    Double_t GetDevY() const  { return fDevY; }
+
+    TVector2 GetDevXY() const { return TVector2(fDevX, fDevY); }
 
     Double_t GetDevZdRad() const  { return fDevZd*TMath::DegToRad(); }

trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc

@@ -176 +176 @@
     }
 
+    // Calculate absolute deviation
+    const Double_t dev = MAstro::GetDevAbs(fReport->GetNominalZd(), devzd, devaz);
+
+    // Sanity check... larger deviation are strange and ignored
+    if (dev*60>fMaxAbsDev)
+    {
+        fSkip[4]++;
+        return kTRUE;
+    }
+
+    fDeviation->SetDevZdAz(devzd, devaz);
+
     // Linear starguider calibration taken from April/May data
     // For calibration add MDriveReport::GetErrorZd/Az !
-    devzd -= 2.686/60;   // 1arcmin ~ 5mm
-    devaz -= 2.840/60;
-
-    // Calculate absolute deviation
-    const Double_t dev = MAstro::GetDevAbs(fReport->GetNominalZd(), devzd, devaz);
-
-    // Sanity check... larger deviation are strange and ignored
-    if (dev*60>fMaxAbsDev)
-    {
-        fSkip[4]++;
-        return kTRUE;
-    }
-
-    fDeviation->SetDevZdAz(devzd, devaz);
+    fDeviation->SetDevXY(-7.0, 16);
+    //devzd -= 2.686/60;   // 1arcmin ~ 5mm
+    //devaz -= 2.840/60;
+
     fSkip[0]++;
 

trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc

@@ -371 +371 @@
     if (fDeviation)
     {
-        vx = CalcXYinCamera(pos0, pos)*fGeom->GetCameraDist()*1000;
+        //vx = CalcXYinCamera(pos0, pos)*fGeom->GetCameraDist()*1000;
         pos0.SetZdAz(pos0.Theta()-fDeviation->GetDevZdRad(),
                      pos0.Phi()  -fDeviation->GetDevAzRad());
@@ -378 +378 @@
     // Calculate source position in camera, and convert to mm:
     TVector2 v = CalcXYinCamera(pos0, pos)*fGeom->GetCameraDist()*1000;
+
+    if (fDeviation)
+        v -= fDeviation->GetDevXY();
+
     SetSrcPos(v);