Changeset 3374 for trunk/MagicSoft/Mars/mraw

Timestamp:

03/01/04 17:18:18 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

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

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h

@@ -14 +14 @@
 class MRawRunHeader;
 
-//
-// Trigger Type (TT)
-//
-enum {
-    kTTEvent       = 0,
-    kTTPedestal    = 1,
-    kTTCalibration = 2
-};
-
 class MRawEvtHeader : public MParContainer
 {
+public:
+    //
+    // Trigger Type (TT)
+    //
+    enum {
+        kTTEvent       = 0,
+        kTTPedestal    = 1,
+        kTTCalibration = 2
+    };
+
 private:
     MTime   *fTime;            //! object to store the time in (ReadEvt)

trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc

@@ -247 +247 @@
     switch (type)
     {
-    case kTTEvent:
+    case MRawEvtHeader::kTTEvent:
         fTData->Fill();
         return kTRUE;
 
-    case kTTPedestal:
+    case MRawEvtHeader::kTTPedestal:
         fTPedestal->Fill();
         return kTRUE;
 
-    case kTTCalibration:
+    case MRawEvtHeader::kTTCalibration:
         fTCalibration->Fill();
         return kTRUE;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -61 +61 @@
 using namespace std;
 
+const UShort_t MRawRunHeader::kMagicNumber      = 0xc0c0;
+const Byte_t   MRawRunHeader::kMaxFormatVersion =      3;
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -14 +14 @@
 class MArrayS;
 
-//
-// Magic number to detect the magic file type
-//
-const UShort_t kMagicNumber      = 0xc0c0;
-const Byte_t   kMaxFormatVersion =      3;
-
-//
-// enum for the Run Type. Monte Carlo Runs have
-// to have a value greater than 255 (>0xff)
-//
-enum {
-    kRTData        = 0x0000,
-    kRTPedestal    = 0x0001,
-    kRTCalibration = 0x0002,
-    kRTMonteCarlo  = 0x0100,
-    kRTNone        = 0xffff
-};
-
 class MRawRunHeader : public MParContainer
 {
+public:
+    //
+    // enum for the Run Type. Monte Carlo Runs have
+    // to have a value greater than 255 (>0xff)
+    //
+    enum {
+        kRTData        = 0x0000,
+        kRTPedestal    = 0x0001,
+        kRTCalibration = 0x0002,
+        kRTMonteCarlo  = 0x0100,
+        kRTNone        = 0xffff
+    };
+
+    //
+    // Magic number to detect the magic file type
+    //
+    static const UShort_t kMagicNumber;
+    static const Byte_t   kMaxFormatVersion;
+
 private:
     /* ---- Run Header Informations ---- */
@@ -105 +106 @@
     Int_t GetNumTotalBytes() const;
 
+    Bool_t IsMonteCarloRun() const { return fRunType>0x00ff; }
+
     void Print(Option_t *t=NULL) const;