Changeset 19330 for trunk/Mars

Timestamp:

10/30/18 15:34:34 (6 years ago)

Author:

tbretz

Message:

Moved magic numbers to an enum, changed hasMagicNumber into the block length (273 floats for raw data and 312 data for THIN data)

File:

• trunk/Mars/mcorsika/MCorsikaFormat.h (modified) (2 diffs)

trunk/Mars/mcorsika/MCorsikaFormat.h

@@ -19 +19 @@
 
 public:
-    static const unsigned int kSyncMarker;
-    static const unsigned int kMagicNumber;
+    enum
+    {
+        kBlockLengthRaw  = 0x00005994, // Raw Corsika without Thinning
+        kBlockLengthThin = 0x00006660, // Raw Corsika with Thinning
+
+        kSyncMarker  = 0xd41f8a37,     // EventIO
+
+        kRUNH = 0x484e5552, // "RUNH"
+        kRUNE = 0x454e5552, // "RUNE"
+        kEVTH = 0x48545645, // "EVTH"
+        kEVTE = 0x45545645, // "EVTE"
+    };
 
    MCorsikaFormat(std::istream * in)
@@ -46 +56 @@
 {
 private:
-   bool fHasMagicNumber;
+   uint32_t fBlockLength;
 
 public:
-   MCorsikaFormatRaw(std::istream * in, bool h)
-        : MCorsikaFormat(in), fHasMagicNumber(h) {}
+   MCorsikaFormatRaw(std::istream * in, const uint32_t &bl)
+        : MCorsikaFormat(in), fBlockLength(bl) {}
 
    Bool_t NextBlock(Int_t   readState, Int_t & blockType, Int_t & blockVersion,