Changeset 8719 for trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc (modified) (3 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)