Changeset 8719 for trunk/MagicSoft/Mars/mpointing

Timestamp:

08/28/07 13:03:04 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpointing

Files:

• MSrcPosCalc.cc (modified) (3 diffs)
• MSrcPosCalc.h (modified) (1 diff)
• MSrcPosCorrect.cc (modified) (5 diffs)
• MSrcPosCorrect.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc

@@ -178 +178 @@
             *fLog << inf;
             *fLog << "MSourcePos [MPointPos] not found... The source position" << endl;
-            *fLog << "set in MSrcPosCam will be set to (0/0)  or in the case" << endl;
+            *fLog << "set in MSrcPosCam will be set to  (0/0)  or in the case" << endl;
             *fLog << "of  Monte Carlo set to the appropriate wobble position." << endl;
             return kTRUE;
@@ -331 +331 @@
 
     return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Loc0LocToCam
-//
-// Input :   (theta0, phi0)   direction for the position (0,0) in the camera  
-//           ( theta,  phi)   some other direction
-// 
-// Output :  (X, Y)      position in the camera corresponding to (theta, phi)
-//
-TVector2 MSrcPosCalc::CalcXYinCamera(const MVector3 &pos0, const MVector3 &pos) const
-{
-    const Double_t theta0 = pos0.Theta();
-    const Double_t phi0   = pos0.Phi();
-
-    const Double_t theta  = pos.Theta();
-    const Double_t phi    = pos.Phi();
-
-    //--------------------------------------------
-
-    /* --- OLD ---
-     const Double_t YC0 = TMath::Cos(theta0)*TMath::Tan(theta)*TMath::Cos(phi-phi0) - TMath::Sin(theta0);
-     const Double_t YC1 = TMath::Cos(theta0) + TMath::Sin(theta0)*TMath::Tan(theta);
-     const Double_t YC  = YC0 / YC1;
-
-     const Double_t XC0 =  TMath::Cos(theta0) - YC*TMath::Sin(theta0);
-     const Double_t XC  = -TMath::Sin(phi-phi0) * TMath::Tan(theta) * XC0;
-     */
-
-    /* --- NEW ---  Same as MSrcPosCorrect::CalcXYinCamera */
-    const Double_t XC0 = TMath::Sin(theta)*TMath::Sin(phi-phi0);
-    const Double_t XC1 = TMath::Cos(theta0)*TMath::Cos(theta);
-    const Double_t XC2 = TMath::Sin(theta0)*TMath::Sin(theta)*TMath::Cos(phi-phi0);
-
-    const Double_t YC0 = TMath::Sin(theta0)*TMath::Cos(theta);
-    const Double_t YC1 = TMath::Cos(theta0)*TMath::Sin(theta)*TMath::Cos(phi-phi0);
-
-    const Double_t XC  =  - XC0     / (XC1 + XC2);
-    const Double_t YC  = (-YC0+YC1) / (XC1 + XC2);
-
-    //--------------------------------------------
-    return TVector2(XC, YC);
 }
 
@@ -428 +385 @@
 
     // Calculate source position in camera, and convert to mm:
-    TVector2 v = CalcXYinCamera(pos0, pos)*fGeom->GetCameraDist()*1000;
+    TVector2 v = MAstro::GetDistOnPlain(pos0, pos, -fGeom->GetCameraDist()*1000);
 
     if (fDeviation)

trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.h

@@ -53 +53 @@
     void     SetSrcPos(TVector2 v=TVector2()) const;
     TVector2 Rotate(TVector2 v, Int_t pass, Int_t num) const;
-    TVector2 CalcXYinCamera(const MVector3 &pos0, const MVector3 &pos) const;
     TString  GetRaDec(const MPointingPos &pos) const;
     Bool_t   GetCoordinate(TString str, Double_t &ret) const;

trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz 6/2005 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2005
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -27 +27 @@
 // MSrcPosCorrect
 //
