Changeset 17607 for trunk/Mars/mcore/zfits.h

Timestamp:

03/12/14 14:34:37 (11 years ago)

Author:

lyard

Message:

Fixed bug that wrongly calculated the checksum of compressed files. Weird that I did not notice it ealier...

File:

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

trunk/Mars/mcore/zfits.h

@@ -20 +20 @@
     // Basic constructor
     zfits(const std::string& fname, const std::string& tableName="", bool force=false)
-        : fCatalogInitialized(false), fNumTiles(0), fNumRowsPerTile(0), fCurrentRow(-2), fHeapOff(0), fTileSize(0)
+        : fCatalogInitialized(false), fNumTiles(0), fNumRowsPerTile(0), fCurrentRow(-1), fHeapOff(0), fTileSize(0)
     {
         open(fname.c_str());
@@ -29 +29 @@
     // Alternative contstructor
     zfits(const std::string& fname, const std::string& fout, const std::string& tableName, bool force=false)
-        : fCatalogInitialized(false), fNumTiles(0), fNumRowsPerTile(0), fCurrentRow(-2), fHeapOff(0), fTileSize(0)
+        : fCatalogInitialized(false), fNumTiles(0), fNumRowsPerTile(0), fCurrentRow(-1), fHeapOff(0), fTileSize(0)
     {
         open(fname.c_str());
@@ -316 +316 @@
             // seek for the sub tile. If we were just reading the previous one
             // we can skip that.
-            if (!isNextTile)
+            if (!isNextTile || requestedTile==0)
             {
                 // step to the beginnig of the super tile
@@ -335 +335 @@
             // this is now the beginning of the sub-tile we want to read
             const int64_t subTileStart = tellg() - fHeapOff;
-
             // calculate the 32 bits offset of the current tile.
             const uint32_t offset = (subTileStart + fHeapFromDataStart)%4;
@@ -387 +386 @@
             if (isNextTile)
             {
+//                std::cout << "Updating checksum" << std::endl;
                 // Padding for checksum calculation
                 memset(fCompressedBuffer.data(),   0, offset);