Changeset 7719 for trunk/MagicSoft/Mars/mreport/MReportCC.cc

Timestamp:

05/19/06 13:57:47 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mreport/MReportCC.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mreport/MReportCC.cc

@@ -136 +136 @@
 // Interprete the TH (discriminator thresholds) part of the report
 //
-Bool_t MReportCC::InterpreteTH(TString &str)
+Bool_t MReportCC::InterpreteTH(TString &str, Int_t ver)
 {
     if (!CheckTag(str, "TH "))
         return kFALSE;
+
+    // Skip the TH (discriminator thresholds) part of the report (for old
+    // CC files with wrong or nonsense number of TH-Bytes)
+    if (ver<200507190)
+    {
+        Ssiz_t pr = str.First(' ');
+        if (pr<0)
+        {
+            *fLog << warn << "WARNING - No TH information found at all." << endl;
+            return kFALSE;
+        }
+        if (pr!=1154)
+        {
+            fTD->Invalidate();
+
+            str.Remove(0, pr);
+            str=str.Strip(TString::kLeading);
+            return kTRUE;
+        }
+    }
 
     const char *pos = str.Data();
@@ -158 +178 @@
     }
 
+    fTH->SetValid();
+
     str.Remove(0, end-str.Data()); // Remove TH
     str=str.Strip(TString::kLeading);
@@ -170 +192 @@
 {
     if (!CheckTag(str, "TD "))
-        return kFALSE;
-
+        return kTRUE;
+
+    // Skip the TD (discriminator delays) part of the report (for old
+    // CC files with wrong or nonsense number of TD-Bytes)
+    if (ver<200412210)
+    {
+        Ssiz_t pr = str.First(' ');
+        if (pr<0)
+        {
+            *fLog << warn << "WARNING - No TD information found at all." << endl;
+            return kFALSE;
+        }
+        if (pr!=1000)
+        {
+            fTD->Invalidate();
+
+            str.Remove(0, pr);
+            str=str.Strip(TString::kLeading);
+            return kTRUE;
+        }
+    }
+
+    // Older files have less bytes (pixels) stored
     const Int_t numpix = ver<200510250 ? 500 : 577;
 
@@ -191 +234 @@
     }
 
+    fTD->SetValid();
+
     str.Remove(0, end-str.Data()); // Remove TD
     str=str.Strip(TString::kLeading);
+
     return kTRUE;
 }
@@ -238 +284 @@
         return kCONTINUE;
 
-    if (!InterpreteTH(str))
-        return kCONTINUE;
-
-    if (!InterpreteTD(str, ver))
-        return kCONTINUE;
+    if (str.BeginsWith("RECEIVERS-COM-ERROR"))
+    {
+        fTD->Invalidate();
+        fTH->Invalidate();
+        str.Remove(0, 19);
+    }
+    else
+    {
+        if (!InterpreteTH(str, ver))
+            return kCONTINUE;
+
+        if (!InterpreteTD(str, ver))
+            return kCONTINUE;
+    }
 
     if (ver>=200510250)