Changeset 4040

Timestamp:

05/10/04 18:36:04 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mraw/MRawEvtHeader.cc (modified) (3 diffs)
• mraw/MRawEvtHeader.h (modified) (1 diff)
• mraw/MRawRead.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/05/10: Thomas Bretz
+
+   * mraw/MRawEvtHeader.[h,cc]:
+     - changed return type of ReadEvt from int to Int_t
+     - Enhanced output in case of invalid time
+
+   * mraw/MRawRead.cc:
+     - fixed the return type of ReadEvt (was bool instead of int)
+       which confused merpp completely in case of invalid times
+
+
+
  2004/05/10: Markus Gaug
 
    * macros/calibrate_data.C
      - updated setting of arr. time extractor
+
+
 
  2004/05/09: Thomas Bretz

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -293 +293 @@
     // with the start-date/time of the run (after reading the run header)
     //
-    return fTime->UpdMagicTime(h, m, s, ns);
+    if (fTime->UpdMagicTime(h, m, s, ns))
+        return kTRUE;
+
+    *fLog << warn << "WARNING - Time (" << Form("%2d:%02d:%02d,%09d", h, m, s, ns);
+    *fLog << ") in header of event #" << dec << fDAQEvtNumber << " invalid..." << endl;
+ 
+    return kFALSE;
 }
 
@@ -309 +315 @@
 // Remark: This 'feature' disallows single runs of more than 11h!
 //
-int MRawEvtHeader::ReadEvt(istream &fin, UShort_t ver)
+Int_t MRawEvtHeader::ReadEvt(istream &fin, UShort_t ver)
 {
     fin.read((char*)&fDAQEvtNumber, 4);  // Total=4
@@ -319 +325 @@
         if (!DecodeTime(abstime))
         {
-            *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);

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h

@@ -67 +67 @@
     UInt_t GetTriggerID() const;
 
-    int ReadEvt(istream& fin, UShort_t ver);
+    Int_t ReadEvt(istream& fin, UShort_t ver);
     void SkipEvt(istream& fin, UShort_t ver);
 

trunk/MagicSoft/Mars/mraw/MRawRead.cc

@@ -165 +165 @@
     // if there is no next event anymore stop eventloop
     //
-    const Bool_t rc = fRawEvtHeader->ReadEvt(fin, ver);
+    const Int_t rc = fRawEvtHeader->ReadEvt(fin, ver);
     if (rc==kCONTINUE && fForceMode==kFALSE)
     {