Changeset 13987 for trunk/Mars/mcore/ofits.h

Timestamp:

05/30/12 16:36:39 (12 years ago)

Author:

lyard

Message:

fixed checksum issues with the ofits class.

File:

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

trunk/Mars/mcore/ofits.h

@@ -326 +326 @@
         SetInt("TFIELDS",                    0, "number of fields in each row");
         SetStr("EXTNAME", "", "name of extension table");
-        SetStr("CHECKSUM", "{0000000000000000}", "Checksum for the whole file");
-        SetInt("DATASUM",                    0, "Checksum for the data block");
+        SetStr("CHECKSUM", "0000000000000000", "Checksum for the whole HDU");
+        SetStr("DATASUM",  "         0", "Checksum for the data block");
 
         ofstream::open(filename);
@@ -608 +608 @@
         h.SetInt ("NAXIS",     0, "number of data axes");
         h.SetBool("EXTEND", true, "FITS dataset may contain extensions");
-
+        h.SetStr ("CHECKSUM","4AcB48bA4AbA45bA", "Checksum for the whole HDU");
+        h.SetStr ("DATASUM", "         0", "Checksum for the data block");
         h.AddComment("FITS (Flexible Image Transport System) format is defined in 'Astronomy");
         h.AddComment("and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H");
@@ -733 +734 @@
         if (tellp()%(80*36)>0)
         {
-            //cout << "fill" << endl;
             const vector<char> filler(80*36-tellp()%(80*36));
             write(filler.data(), filler.size());
         }
 
-        // We don't hav eto jump back to the end of the file
+        // We don't have to jump back to the end of the file
         SetInt("NAXIS2",  fTable.num_rows);
-        SetInt("DATASUM", fDataSum.val());
+
+        ostringstream dataSumStr;
+        dataSumStr << fDataSum.val();
+        SetStr("DATASUM", dataSumStr.str());
 
         const Checksum sum = WriteHeader();
+
         //sum += headersum;
 
-        SetStr("CHECKSUM", "{"+(sum+fDataSum).str()+"}");
+        SetStr("CHECKSUM", (sum+fDataSum).str());
 
         const Checksum chk = WriteHeader();