Changeset 17685 for trunk/Mars/mcore

Timestamp:

04/24/14 11:16:22 (11 years ago)

Author:

tbretz

Message:

Fixed revision 17607. When starting with tile 0 the currentTile can be either -1 or 0 depending on fNumRowsPerTile; this can lead to wrong results for isNextTile or when checked if a new tikle should be read; therefore implemented a different solution which also ensures that the copy feature and the checksum calculation gets every tile if read sequentially.

File:

• trunk/Mars/mcore/zfits.h (modified) (4 diffs)

trunk/Mars/mcore/zfits.h

@@ -276 +276 @@
     {
         if (row == fRow+1)
-            fRawsum.add(fBufferRow, false);
+            fRawsum.add(fBufferRow);
     }
 
@@ -300 +300 @@
         //const int64_t currentSubTile     = currentTile   % fShrinkFactor;
 
+        // Is this the first tile we read at all?
+        const bool isFirstTile = fCurrentRow<0;
+
+        // Is this just the next tile in the sequence?
+        const bool isNextTile = requestedTile==currentTile+1 || isFirstTile;
+
         fCurrentRow = rowNum;
 
-        // Is this just the next tile in the sequence?
-        const bool isNextTile = requestedTile==currentTile+1;
-
         // Do we have to read a new tile from disk?
-        if (requestedTile!=currentTile)
+        if (requestedTile!=currentTile || isFirstTile)
         {
             //skip to the beginning of the tile
@@ -316 +319 @@
             // seek for the sub tile. If we were just reading the previous one
             // we can skip that.
-            if (!isNextTile || requestedTile==0)
+            if (!isNextTile || isFirstTile)
             {
                 // step to the beginnig of the super tile
@@ -383 +386 @@
 
 
-            // If we are reading sequentially, calcuakte checksum
+            // If we are reading sequentially, calcualte checksum
             if (isNextTile)
             {
-//                std::cout << "Updating checksum" << std::endl;
                 // Padding for checksum calculation
                 memset(fCompressedBuffer.data(),   0, offset);