Changeset 7726 for trunk/MagicSoft/Mars/mreport

Timestamp:

05/22/06 17:51:33 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReport.cc (modified) (2 diffs)
• MReportCC.cc (modified) (3 diffs)
• MReportStarguider.cc (modified) (3 diffs)
• MReportStarguider.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -123 +123 @@
 //    200510250  | 53801.5 | 53813.5 |  200603080
 //    200510250  | 53813.5 |         |  200603190
+//    200604010  | 53863.5 |         |  200605080
 //
 Int_t MReport::Interprete(TString &str, const MTime &start, const MTime &stop, Int_t ver)
@@ -153 +154 @@
         ver=200603190;
 
+    if (ver==200604010 && GetMjd()>53864.5)
+        ver=200605080;
+
     // Interprete body (contents) of report
     const Int_t rc = InterpreteBody(str, ver);

trunk/MagicSoft/Mars/mreport/MReportCC.cc

@@ -261 +261 @@
             continue;
 
+        if (n==0 && i==0)
+        {
+            *fLog << inf << "Receiver Board Temperatures empty." << endl;
+            fRecTemp->Invalidate();
+            break;
+        }
+
         *fLog << warn << "WARNING - Reading Receiver Board Temperature information." << endl;
         return kFALSE;
@@ -286 +293 @@
     if (str.BeginsWith("RECEIVERS-COM-ERROR"))
     {
+        *fLog << inf << "Receiver Com-error... threshold setting and receiver board temp. invalid." << endl;
         fTD->Invalidate();
         fTH->Invalidate();
+        fRecTemp->Invalidate();
         str.Remove(0, 19);
     }
@@ -297 +306 @@
         if (!InterpreteTD(str, ver))
             return kCONTINUE;
-    }
-
-    if (ver>=200510250)
-        if (!InterpreteRecTemp(str))
-            return kCONTINUE;
+
+        if (ver>=200510250)
+            if (!InterpreteRecTemp(str))
+                return kCONTINUE;
+    }
 
     if (str.Strip(TString::kBoth)!=(TString)"OVER")

trunk/MagicSoft/Mars/mreport/MReportStarguider.cc

@@ -58 +58 @@
 //  + Double_t fMjd;                // Modified Julian Date matching the nominal position
 //
+//
+// Class Version 3:
+// ----------------
+//  + UInt_t   fNumCorrelatedStars; // Number of correlated stars identified by starguider algorithm
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MReportStarguider.h"
@@ -73 +78 @@
 // Default constructor. Initialize identifier to "STARG-REPORT"
 //
-MReportStarguider::MReportStarguider() : MReport("STARG-REPORT"),
+MReportStarguider::MReportStarguider() : MReport("STARG-REPORT")/*,
     fDevAz(0), fDevZd(0), fNominalZd(0), fNominalAz(0),
     fCameraCenterX(0), fCameraCenterY(0), fNumIdentifiedStars(0),
-    fSkyBrightness(0)
+    fNumCorrelatedStars(0), fSkyBrightness(0)*/
 {
     fName  = "MReportStarguider";
     fTitle = "Class for STARG-REPORT information (telescope mispointing)";
+
+    Clear();
+}
+
+// --------------------------------------------------------------------------
+//
+// Interprete the body of the STARG-REPORT string
+//
+void MReportStarguider::Clear(Option_t *o)
+{
+    fDevAz              = 0;
+    fDevZd              = 0;
+
+    fNominalZd          = 0;
+    fNominalAz          = 0;
+
+    fCameraCenterX      = 0;
+    fCameraCenterY      = 0;
+
+    fNumIdentifiedStars = 0;
+    fNumCorrelatedStars = 0;
+
+    fSkyBrightness      = 0;
 }
 
@@ -146 +174 @@
     }
 
+    if (ver>=200605080)
+    {
+        // For the momment this are only placeholders....
+        fNumCorrelatedStars = fNumIdentifiedStars;
+        n=sscanf(str.Data(), "%df %n", &fNumIdentifiedStars, &len);
+        if (n!=1)
+        {
+            *fLog << warn << "WARNING - Not enough arguments." << endl;
+            *fLog << str << endl;
+            return kCONTINUE;
+        }
+
+        str.Remove(0, len);
+        str = str.Strip(TString::kBoth);
+    }
+
     return str.IsNull() ? kTRUE : kCONTINUE;
 }

trunk/MagicSoft/Mars/mreport/MReportStarguider.h

@@ -23 +23 @@
 
     UInt_t   fNumIdentifiedStars; // Number of stars identified by starguider algorithm
+    UInt_t   fNumCorrelatedStars; // Number of correlated stars identified by starguider algorithm
 
     Double_t fSkyBrightness;      // [au] Sky Brightness as calcualted from the CCD image
@@ -31 +32 @@
 public:
     MReportStarguider();
+
+    void Clear(Option_t *o="");
 
     Double_t GetDevAz() const { return fDevAz; }
@@ -46 +49 @@
 
     UInt_t   GetNumIdentifiedStars() const { return fNumIdentifiedStars; }
+    UInt_t   GetNumCorrelatedStars() const { return fNumCorrelatedStars; }
 
     Double_t GetSkyBrightness() const { return fSkyBrightness; }
@@ -52 +56 @@
     void Print(Option_t *o="") const;
 
-    ClassDef(MReportStarguider, 2) // Class for STARG-REPORT information
+    ClassDef(MReportStarguider, 3) // Class for STARG-REPORT information
 };