Changeset 17288 for trunk/Mars/mcore

Timestamp:

10/21/13 13:27:01 (11 years ago)

Author:

lyard

Message:

Bugfix to be able to reuse the same zofits object to write more than one file

File:

• trunk/Mars/mcore/zofits.h (modified) (9 diffs)

trunk/Mars/mcore/zofits.h

@@ -182 +182 @@
             SetInt(  "ZSHRINK",  1,               "Catalog shrink factor");
 
-            fCatalogSize      = 0;
+            fCatalogSize   = 0;
+            fRealRowWidth  = 0;
+            fCatalogOffset = 0;
+            fCatalogSize   = 0;
+            fCheckOffset   = 0;
+
+            fRealColumns.clear();
             fCatalog.clear();
+            fCatalogSum.reset();
             fRawSum.reset();
         }
@@ -286 +293 @@
                 std::rethrow_exception(fThreadsException);
 #endif
+
             //copy current row to pool or rows waiting for compression
             char* target_location = fSmartBuffer.get() + fRealRowWidth*(fTable.num_rows%fNumRowsPerTile);
@@ -362 +370 @@
 
         /// Shrinks a catalog that is too long to fit into the reserved space at the beginning of the file.
-        void ShrinkCatalog()
+        const uint32_t ShrinkCatalog()
         {
             //add empty row to get either the target number of rows, or a multiple of the allowed size
@@ -370 +378 @@
             //did we write more rows than what the catalog could host ?
             if (fCatalogSize <= fNumTiles) // nothing to do
-                return;
+                return 1;
 
             //always exact as extra rows were added just above
@@ -409 +417 @@
             SetInt("ZTILELEN", fNumRowsPerTile);
             SetInt("ZSHRINK",  shrink_factor);
+
+            return shrink_factor;
         }
 
@@ -457 +467 @@
             }
 
-            ShrinkCatalog();
+            const uint32_t shrink_factor = ShrinkCatalog();
 
             //update header keywords
@@ -471 +481 @@
             SetInt("NAXIS1", total_catalog_width);
             SetInt("NAXIS2", total_num_tiles_written);
-            SetStr("RAWSUM", std::to_string(fRawSum.val()));
+            SetStr("RAWSUM", std::to_string((long long int)(fRawSum.val())));
 
             const float compression_ratio = (float)(fRealRowWidth*fTable.num_rows)/(float)heap_size;
@@ -489 +499 @@
 
             std::ofstream::close();
+
+            fSmartBuffer = std::shared_ptr<char>();
+
+            //restore the number of rows per tile in case the catalog has been shrinked
+            if (shrink_factor != 1)
+                fNumRowsPerTile /= shrink_factor;
 
             if ((checksm+fDataSum).valid())
@@ -530 +546 @@
             fRealColumns.emplace_back(col, comp);
 
-            SetStr("ZFORM"+std::to_string(fRealColumns.size()), std::to_string(cnt)+typechar, "format of "+name+" "+CommentFromType(typechar));
-            SetStr("ZCTYP"+std::to_string(fRealColumns.size()), "FACT", "Compression type: FACT");
+            SetStr("ZFORM"+std::to_string((long long int)(fRealColumns.size())), std::to_string((long long int)(cnt))+typechar, "format of "+name+" "+CommentFromType(typechar));
+            SetStr("ZCTYP"+std::to_string((long long int)(fRealColumns.size())), "FACT", "Compression type: FACT");
 
             return true;