Changeset 9080

Timestamp:

08/04/08 12:27:38 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mraw/MRawRunHeader.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -34 +34 @@
    * mbase/MParEmulated.[h,cc]:
      - some improvements to support collection (still not finished)
+
+   * mraw/MRawRunHeader.cc:
+     - Implemented a fix for run-numbers between 1001348 and 1001396 
+       which were incorrectly assigned by the cc.
+     - changed order of fix and check
 
 

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -298 +298 @@
         }
 
-        // Old formats can not contain a run number larger 0
+        // Old formats can not contain a run number larger 999999
         if (fRunNumber<1000000)
         {
@@ -444 +444 @@
 Bool_t MRawRunHeader::FixAssignment()
 {
+    if (!fTelescopeNumber==1)
+        return kTRUE;
+
     if (fRunNumber>=53300 && fRunNumber<=68754)
     {
@@ -494 +497 @@
         fNumEventsRead--;
         *fLog << inf << "Format >V8: Stored number of events decreased by 1." << endl;
+    }
+
+    if (fFormatVersion>10 && fRunNumber<48 &&
+        fRunStart.GetMjd()>54674.5 && fRunStart.GetMjd()<56476.5)
+    {
+        fRunNumber += 1001348;
+        *fLog << warn << "Format >V10: Wrong run number increased by 1001348 to " << fRunNumber << "." << endl;
     }
 
@@ -604 +614 @@
     }
 
-    // ----- Consistency checks -----
-    if (!IsConsistent())
-        return kFALSE;
-
     //
     // calculate size of array, create it and fill it
@@ -620 +626 @@
         fin.read(dummy, 16);
 
-    return Fixes();
+    // ----- Fixes for broken files or contents -----
+    if (!Fixes())
+        return kFALSE;
+
+    // ----- Consistency checks -----
+    return IsConsistent();
 }
 
@@ -727 +738 @@
     fRunStop.SetBinary(Int+91);
 
-    // ----- Consistency checks -----
-    if (!IsConsistent())
-        return kFALSE;
-
     // ----- 388 bytes so far -----
 
@@ -746 +753 @@
         (*fPixAssignment)[i] = Int[97+i];
 
-    return Fixes();
+    // ----- Fixes for broken files or contents -----
+    if (!Fixes())
+        return kFALSE;
+
+    // ----- Consistency checks -----
+    return IsConsistent();
 }