Changeset 6920 for trunk/MagicSoft/Mars

Timestamp:

04/08/05 13:33:12 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReportStarguider.cc (modified) (6 diffs)
• MReportStarguider.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mreport/MReportStarguider.cc

@@ -16 +16 @@
 !
 !
+!   Author(s): Benjamin Riegel, 01/2005 <mailto:riegel@astro.uni-wuerzburg.de>
 !   Author(s): Thomas Bretz, 11/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
-!              Benjamin Riegel, 01/2005 <mailto:riegel@astro.uni-wuerzburg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2005
@@ -34 +34 @@
 //
 //
+// Class Version 1:
+// ----------------
+//  + Double_t fDevAz;          // [deg]   azimuth mispointing
+//  + Double_t fDevZd;          // [deg]   zenith  mispointing
 //
-// Double_t fDevAz;          // [deg]   azimuth mispointing
-// Double_t fDevZd;          // [deg]   zenith  mispointing
 //
+// Class Version 2:
+// ----------------
+//  + Double_t fNominalZd;          // [deg] Nominal zenith distance
+//  + Double_t fNominalAz;          // [deg] Nominal azimuth
+//
+//  + Float_t  fCameraCenterX;      // [CCD pix] PMT Camera center found
+//  + Float_t  fCameraCenterY;      // [CCD pix] PMT Camera center found
+//
+//  + UInt_t   fNumIdentifiedStars; // Number of stars identified by starguider algorithm
+//
+//  + Double_t fSkyBrightness;      // [au] Sky Brightness as calcualted from the CCD image
+//  + Double_t fMjd;                // Modified Julian Date matching the nominal position
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -43 +57 @@
 
 #include "MLogManip.h"
+
+#include "MAstro.h"
 
 ClassImp(MReportStarguider);
@@ -53 +69 @@
 //
 MReportStarguider::MReportStarguider() : MReport("STARG-REPORT"),
-    fDevAz(0), fDevZd(0)
+    fDevAz(0), fDevZd(0), fNominalZd(0), fNominalAz(0),
+    fCameraCenterX(0), fCameraCenterY(0), fNumIdentifiedStars(0),
+    fSkyBrightness(0)
 {
     fName  = "MReportStarguider";
@@ -74 +92 @@
 
     str.Remove(0, len);
+    str = str.Strip(TString::kBoth);
 
-     str = str.Strip(TString::kBoth);
+    if (ver < 200503170)
+        return str.IsNull() ? kTRUE : kCONTINUE;
+
+    MAstro::String2Angle(str, fNominalZd);   // Nom Zd
+    MAstro::String2Angle(str, fNominalAz);   // Nom Az
+
+    n=sscanf(str.Data(), "%f %f %d %lf %lf %n",
+             &fCameraCenterX, &fCameraCenterY, &fNumIdentifiedStars,
+             &fSkyBrightness, &fMjd, &len);
+    if (n!=5)
+    {
+        *fLog << warn << "WARNING - Not enough arguments." << endl;
+        return kCONTINUE;
+    }
+
+    str.Remove(0, len);
+    str = str.Strip(TString::kBoth);
 
     return str.IsNull() ? kTRUE : kCONTINUE;
@@ -83 +118 @@
 void MReportStarguider::Print(Option_t *o) const
 {
-    *fLog << GetDescriptor() << ": DevZd=" << fDevZd << " DevAz=" << fDevAz << endl;
+    *fLog << GetDescriptor() << ":" << endl;
+    *fLog << " DevZd=" << fDevZd << " DevAz=" << fDevAz << endl;
+    *fLog << " NominalZd=" << fNominalZd << " NominalAz=" << fDevAz << " MJD=" << fMjd << endl;
+    *fLog << " CameraCenterX=" << fCameraCenterX << " CameraCenterY=" << fCameraCenterY << endl;
+    *fLog << " NumIdentifiedStars=" << fNumIdentifiedStars << endl;
+    *fLog << " NumIdentifiedStars=" << fNumIdentifiedStars << " SkyBrightness=" << fSkyBrightness << endl;
 }

trunk/MagicSoft/Mars/mreport/MReportStarguider.h

@@ -9 +9 @@
 {
 private:
-    Double_t fDevAz;  // [deg]   azimuth mispointing
-    Double_t fDevZd;  // [deg]   zenith  mispointing
+    Double_t fDevAz;              // [deg]   azimuth mispointing
+    Double_t fDevZd;              // [deg]   zenith  mispointing
+
+    Double_t fNominalZd;          // [deg] Nominal zenith distance
+    Double_t fNominalAz;          // [deg] Nominal azimuth
+
+    Float_t  fCameraCenterX;      // [CCD pix] PMT Camera center found
+    Float_t  fCameraCenterY;      // [CCD pix] PMT Camera center found
+
+    UInt_t   fNumIdentifiedStars; // Number of stars identified by starguider algorithm
+
+    Double_t fSkyBrightness;      // [au] Sky Brightness as calcualted from the CCD image
+    Double_t fMjd;                // Modified Julian Date matching the nominal position
 
     Int_t InterpreteBody(TString &str, Int_t ver);
@@ -20 +31 @@
     Double_t GetDevZd() const { return fDevZd; }
 
+    Double_t GetNominalZd() const { return fNominalZd; }
+    Double_t GetNominalAz() const { return fNominalAz; }
+
+    Float_t  GetCameraCenterX() const { return fCameraCenterX; }
+    Float_t  GetCameraCenterY() const { return fCameraCenterY; }
+
+    UInt_t   GetNumIdentifiedStars() const { return fNumIdentifiedStars; }
+
+    Double_t GetSkyBrightness() const { return fSkyBrightness; }
+    Double_t GetMjd() const { return fMjd; }
+
     void Print(Option_t *o="") const;