Changeset 7188 for trunk/MagicSoft/Mars/mreport

Timestamp:

07/13/05 19:06:26 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReportCC.cc (modified) (2 diffs)
• MReportCC.h (modified) (2 diffs)
• MReportCamera.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mreport/MReportCC.cc

@@ -31 +31 @@
 // From here maily weather station data is decoded such as
 // temperature, humidity, wind-speed and solar radiation
+//
+// Class Version 2:
+// ----------------
+//  +  Float_t fUPSStatus; // arbitrary units (still not properly defined)
+//  +  Float_t fDifRubGPS; // [us] Difference between the Rubidium clock time and the time provided by the GPS receiver
+//
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -74 +80 @@
     Int_t len;
     const Int_t n=sscanf(str.Data(),
-                         "%*f %*f %*f %*f %f %f %f %f %*f %*f %n",
+                         "%*f %*f %*f %*f %f %f %f %f %f %f %n",
                          &fTemperature, &fSolarRadiation, &fWindSpeed,
-                         &fHumidity, &len);
-    if (n!=4)
+                         &fHumidity, &fUPSStatus, &fDifRubGPS, &len);
+    if (n!=6)
     {
         *fLog << warn << "WARNING - Wrong number of arguments." << endl;

trunk/MagicSoft/Mars/mreport/MReportCC.h

@@ -14 +14 @@
     Float_t fSolarRadiation; // [W/m^2] IR-Radiation
 
+    Float_t fUPSStatus;      // arbitrary units (still not properly defined)
+    Float_t fDifRubGPS;      // [us] Difference between the Rubidium clock time and the time provided by the GPS receiver
+
     Int_t InterpreteBody(TString &str, Int_t ver);
 
@@ -26 +29 @@
     void Print(Option_t *opt) const;
 
-    ClassDef(MReportCC, 1) // Class for CC-REPORT information
+    ClassDef(MReportCC, 2) // Class for CC-REPORT information
 };
 

trunk/MagicSoft/Mars/mreport/MReportCamera.cc

@@ -568 +568 @@
         return kCONTINUE;
 
-    if (ver > gkActiveLoadControlVersNum)
+    if (ver >= gkActiveLoadControlVersNum)
     {
          if (!InterpreteActiveLoad(str))