Changeset 2604 for trunk/MagicSoft/Mars/mreport

Timestamp:

12/05/03 11:34:19 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

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

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -56 +56 @@
 {
     int len, state;
-    int hor, min, sec, ms;
+    int yea, mon, day, hor, min, sec, ms;
 
     int n = sscanf(str.Data(),
                    fHasReportTime ?
-                   " %d %*d %*d %*d %d %d %d %d "
+                   " %d %d %d %d %d %d %d %d "
                    "%*d %*d %*d %*d %*d %*d %*d %*d %n" :
                    " %d %*d %*d %*d %d %d %d %d ",
-                   &state, &hor, &min, &sec, &ms, &len);
-    if (n!=5)
+                   &state, &yea, &mon, &day, &hor, &min, &sec, &ms, &len);
+    if (n!=8)
     {
         *fLog << err << "ERROR - Cannot interprete Body of " << fIdentifier << endl;
@@ -72 +72 @@
     fState=state;
     if (fTime)
-        fTime->SetTime(hor, min, sec, ms*1000000);
+        if (!fTime->Set(yea, mon, day, hor, min, sec, ms))
+        {
+            *fLog << err << "ERROR - Event has invalid time: ";
+            *fLog << Form("%d.%d.%d %02s:%02d:%02d.%03d", day, mon, yea, hor, min, sec, ms);
+            *fLog << "... abort." << endl;
+            return kFALSE;
+        }
 
     str.Remove(0, len);

trunk/MagicSoft/Mars/mreport/MReportCamera.h

@@ -19 +19 @@
     Byte_t fStatusDC; // CaCo monitored status of the DC currents (0-9), Cam.DC_state
 
-    MCameraCooling     *fCooling;
-    MCameraLids        *fLids;
-    MCameraAUX         *fAUX;
-    MCameraHV          *fHV;
-    MCameraLV          *fLV;
-    MCameraCalibration *fCalibration;
+    MCameraCooling     *fCooling;     //!
+    MCameraLids        *fLids;        //!
+    MCameraAUX         *fAUX;         //!
+    MCameraHV          *fHV;          //!
+    MCameraLV          *fLV;          //!
+    MCameraCalibration *fCalibration; //!
 
     Bool_t SetupReading(MParList &plist);