Changeset 3488

Timestamp:

03/12/04 16:13:05 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MSourcePosfromStarPos.cc (modified) (3 diffs)
• manalysis/MSourcePosfromStarPos.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2004/03/12: Wolfgang Wittek
+
+   * manalysis/Makefile
+     - include 'mastro'
+
+   * manalysis/MSourcePosfromStarPos.[h,cc]
+     - include MObservatory.h
+     - call member function Rotationangle() of MObservatory
+
 
  2004/03/12: Markus Gaug

trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.cc

@@ -58 +58 @@
 #include "MLog.h"
 #include "MLogManip.h"
+#include "MObservatory.h"
 
 ClassImp(MSourcePosfromStarPos);
@@ -199 +200 @@
               << fMm2Deg << ",  " << fDistCameraReflector << endl;
 
+    fObservatory = (MObservatory*)pList->FindObject(AddSerialNumber("MObservatory"));
+    if (!fObservatory)
+    {
+        *fLog << err << "MObservatory not found...  aborting" << endl;
+        return kFALSE;
+    }
 
     fRun = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
@@ -337 +344 @@
   Double_t cosal = - (a3 * sin(thetaTel) + a1 * cos(thetaTel) * cos(phiTel)) * denom;
   Double_t sinal =    a1 * sin(phiTel) * denom;
+
+  fObservatory->RotationAngle(thetaTel, phiTel, sinal, cosal);
 
   //*fLog << "thetaTel, phiTel, cosal, sinal = " << thetaTel << ",  "

trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.h

@@ -32 +32 @@
 class MGeomCam;
 class MSrcPosCam;
+class MObservatory;
 
 
@@ -39 +40 @@
     const MRawRunHeader *fRun;      //!
     const MGeomCam      *fGeomCam;  //! Camera Geometry used to calculate Hillas
-    MMcEvt              *fMcEvt;
-    MSrcPosCam    *fSrcPos;   //!
+    MMcEvt              *fMcEvt;    //!
+    MSrcPosCam          *fSrcPos;         //!
+    MObservatory        *fObservatory;    //!
 
     ifstream    *fIn;             // input file