Changeset 19331

Timestamp:

10/30/18 15:36:44 (6 years ago)

Author:

tbretz

Message:

Cleaned... made all the block-length variable so that it can be different between raw and thinned data.

File:

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

trunk/Mars/mcorsika/MCorsikaFormat.cc

@@ -55 +55 @@
     }
 
-    uint32_t magic = 0;
+    uint32_t magic = 0,
     fileIn->read((char*)&magic, 4);
 
@@ -131 +131 @@
     }
 
-    blockVersion = 0;
+    blockVersion    = 0;
     blockIdentifier = 0;
     blockLength     = fBlockLength/21 - 4;
-
-//    cout << "P=" << fIn->tellg() << " L=" <<blockLength << " " << hex << blockHeader << dec << " " << fIn->eof() << endl;
 
     switch(blockHeader)
@@ -173 +171 @@
 Bool_t MCorsikaFormatRaw::SeekEvtEnd()
 {
-    const uint32_t step   = fBlockLength/21;
-    const uint32_t offset = fBlockLength?4:0;
-
-//    cout << fIn->bad() << " " << fIn->eof() << " " << fIn->tellg() << endl;
+    const uint32_t step   =  fBlockLength/21;
+    const uint32_t offset = (fBlockLength?4:0);
 
     // Search subblockwise backward (Block: 5733*4 = 21*273*4)
     for (uint32_t i=1; i<22; i++)
     {
-        const int32_t L = i*step + offset;
+        const uint32_t L = i*step + offset;
         fIn->seekg(-L, ios::end);
 
         uint32_t magic = 0;
         fIn->read((char*)&magic, 4);
-
-//        cout << dec << L << " " << fIn->tellg() << " " << hex << magic << endl;
 
         if (magic==kRUNE)