Changeset 9949 for trunk/Mars/mcorsika/MCorsikaFormat.cc

Timestamp:

09/29/10 21:30:21 (14 years ago)

Author:

tbretz

Message:

Fixed a problem reading the RUNE section in the raw corsika files and accelerated plain readcorsika.

File:

• trunk/Mars/mcorsika/MCorsikaFormat.cc (modified) (6 diffs)

trunk/Mars/mcorsika/MCorsikaFormat.cc

@@ -151 +151 @@
 // of the id.
 //
-Bool_t MCorsikaFormatRaw::SeekNextBlock(const char * id, unsigned short type) const
+Int_t MCorsikaFormatRaw::SeekNextBlock(const char * id, unsigned short type) const
 {
     char blockHeader[5]="\0\0\0\0";
@@ -162 +162 @@
     // but find the end of a run. This is expected, therefor no error
     // message.
-    if (strcmp(id, "EVTH")==0 && strcmp(blockHeader, "RUNE")==0)
-        return kTRUE;
+    if (strcmp(blockHeader, "RUNE")==0)
+        return kFALSE;
 
     gLog << err << "ERROR - Wrong identifier: " << id << " expected.";
     gLog << " But read " << blockHeader << " from file." << endl;
 
-    return kFALSE;
+    return kERROR;
 }
 
@@ -182 +182 @@
 Bool_t MCorsikaFormatRaw::SeekEvtEnd()
 {
-
     // Search subblockwise backward (Block: 5733*4 = 21*273*4)
     for (int i=1; i<22; i++)
@@ -250 +249 @@
 // of the id.
 //
-Bool_t MCorsikaFormatEventIO::SeekNextBlock(const char * id, unsigned short type) const
+Int_t MCorsikaFormatEventIO::SeekNextBlock(const char * id, unsigned short type) const
 {
     cout << "Seek " << type << endl;
@@ -267 +266 @@
         {
             gLog << err << "MCorsikaFormatEventIO::SeekNextBlock: ERROR - Unexpected end-of-file seeking " << id << " (" << type << ")." << endl;
-            return kFALSE;
+            return kERROR;
         }
 
@@ -343 +342 @@
     // we have to search in the file
     fIn->seekg(currentPos, ios::beg);
-    if (!SeekNextBlock("RUNE", 1210))
+    if (SeekNextBlock("RUNE", 1210)!=kTRUE)
         return kFALSE;