Changeset 2984 for trunk/MagicSoft/Mars/mraw

Timestamp:

01/30/04 14:55:59 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

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

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -149 +149 @@
     //
     fRawRunHeader->ReadEvt(*fIn);
+    if (!(*fIn))
+    {
+        *fLog << err << "Error: Accessing file '" << fFileName << "'" << endl;
+        return kFALSE;
+    }
+    if (fRawRunHeader->GetMagicNumber()!=kMagicNumber)
+        return kFALSE;
+
     fRawRunHeader->Print();
-
-    if (fRawRunHeader->GetMagicNumber()!=kMagicNumber)
-        return kFALSE;
 
     *fRawEvtTime = fRawRunHeader->GetRunStart();

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -75 +75 @@
     fFormatVersion=0;
     fSoftVersion=0;
-    fRunType=0;
+    fRunType=kRTNone;  // use 0xffff for invalidation, 0 means: Data run
     fRunNumber=0;
     fProjectName[0]=0;
@@ -184 +184 @@
     case kRTMonteCarlo:
         return "Monte Carlo";
+    case kRTNone:
+        return "<none>";
     default:
         return "<unknown>";

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -24 +24 @@
 //
 enum {
-    kRTData        = 0,
-    kRTPedestal    = 1,
-    kRTCalibration = 2,
-    kRTMonteCarlo  = 256
+    kRTData        = 0x0000,
+    kRTPedestal    = 0x0001,
+    kRTCalibration = 0x0002,
+    kRTMonteCarlo  = 0x0100,
+    kRTNone        = 0xffff
 };