Changeset 8601 for trunk/MagicSoft/Mars/mpointing

Timestamp:

06/24/07 17:31:59 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpointing

Files:

• MPointingDevCalc.cc (modified) (6 diffs)
• MPointingDevCalc.h (modified) (6 diffs)
• MSrcPosCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc

@@ -65 +65 @@
 
 #include "MAstro.h"
+#include "MPointing.h"
 #include "MPointingDev.h"
 #include "MRawRunHeader.h"
@@ -73 +74 @@
 using namespace std;
 
-// --------------------------------------------------------------------------
+const TString MPointingDevCalc::fgFileName="resources/starguider.txt";
+
+// --------------------------------------------------------------------------
+//
+// Delete fPointing and set pointing to NULL
+//
+void MPointingDevCalc::Clear(Option_t *o)
+{
+    if (fPointing)
+        delete fPointing;
+
+    fPointing = NULL;
+}
+
+// --------------------------------------------------------------------------
+//
+// Clear the pointing model. If run-number >= 87751 read the new
+// pointing model with fFileName
+//
+Bool_t MPointingDevCalc::ReadPointingModel(const MRawRunHeader &run)
+{
+    if (run.GetRunNumber()<87751)
+    {
+        Clear();
+        return kTRUE;
+    }
+
+    if (!fPointing)
+        fPointing = new MPointing;
+
+    if (fFileName==fPointing->GetName())
+    {
+        *fLog << inf << fFileName << " already loaded." << endl;
+        return kTRUE;
+    }
+
+    return fPointing->Load(fFileName);
+}
+
+// --------------------------------------------------------------------------
+//
+// Check the file/run type from the run-header and if it is a data file
+// load starguider calibration.
 //
 Bool_t MPointingDevCalc::ReInit(MParList *plist)
@@ -95 +138 @@
         if (!fReport)
             *fLog << warn << "MReportStarguider not found... skipped." << endl;
-        return kTRUE;
+        return ReadPointingModel(*run);
 
     case MRawRunHeader::kRTMonteCarlo:
@@ -153 +196 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Do a full starguider calibration using a pointing model for the starguider.
+//
+void MPointingDevCalc::DoCalibration(Double_t devzd, Double_t devaz) const
+{
+    if (!fPointing)
+    {
+        // Do a simple starguider calibration using a simple offset in x and y
+        fDeviation->SetDevZdAz(devzd, devaz);
+
+        // Linear starguider calibration taken from April/May data
+        // For calibration add MDriveReport::GetErrorZd/Az !
+        fDeviation->SetDevXY(fDx, fDy); // 1arcmin ~ 5mm
+        //devzd -= 2.686/60;   
+        //devaz -= 2.840/60;
+
+        return;
+    }
+
+    // def?: 20.105, 773
+    // 0/0 : 20.119, 763
+    // -/- : 19.417  726
+    // +mis: 19.80,  756
+
+    // Get the nominal position the star is at the sky
+    // Unit: deg
+    ZdAz nom(fReport->GetNominalZd(), fReport->GetNominalAz());
+    nom *= TMath::DegToRad();
+
+    // Get the mispointing measured by the telescope. It is
+    // calculate as follows:
+    //
+    // Position at which the starguider camera is pointing in real:
+    //       pointing position = nominal position - mis
+    ZdAz mis(devzd, devaz);
+    mis *= TMath::DegToRad();
+
+    // The pointing mode is the conversion from the real pointing
+    // position of the telescope into the pointing position measured
+    // by the starguider.
+    //
+    //  --> To get the real poiting position of the telescope we have
+    //      to convert the measured position back;
+    //
+
+    // Position at which the starguider camera is pointing in real:
+    //       pointing position = nominal position - dev
+    //
+    // The position measured as the starguider's pointing position
+    ZdAz pos(nom);        // cpos = sao - dev
+    pos -= mis;
+
+    // Now we convert the starguider's pointing position into the
+    // telescope pointing position (the pointing model converts
+    // the telescope pointing position into the starguider pointing
+    // position)
+    ZdAz point = fPointing->CorrectBack(pos);
+
+    // MSrcPosCalc uses the following condition to calculate the
+    // source position in the camera:
+    //    real pointing pos = nominal pointing pos - dev
+    //
+    // Therefor we calculate dev as follows:
+    ZdAz dev(nom);
+    dev -= point;
+    dev *= TMath::RadToDeg();
+
+    // Set Measured mispointing and additional offset
+    fDeviation->SetDevZdAz(dev.Zd(), dev.Az());
+    fDeviation->SetDevXY(0, 0);
+}
+
 Int_t MPointingDevCalc::ProcessStarguiderReport()
 {
     /************* CHECK STATUS!!! ******************/
 
-    Double_t devzd = fReport->GetDevZd(); // [deg]
-    Double_t devaz = fReport->GetDevAz(); // [deg]
+    Double_t devzd = fReport->GetDevZd(); // [arcmin]
+    Double_t devaz = fReport->GetDevAz(); // [arcmin]
     if (devzd==0 && devaz==0)
     {
@@ -205 +321 @@
     }
 
+    // >= 87751 (31.3.06 12:00)
+
     // Calculate absolute deviation
     const Double_t dev = MAstro::GetDevAbs(fReport->GetNominalZd(), devzd, devaz);
@@ -215 +333 @@
     }
 
