Changeset 3366 for trunk/MagicSoft/Mars/mhist

Timestamp:

03/01/04 11:36:44 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHStarMap.cc (modified) (5 diffs)
• MHStarMap.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mhist/MHStarMap.cc

@@ -17 +17 @@
 !
 !   Author(s): Thomas Bretz    12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
-!              Wolfgang Wittek 02/2004 <mailto:wittek@mppmu.mpg.de>
+!   Author(s): Wolfgang Wittek 02/2004 <mailto:wittek@mppmu.mpg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2004
@@ -178 +178 @@
 Bool_t MHStarMap::ReInit(MParList *pList)
 {
-    MObservatory *obs = (MObservatory*)pList->FindObject(AddSerialNumber("MObservatory"));
-    if (!obs)
+    fObservatory = (MObservatory*)pList->FindObject(AddSerialNumber("MObservatory"));
+    if (!fObservatory)
     {
         *fLog << err << "MObservatory not found...  aborting" << endl;
@@ -188 +188 @@
     fCosLat = TMath::Cos(obs->GetPhi());
 
-    *fLog << "fSinLat, fCosLat = " << fSinLat << ",  "
-          << fCosLat << endl;
-
     return kTRUE;
 }
@@ -196 +193 @@
 // --------------------------------------------------------------------------
 //
-// RotationAngle 
-// 
-// calculates the angle for the rotation of the sky image in the camera;
-// this angle is a function of the local coordinates (theta, phi) in rad.
-//
-// calculate rotation angle alpha of sky image in camera
-// (see TDAS 00-11, eqs. (18) and (20))
-//
-void MHStarMap::GetRotationAngle(const Double_t &theta, const Double_t &phi,
-                                 Double_t &cosal, Double_t &sinal)
-{
-
-    const Double_t sint = TMath::Sin(theta);
-    const Double_t cost = TMath::Cos(theta);
-
-    const Double_t sinp = TMath::Sin(phi);
-    const Double_t cosp = TMath::Cos(phi);
-
-    const Double_t v1 = sint*sinp;
-    const Double_t v2 = fCosLat*cost - fSinLat*sint*cosp;
-
-    const Double_t denom =  1./ TMath::Sqrt(v1*v1 + v2*v2);
-
-    cosal =  (fSinLat * sint - fCosLat * cost * cosp) * denom;
-    sinal =   fCosLat * sinp                          * denom;
+// Calls MObservatory::RotationAngle
+//
+void MHStarMap::GetRotationAngle(Double_t &sin, Double_t &cos)
+{
+    fObservatory->RotationAngle(fMcEvt->GetTelescopeTheta(),
+                                fMcEvt->GetTelescopePhi(), sin, cos);
 }
 
@@ -270 +248 @@
     Double_t cosal;
     Double_t sinal;
-    GetRotationAngle(theta, phi, cosal, sinal);
+    GetRotationAngle(sinal, cosal);
 
     if (m>-1 && m<1)

trunk/MagicSoft/Mars/mhist/MHStarMap.h

@@ -10 +10 @@
 class MSrcPosCam;
 class MMcEvt;
+class MObservatory;
 
 class MHStarMap : public MH
 {
 private:
-    MSrcPosCam *fSrcPos; //!
-    MMcEvt     *fMcEvt;  //!
+    MSrcPosCam   *fSrcPos; //!
+    MMcEvt       *fMcEvt;  //!
+    MObservatory *fObservatory; //!
 
     TH2F *fStarMap;      //->
@@ -23 +25 @@
     Bool_t fUseMmScale;
 
-    Float_t fCosLat; //!
-    Float_t fSinLat; //!
-
     void PrepareDrawing() const;
 
     void Paint(Option_t *opt="");
 
+    void GetRotationAngle(Double_t &sinangle, Double_t &cosangle);
 
     Bool_t SetupFill(const MParList *pList);
@@ -46 +46 @@
     TH2F *GetHist() { return fStarMap; }
 
-    void GetRotationAngle(const Double_t &thetatel, const Double_t &phitel,
-                          Double_t &cosangle, Double_t &sinangle);
-
     void Draw(Option_t *opt=NULL);
     TObject *DrawClone(Option_t *opt=NULL) const;