Changeset 18455 for branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.cc

Timestamp:

03/09/16 15:40:33 (9 years ago)

Author:

dbaack

Message:

Commit old changes from 7.4 Branch to this branch

File:

• branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.cc (modified) (3 diffs)

branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.cc

@@ -57 +57 @@
     }
 
-    char *buffer = new char[5];
-    memset(buffer, 0, 5);
-    fileIn->read(buffer, 4);
-    fileIn->seekg(-4, ios::cur);
+    char *buffer = new char[9];
+    memset(buffer, 0, 9);
+    fileIn->read(buffer, 8);
+    fileIn->seekg(-8, ios::cur);
 
     if (strcmp(buffer, "RUNH") == 0)
@@ -66 +66 @@
         delete [] buffer;
         return new MCorsikaFormatRaw(fileIn);
+    }
+    else if(strcmp(&buffer[4], "RUNH") == 0)
+    {
+        fileIn->seekg(4, ios::cur);
+        delete[] buffer;
+        return new MCorsikaFormatRaw(fileIn, true);
     }
 
@@ -159 +165 @@
     for (int i=1; i<22; i++)
     {
-        fIn->seekg(-i*273*4, ios::end);
+        if(fFortranRaw)
+                fIn->seekg(-i*273*4-4, ios::end);
+        else
+                fIn->seekg(-i*273*4, ios::end);
 
         char runh[5]="\0\0\0\0";