Changeset 7594 for trunk/MagicSoft/Mars/mpointing

Timestamp:

03/13/06 15:51:11 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpointing

Files:

• MPointingDevCalc.cc (modified) (2 diffs)
• MPointingDevCalc.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc

@@ -192 +192 @@
     // Linear starguider calibration taken from April/May data
     // For calibration add MDriveReport::GetErrorZd/Az !
-    fDeviation->SetDevXY(-7.0, 16);
+    fDeviation->SetDevXY(fDx, fDy);
     //devzd -= 2.686/60;   // 1arcmin ~ 5mm
     //devaz -= 2.840/60;
@@ -278 +278 @@
         rc = kTRUE;
     }
+    if (IsEnvDefined(env, prefix, "Dx", print))
+    {
+        fDx = GetEnvValue(env, prefix, "Dx", fDx);
+        rc = kTRUE;
+    }
+    if (IsEnvDefined(env, prefix, "Dy", print))
+    {
+        fDy = GetEnvValue(env, prefix, "Dy", fDy);
+        rc = kTRUE;
+    }
 
     return rc;

trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.h

@@ -33 +33 @@
     Float_t fMaxAbsDev;            // [arcmin] Maximum considered absolute deviation
 
+    Float_t fDx;                   // Starguider calibration dx
+    Float_t fDy;                   // Starguider calibration dy
+
     // MPointingDevCalc
     Int_t ProcessStarguiderReport();
@@ -47 +50 @@
 public:
     MPointingDevCalc() : fReport(0), fDeviation(0), fSkip(5), fNumMinStars(8),
-        fNsbLevel(3), fNsbMin(30), fNsbMax(60), fMaxAbsDev(15)
+        fNsbLevel(3), fNsbMin(30), fNsbMax(60), fMaxAbsDev(15), fDx(-7), fDy(16)
     {
         fName  = "MPointingDevCalc";
@@ -60 +63 @@
     void SetNsbMax(Float_t nsb)    { fNsbMax=nsb;    }
     void SetMaxAbsDev(Float_t max) { fMaxAbsDev=max; }
+    void SetDx(Float_t dx)         { fDx=dx; }
+    void SetDy(Float_t dy)         { fDy=dy; }
 
     ClassDef(MPointingDevCalc, 0) //Task calculating the pointing deviation