Changeset 3568 for trunk/MagicSoft/Mars/mpointing

Timestamp:

03/22/04 09:25:49 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpointing

Files:

• MPointingPos.cc (modified) (2 diffs)
• MPointingPos.h (modified) (2 diffs)
• MSrcPosCalc.cc (added)
• MSrcPosCalc.h (added)
• MSrcPosCam.cc (added)
• MSrcPosCam.h (added)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mpointing/MPointingPos.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 11/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -27 +27 @@
 // MPointingPos
 //
-// Store the current pointing position of the telescope...
+// In this container we store the corrected pointing position of the
+// telscope. The pointing coordinates are read into MReportDrive together
+// with its time.
+//
+// MPointingPosCalc afterwards calculates corrections and checks for the
+// cosistency of the coordinates. The result (the real coordinates)
+// are stored in this container. No further correction should be necessary
+// using MPointingPos.
+//
+// If you need the rotation angle of the starfield in the camera you can
+// get it from here.
 //
 /////////////////////////////////////////////////////////////////////////////
 #include "MPointingPos.h"
 
+#include "MTime.h"
+#include "MObservatory.h"
+#include "MAstroSky2Local.h"
+
 ClassImp(MPointingPos);
 
 using namespace std;
+
+// --------------------------------------------------------------------------
+//
+// Get the corresponding rotation angle of the sky coordinate system
+// seen with an Alt/Az telescope calculated from the stored local
+// (Zd/Az) coordinates.
+//
+// For more information see MAstro::RotationAngle
+//
+Double_t MPointingPos::RotationAngle(const MObservatory &o) const
+{
+    return o.RotationAngle(fZd*TMath::DegToRad(), fAz*TMath::DegToRad());
+}
+
+// --------------------------------------------------------------------------
+//
+// Get the corresponding rotation angle of the sky coordinate system
+// seen with an Alt/Az telescope calculated from the stored sky
+// (Ra/Dec) coordinates.
+//
+// For more information see MAstro::RotationAngle
+//
+Double_t MPointingPos::RotationAngle(const MObservatory &o, const MTime &t) const
+{
+    return MAstroSky2Local(t, o).RotationAngle(fRa*TMath::DegToRad()*15, fDec*TMath::DegToRad());
+}

trunk/MagicSoft/Mars/mpointing/MPointingPos.h

@@ -5 +5 @@
 #include "MParContainer.h"
 #endif
+
+class MTime;
+class MObservatory;
 
 class MPointingPos : public MParContainer
@@ -32 +35 @@
     Double_t GetDec() const { return fDec; }
 
+    Double_t RotationAngle(const MObservatory &o) const;
+    Double_t RotationAngle(const MObservatory &o, const MTime &t) const;
+
     ClassDef(MPointingPos, 1) //Container storing the (corrected) telescope pointing position
 };

trunk/MagicSoft/Mars/mpointing/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mraw -I../mreport -I../mmc
+INCLUDES = -I. -I../mbase -I../mraw -I../mreport -I../mmc -I../mastro
 
 #------------------------------------------------------------------------------