Changeset 2563 for trunk/MagicSoft/Mars/mraw

Timestamp:

11/23/03 21:18:30 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawSocketRead.cc (modified) (5 diffs)
• MRawSocketRead.h (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawSocketRead.cc

@@ -39 +39 @@
 //   MRawEvtData
 //   MRawCrateArray
-//   MRawEvtTime
+//   MTime
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -147 +147 @@
 //   MRawEvtData <output>     if not found it is created
 //   MRawCrateArray <output>  if not found it is created
-//   MRawEvtTime <output>     if not found it is created (MTime)
+//   MTime <output>           if not found it is created
 //
 // If all containers are found or created the run header is read from the
@@ -180 +180 @@
         return kFALSE;
 
-    fRawEvtTime = (MTime*)pList->FindCreateObj("MTime", "MRawEvtTime");
-    if (!fRawEvtTime)
+    fTime = (MTime*)pList->FindCreateObj("MTime");
+    if (!fTime)
         return kTRUE;
 
@@ -268 +268 @@
 
     if (atoi(size)==fRawRunHeader->GetNumTotalBytes())
+    {
+        *fLog << dbg << "Event contains only run header information... skipped." << endl;
         return kCONTINUE;
+    }
 
     //
     // Give the run header information to the 'sub-classes'
     //
-    fRawEvtHeader->Init(fRawRunHeader, fRawEvtTime);
+    fRawEvtHeader->Init(fRawRunHeader, fTime);
     fRawEvtData  ->Init(fRawRunHeader);
 
@@ -317 +320 @@
     //
     if (fEvtNumber==fRawEvtHeader->GetDAQEvtNumber())
+    {
+        *fLog << dbg << "Event number #" << dec << fEvtNumber << " didn't change... skipped." << endl;
         return kCONTINUE;
+    }
 
     fEvtNumber=fRawEvtHeader->GetDAQEvtNumber();

trunk/MagicSoft/Mars/mraw/MRawSocketRead.h

@@ -21 +21 @@
     MRawEvtData    *fRawEvtData;    // raw evt header infomation container to fill from file
     MRawCrateArray *fRawCrateArray; // crate information array container to fill from file
-    MTime          *fRawEvtTime;    // raw evt time information container to fill from file
+    MTime          *fTime;          // raw evt time information container to fill from file
 
     MReadSocket    *fIn;            //! buffered input stream (file to read from)