Changeset 18035 for trunk

Timestamp:

12/12/14 13:00:03 (10 years ago)

Author:

lyard

Message:

Fixed bug related to drs-calibration table

File:

• trunk/Mars/mcore/factofits.h (modified) (3 diffs)

trunk/Mars/mcore/factofits.h

@@ -224 +224 @@
             c.SetStr(  "RAWSUM",   "         0",    "Checksum of raw little endian data");
             c.SetFloat("ZRATIO",   0,               "Compression ratio");
+
             c.SetInt(  "ZSHRINK",  1,               "Catalog shrink factor");
             c.End();
@@ -280 +281 @@
             //update relevant keywords
             c.SetFloat("ZRATIO", (float)(1024*1440*2)/(float)(compressed_size));
-            c.SetInt("PCOUNT", compressed_size + catalog_size);
+            c.SetInt("PCOUNT", compressed_size);// + catalog_size);
+
+
+//cout << "DEBUG: compressed_size=" << compressed_size << " " << compressed_size%2880 << " " << catalog_size << endl;
+
 
 #if GCC_VERSION < 40603
@@ -302 +307 @@
             return good();
         }
+
         ///Apply the drs offset calibration (overload of super-method)
         virtual void DrsOffsetCalibrate(char* target_location)