Changeset 1037 for trunk/MagicSoft/Mars/mraw

Timestamp:

11/06/01 14:27:40 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawFileRead.cc (modified) (1 diff)
• MRawRunHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -237 +237 @@
 Bool_t MRawFileRead::PostProcess()
 {
-    if (fRawRunHeader->GetNumEvents() != GetNumExecutions()-1)
-        *fLog << "WARNING - number of read events doesn't match number in run header." << endl;
+    if (fRawRunHeader->GetNumEvents() == GetNumExecutions()-1)
+        return kTRUE;
+
+    *fLog << "WARNING - number of read events (" << GetNumExecutions()-1;
+    *fLog << ") doesn't match number in run header (";
+    *fLog << fRawRunHeader->GetNumEvents() << ")." << endl;
 
     return kTRUE;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -88 +88 @@
     UShort_t GetNumSamplesLoGain() const  { return fNumSamplesLoGain; }
     UShort_t GetNumSamplesHiGain() const  { return fNumSamplesHiGain; }
-    UShort_t GetNumEvents() const         { return fNumEvents; }
+    UInt_t   GetNumEvents() const         { return fNumEvents; }
     UShort_t GetPixAssignment(UShort_t i) const;