-    fDeviation->SetDevZdAz(devzd, devaz);
-
-    // Linear starguider calibration taken from April/May data
-    // For calibration add MDriveReport::GetErrorZd/Az !
-    fDeviation->SetDevXY(fDx, fDy);
-    //devzd -= 2.686/60;   // 1arcmin ~ 5mm
-    //devaz -= 2.840/60;
+    DoCalibration(devzd, devaz);
 
     fSkip[0]++;

trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.h

@@ -10 +10 @@
 #endif
 
+class MPointing;
 class MPointingDev;
+class MRawRunHeader;
 class MReportStarguider;
 
@@ -16 +18 @@
 {
 private:
+    static const TString fgFileName; //! default file name of pointing model
+
     MReportStarguider *fReport;    //! MReportStarguider to get mispointing
     MPointingDev      *fDeviation; //! Output container to store pointing deviation
+    MPointing         *fPointing;  //! MPointing, pointing model for the calibration
 
     UShort_t fRunType;             //! Run Type to decide where to get pointing position from
@@ -27 +32 @@
     TArrayI  fSkip;                //! Counter for execution statistics
     Double_t fLastMjd;             //! Time of last processed report
+
+    TString fFileName;             // File name of pointing model
 
     UInt_t  fNumMinStars;          // Minimum number of identified stars
@@ -39 +46 @@
 
     // MPointingDevCalc
+    void DoCalibration(Double_t devzd, Double_t devaz) const;
+
+    Bool_t ReadPointingModel(const MRawRunHeader &run);
+
     Int_t ProcessStarguiderReport();
     void  Skip(Int_t i);
@@ -52 +63 @@
 
 public:
-    MPointingDevCalc() : fReport(0), fDeviation(0), fSkip(7), fNumMinStars(8),
-        fNsbLevel(3), fNsbMin(30), fNsbMax(60), fMaxAbsDev(15), fMaxAge(1), fDx(-7), fDy(16)
+    MPointingDevCalc() : fReport(0), fDeviation(0), fPointing(0),
+        fSkip(7), fFileName(fgFileName), fNumMinStars(8),
+        fNsbLevel(3), fNsbMin(30), fNsbMax(60), fMaxAbsDev(15),
+        fMaxAge(1), fDx(-7), fDy(16)
     {
         fName  = "MPointingDevCalc";
@@ -60 +73 @@
         AddToBranchList("MReportStarguider.*");
     }
+    ~MPointingDevCalc()
+    {
+        Clear();
+    }
+
+    void Clear(Option_t *o="");
 
     void SetNumMinStars(UInt_t n)  { fNumMinStars=n; }

trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc

@@ -375 +375 @@
     pos0 *= conv;
 
-    TVector2 vx;
+    //TVector2 vx;
     if (fDeviation)
     {
+        // Position at which the starguider camera is pointing in real:
+        //       pointing position = nominal position - dev
+        //
         //vx = CalcXYinCamera(pos0, pos)*fGeom->GetCameraDist()*1000;
         pos0.SetZdAz(pos0.Theta()-fDeviation->GetDevZdRad(),