-// For more details see Process()
-//
-//////////////////////////////////////////////////////////////////////////////
-#include "MSrcPosCorrect.h"
-
-#include <TVector2.h>
-
-#include "MParList.h"
-
-#include "MLog.h"
-#include "MLogManip.h"
-
-#include "MGeomCam.h"
-#include "MSrcPosCam.h"
-#include "MRawRunHeader.h"
-#include "MReportStarguider.h"
-
-ClassImp(MSrcPosCorrect);
-
-using namespace std;
-
-// --------------------------------------------------------------------------
-//
-MSrcPosCorrect::MSrcPosCorrect(const char *name, const char *title)
-    : fSrcPosCam(NULL), fSrcPosAnti(NULL), fAxis(NULL), fGeom(NULL)
-     , fDx(-14.24) , fDy(-9.495)
-
-{
-    fName  = name  ? name  : "MSrcPosCorrect";
-    fTitle = title ? title : "Calculates the source position in the camera";
-}
-
-// --------------------------------------------------------------------------
-//
-// Search and if necessary create MSrcPosCam in the parameter list. Search
-// MSourcePos. If not found, do nothing else, and skip the task. If MSrcPosCam
-// did not exist before and has been created here, it will contain as source
-// position the camera center (0,0).
-// In the case that MSourcePos is found, go ahead in searching the rest of
-// necessary containers. The source position will be calculated for each
-// event in Process.
-//
-Int_t MSrcPosCorrect::PreProcess(MParList *pList)
-{
-    fSrcPosCam = (MSrcPosCam*)pList->FindObject("MSrcPosCam");
-    if (!fSrcPosCam)
-    {
-        *fLog << err << "MSrcPosCam not found... aborting." << endl;
-        return kFALSE;
-    }
-
-    fSrcPosAnti = (MSrcPosCam*)pList->FindObject("MSrcPosAnti", "MSrcPosCam");
-
-    fAxis = (MSrcPosCam*)pList->FindCreateObj("MSrcPosCam", "OpticalAxis");
-    if (!fAxis)
-        return kFALSE;
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Checking for file type. If the file type is Monte Carlo the
-// source position is arbitrarily determined from the MC headers.
-//
-Bool_t MSrcPosCorrect::ReInit(MParList *plist)
-{
-    MRawRunHeader *run = (MRawRunHeader*)plist->FindObject("MRawRunHeader");
-    if (!run)
-    {
-        *fLog << err << "MRawRunHeader not found... aborting." << endl;
-        return kFALSE;
-    }
-
-    fRunType   = run->GetRunType();
-    fRunNumber = run->GetRunNumber();
-
-    if (fRunNumber<56161 && fRunNumber>53832)
-    {
-        *fLog << inf << "Run Number " << fRunNumber << " between 53832 and 56161." << endl;
-        *fLog << "A misfocussing correction (" << fDx << "mm/" << fDy << "mm) will be applied." << endl;
-    }
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Performs source position correction in the camera.
+// Performs a misfocussing correction for source and anti-source position
+// in the camera, i.e. it is assumed that the telscope is pointing well
+// (all starguider and other corrections are already applied to the
+// source positon) but the mirror is not focussing to the center of
+// the camera.
+//
 // Due to missfocussing a shift of
 //    dx=0.048deg and dy=0.034deg
@@ -121 +38 @@
 //    dx=14.24mm and dy=9.495mm
 // is added between run 53832 (excl) and 56161 (excl)
+//
 //
 // See also: Runbook
@@ -153 +71 @@
 //   W-Comae
 //
+//
+// For more details see Process()
+//
+// Input:
+//   MSrcPosCam
+//   MSrcPosAnti [MSrcPosCam]
+//
+// Output:
+//   OpticalAxis [MSrcPosCam]
+//   MSrcPosCam
+//   MSrcPosAnti [MSrcPosCam]
+//
+//////////////////////////////////////////////////////////////////////////////
+#include "MSrcPosCorrect.h"
+
+#include <TVector2.h>
+
+#include "MParList.h"
+
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MGeomCam.h"
+#include "MSrcPosCam.h"
+#include "MRawRunHeader.h"
+#include "MReportStarguider.h"
+
+ClassImp(MSrcPosCorrect);
+
+using namespace std;
+
+// --------------------------------------------------------------------------
+//
+MSrcPosCorrect::MSrcPosCorrect(const char *name, const char *title)
+    : fSrcPosCam(NULL), fSrcPosAnti(NULL), fAxis(NULL), fGeom(NULL)
+     , fDx(-14.24) , fDy(-9.495)
+
+{
+    fName  = name  ? name  : "MSrcPosCorrect";
+    fTitle = title ? title : "Calculates the source position in the camera";
+}
+
+// --------------------------------------------------------------------------
+//
+// Search and if necessary create MSrcPosCam in the parameter list. Search
+// MSourcePos. If not found, do nothing else, and skip the task. If MSrcPosCam
+// did not exist before and has been created here, it will contain as source
+// position the camera center (0,0).
+// In the case that MSourcePos is found, go ahead in searching the rest of
+// necessary containers. The source position will be calculated for each
+// event in Process.
+//
+Int_t MSrcPosCorrect::PreProcess(MParList *pList)
+{
+    fSrcPosCam = (MSrcPosCam*)pList->FindObject("MSrcPosCam");
+    if (!fSrcPosCam)
+    {
+        *fLog << err << "MSrcPosCam not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fSrcPosAnti = (MSrcPosCam*)pList->FindObject("MSrcPosAnti", "MSrcPosCam");
+
+    fAxis = (MSrcPosCam*)pList->FindCreateObj("MSrcPosCam", "OpticalAxis");
+    if (!fAxis)
+        return kFALSE;
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Checking for file type. If the file type is Monte Carlo the
+// source position is arbitrarily determined from the MC headers.
+//
+Bool_t MSrcPosCorrect::ReInit(MParList *plist)
+{
+    MRawRunHeader *run = (MRawRunHeader*)plist->FindObject("MRawRunHeader");
+    if (!run)
+    {
+        *fLog << err << "MRawRunHeader not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fRunType   = run->GetRunType();
+    fRunNumber = run->GetRunNumber();
+
+    if (fRunNumber<56161 && fRunNumber>53832)
+    {
+        *fLog << inf << "Run Number " << fRunNumber << " between 53832 and 56161." << endl;
+        *fLog << "A misfocussing correction (" << fDx << "mm/" << fDy << "mm) will be applied." << endl;
+    }
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// The offset fDx/fDy is subtracted from the source position. The anti-
+// source position is shifted away from the camera-center and rotated
+// around the camera center according to this correction, because it
+// should always be symmetric w.r.t. the camera-center, but it is not
+// necessary on the other side of the camera (e.g. three off-regions).
+//
 Int_t MSrcPosCorrect::Process()
 {
@@ -158 +180 @@
         return kTRUE;
 
-    TVector2 d;
-    if (fRunNumber<56161 && fRunNumber>53832)
-    {
-        // dx=-0.048deg, dy=0.034deg, d=0.059deg
-        static const TVector2 dxy(fDx, fDy);
-
-        d -= dxy;
-    }
-
-    fAxis->SetXY(d);
-    fSrcPosCam->Add(d);
-    if (fSrcPosAnti)
-    {
-        d *= -1; // Anti-Source position should always be symetric
-        fSrcPosAnti->Add(d);
-    }
+    if (fRunNumber<=53832 || fRunNumber>=56161)
+        return kTRUE;
+
+    // dx=-0.048deg, dy=0.034deg, d=0.059deg
+    const TVector2 dxy(-fDx, -fDy);
+
+    const TVector2 s1(fSrcPosCam->GetXY());
+    const TVector2 a1(fSrcPosAnti->GetXY());
+    const TVector2 s2 = s1 + dxy;
+
+
+    // Anti-Source position should always be symetric w.r.t. camera center
+    TVector2 a2;
+    a2.SetMagPhi(a1.Mod()+s2.Mod()-s1.Mod(), a1.Phi()+s2.DeltaPhi(s1));
+
+    fAxis->SetXY(dxy);
+    fSrcPosCam->SetXY(s2);
+    fSrcPosAnti->SetXY(s2);
 
     return kTRUE;
 }
 
+// --------------------------------------------------------------------------
+//
+// MSrcPosCorrect.Dx: -14.24
+// MSrcPosCorrect.Dy: -9.495
+//
+// For a detailed description see the class reference.
+//
 Int_t MSrcPosCorrect::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {

trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.h

@@ -14 +14 @@
 {
 private:
-    MSrcPosCam *fSrcPosCam;   //!
-    MSrcPosCam *fSrcPosAnti;  //!
-    MSrcPosCam *fAxis;        //!
+    MSrcPosCam *fSrcPosCam;   //! Source position
+    MSrcPosCam *fSrcPosAnti;  //! Anti source position
+    MSrcPosCam *fAxis;        //! New "center of camera"
 
-    MGeomCam   *fGeom;        //!
+    MGeomCam   *fGeom;        //! Camera geometry
 
     UShort_t fRunType;        //! Run Type to decide where to get pointing position from
-    UInt_t   fRunNumber;
+    UInt_t   fRunNumber;      //! Current run number
 
-    Float_t fDx;
-    Float_t fDy;
+    Float_t fDx;              // [mm] Correction in x
+    Float_t fDy;              // [mm] Correction in y
 
     // MTask
@@ -36 +36 @@
     MSrcPosCorrect(const char *name=NULL, const char *title=NULL);
 
-    ClassDef(MSrcPosCorrect, 0) // Corrects MSrcPOsCam for missfocussing
+    ClassDef(MSrcPosCorrect, 0) // Corrects MSrcPosCam for missfocussing
 };