Changeset 4022 for trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

Timestamp:

05/09/04 20:55:34 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -310 +310 @@
         if (!DecodeTime(abstime))
         {
-            *fLog << warn << "WARNING - Event time in event header invalid... abort." << endl;
+            *fLog << warn << "WARNING - Event time in event header invalid..." << endl;
+            // Skip the rest of the header in case of merpps force-mode
+            fin.seekg(GetNumBytes()-12, ios::cur);
             return kCONTINUE;
         }
@@ -335 +337 @@
 void MRawEvtHeader::SkipEvt(istream &fin, UShort_t ver)
 {
-    fin.seekg(36+fPixLoGainOn->GetSize(), ios::cur);
+    fin.seekg(GetNumBytes(), ios::cur);
 }
 
@@ -361 +363 @@
 UInt_t MRawEvtHeader::GetTriggerID() const
 {
-  UInt_t trigID=0;
-
-  trigID = fTrigPattern[0];
-
-  return trigID;
-}
+    return fTrigPattern[0];
+}