Changeset 18532 for trunk

Timestamp:

08/05/16 15:26:53 (8 years ago)

Author:

tbretz

Message:

Implemented handling of the magic number at the beginning of the file and skipping it at the end when searching for the RUNE section. Return kFALSE if RUNE has not been found.

Location:

trunk/Mars/mcorsika

Files:

• MCorsikaFormat.cc (modified) (6 diffs)
• MCorsikaFormat.h (modified) (2 diffs)

trunk/Mars/mcorsika/MCorsikaFormat.cc

@@ -40 +40 @@
 
 
-const unsigned int MCorsikaFormat::kSyncMarker = 0xd41f8a37;
+const unsigned int MCorsikaFormat::kMagicNumber = 0x5994;
+const unsigned int MCorsikaFormat::kSyncMarker  = 0xd41f8a37;
 
 // --------------------------------------------------------------------------
@@ -60 +61 @@
     memset(buffer, 0, 5);
     fileIn->read(buffer, 4);
+
+    // This seems to be a new corsika binary identifier
+    const bool hasMagicNumber = *reinterpret_cast<unsigned int*>(buffer) == kMagicNumber;
+    if (hasMagicNumber)
+        fileIn->read(buffer, 4);
+
     fileIn->seekg(-4, ios::cur);
 
@@ -65 +72 @@
     {
         delete [] buffer;
-        return new MCorsikaFormatRaw(fileIn);
+        gLog << inf2 << "Corsika RAW format detected." << endl;
+        return new MCorsikaFormatRaw(fileIn, hasMagicNumber);
     }
 
@@ -71 +79 @@
     {
         delete [] buffer;
+        gLog << inf2 << "Corsika EventIO format detected." << endl;
         return new MCorsikaFormatEventIO(fileIn);
     }
@@ -159 +168 @@
     for (int i=1; i<22; i++)
     {
-        fIn->seekg(-i*273*4, ios::end);
+        fIn->seekg(-i*273*4-(fHasMagicNumber?4:0), ios::end);
 
         char runh[5]="\0\0\0\0";
@@ -170 +179 @@
         }
     }
-    
-    return kTRUE;
+
+    return kFALSE;
 }
 ///////////////////////////////////////////////////////////////////////////////

trunk/Mars/mcorsika/MCorsikaFormat.h

@@ -20 +20 @@
 public:
     static const unsigned int kSyncMarker;
+    static const unsigned int kMagicNumber;
 
    MCorsikaFormat(std::istream * in)
@@ -45 +46 @@
 {
 private:
+   bool fHasMagicNumber;
 
 public:
-   MCorsikaFormatRaw(std::istream * in)
-        : MCorsikaFormat(in) {}
+   MCorsikaFormatRaw(std::istream * in, bool h)
+        : MCorsikaFormat(in), fHasMagicNumber(h) {}
 
    Bool_t NextBlock(Int_t   readState, Int_t & blockType, Int_t & blockVersion,