Changeset 716 for trunk/MagicSoft/Mars/mraw

Timestamp:

04/02/01 15:08:48 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawEvtHeader.h (modified) (2 diffs)
• MRawFileWrite.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h

@@ -10 +10 @@
 class MArrayB;
 class MRawRunHeader;
+
+//
+// Trigger Typed (TT)
+//
+enum {
+    kTTEvent       = 0,
+    kTTPedestal    = 1,
+    kTTCalibration = 2
+};
 
 class MRawEvtHeader : public MParContainer
@@ -27 +36 @@
 
     //
-    // Informations only needed to read the raw file
+    // Informations only needed to read the raw file correctly
     //
     UShort_t fTrigType;        //! Trigger Type of this event

trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc

@@ -15 +15 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
+
 #include "MParList.h"
 #include "MRawRunHeader.h"
@@ -142 +144 @@
     switch (type)
     {
-    case 0:
+    case kTTEvent:
         fTData->Fill();
-        break;
-    case 1:
+        return kTRUE;
+
+    case kTTPedestal:
         fTPedestal->Fill();
-        break;
-    case 2:
+        return kTRUE;
+
+    case kTTCalibration:
         fTCalibration->Fill();
-        break;
+        return kTRUE;
     }
 
-    return kTRUE;
+    *fLog << dbginf << "Got wrong number for the trigger type: " << type;
+    *fLog << "  - skipping" << endl;
+
+    return kCONTINUE;
 }