Changeset 9889 for trunk/Mars/mcorsika

Timestamp:

08/24/10 12:41:43 (14 years ago)

Author:

rohlfs

Message:

The RUNE block is first searched at the end of the file

Location:

trunk/Mars/mcorsika

Files:

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

trunk/Mars/mcorsika/MCorsikaFormat.cc

@@ -233 +233 @@
 
         unsigned short fileType = blockHeader[1] & 0xFFFF;
-        if (/*memcmp(blockHeader+5, id, 4) == 0 && */
-            type == fileType                       )
-            {
-//*fLog << all << "found " << id << " type: " << type << endl;
+        if (type == fileType                       )
             break;
-            }
 
          if (type == 1202 && fileType == 1210)
@@ -248 +244 @@
         // a unknown block, we jump to the next one
 //*fLog << "unknown: " <<  id << " type: " << fileType << " sub-blocks: " <<  (blockHeader[3]>>29);
-//*fLog <<  " length: " << (blockHeader[3] & 0x3fffffff) << endl;
+//*fLog <<  " length: " << (blockHeader[3] & 0x3fffffff) <<   "  pos: " << fIn->tellg() << endl;
         int length = blockHeader[3] & 0x3fffffff;
-        fIn->seekg(length - 2 * sizeof(int), ios::cur);    
+        
+        fIn->seekg(length - 2 * (Int_t)(sizeof(int)), ios::cur);    
     }
 
@@ -261 +258 @@
 void MCorsikaFormatEventIO::UnreadLastHeader() 
 {
-    fIn->seekg( (int)(-6 * sizeof(int)), ios::cur);
+    fIn->seekg( -6 * (Int_t)(sizeof(int)), ios::cur);
 }
 
@@ -268 +265 @@
 Bool_t MCorsikaFormatEventIO::SeekEvtEnd()
 {
-    if (SeekNextBlock("RUNE", 1210))
-    {
-        UnreadLastHeader();
+    if (fRunePos != 0)
+        {
+        fIn->seekg(fRunePos, ios::beg);
         return kTRUE;
-    }
-
+        }
+    else
+        {
+        // it is the first time we are looking for the RUNE block
+
+        // is the RUNE block at the very end of the file?
+        std::streampos currentPos = fIn->tellg();
+
+        fIn->seekg(-32, ios::end);
+        unsigned int blockHeader[4];
+        fIn->read((char*)blockHeader, 4 * sizeof(int));
+        if ( blockHeader[0]               == 0xd41f8a37 &&
+            (blockHeader[1] & 0xffff)     == 1210       &&
+            (blockHeader[3] & 0x3fffffff) == 16)
+            {
+            // this seams to be a RUNE (1210)  block
+            fIn->seekg( -4 * (Int_t)(sizeof(int)), ios::cur);
+            fRunePos = fIn->tellg();
+            return kTRUE;
+            }
+
+        // we do not find a RUNE block at the end of the file
+        // we have to search in the file
+        fIn->seekg(currentPos, ios::beg);
+        if (SeekNextBlock("RUNE", 1210))
+            {
+            UnreadLastHeader();
+            fRunePos = fIn->tellg();
+            return kTRUE;
+            }
+        }
     return kFALSE;
 }
@@ -328 +354 @@
     return kTRUE;
 }
-
 // --------------------------------------------------------------------------
 //                                                                           
@@ -357 +382 @@
         unsigned short fileType = blockHeader[1] & 0xFFFF;
         if (fileType == 1204)
-{
-*fLog << all << "found new top level block 1204" << endl;
             return kTRUE;
-}
+
         if (fileType == 1209)
             {
             // we found an eventEnd block, reset file pointer
-            fIn->seekg( (Int_t)(-4 * sizeof(Int_t)), ios::cur);
+            fIn->seekg( -4 * (Int_t)(sizeof(Int_t)), ios::cur);
             length = 0;
             return kFALSE;
@@ -371 +394 @@
 
         // a unknown block, we jump to the next one
-*fLog << all << "found block " << fileType << endl;
         fIn->seekg(length, ios::cur);    
     }

trunk/Mars/mcorsika/MCorsikaFormat.h

@@ -24 +24 @@
 public:
    MCorsikaFormat(MLog * log, std::istream * in)
-        : fIn(in) {fLog = log;} 
+        : fIn(in) {fLog = log; } 
    virtual ~MCorsikaFormat();
 
@@ -69 +69 @@
 {
 private:
+        std::streampos fRunePos; // file position of the RUNE block
 
 public:
    MCorsikaFormatEventIO(MLog * log, std::istream * in)
-        : MCorsikaFormat(log, in) {} 
+        : MCorsikaFormat(log, in) {fRunePos = 0;} 
 
    Bool_t SeekNextBlock(const char * id, unsigned short type);