Changeset 17305

Timestamp:

10/22/13 11:03:54 (11 years ago)

Author:

lyard

Message:

Moved catalog reconstruction only when a row is read so that headers can be retrieved quickly in all cases

File:

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

trunk/Mars/mcore/zfits.h

@@ -20 +20 @@
     // Basic constructor
     zfits(const std::string& fname, const std::string& tableName="", bool force=false)
-        : fNumTiles(0), fNumRowsPerTile(0), fCurrentRow(-1), fHeapOff(0), fTileSize(0)
+        : fCatalogInitialized(false), fNumTiles(0), fNumRowsPerTile(0), fCurrentRow(-1), fHeapOff(0), fTileSize(0)
     {
         open(fname.c_str());
         Constructor(fname, "", tableName, force);
-        InitCompressionReading();
+//        InitCompressionReading();
     }
 
     // Alternative contstructor
     zfits(const std::string& fname, const std::string& fout, const std::string& tableName, bool force=false)
-        : fNumTiles(0), fNumRowsPerTile(0), fCurrentRow(-1), fHeapOff(0), fTileSize(0)
+        : fCatalogInitialized(false), fNumTiles(0), fNumRowsPerTile(0), fCurrentRow(-1), fHeapOff(0), fTileSize(0)
     {
         open(fname.c_str());
         Constructor(fname, fout, tableName, force);
-        InitCompressionReading();
+//        InitCompressionReading();
     }
 
@@ -94 +94 @@
     void InitCompressionReading()
     {
+        fCatalogInitialized = true;
+
         if (!fTable.is_compressed)
             return;
@@ -143 +145 @@
         memcpy(dest, src, c.num*c.size);
     }
+
+    bool  fCatalogInitialized;
 
     std::vector<char> fBuffer;           ///<store the uncompressed rows
@@ -278 +282 @@
             return false;
 
+        if (!fCatalogInitialized)
+            InitCompressionReading();
+
         const uint32_t requestedTile = rowNum/fNumRowsPerTile;
         const uint32_t currentTile   = fCurrentRow/fNumRowsPerTile;