Changeset 17216

Timestamp:

10/11/13 17:11:13 (11 years ago)

Author:

lyard

Message:

Added the brand new zofits class.

Location:

trunk/Mars/mcore

Files:

• fits.h (modified) (2 diffs)
• ofits.h (modified) (17 diffs)
• zofits.h (added)

trunk/Mars/mcore/fits.h

@@ -267 +267 @@
             num_cols      = Get<size_t>("TFIELDS");
             datasum       = is_compressed ? Get<int64_t>("ZDATASUM", -1) : Get<int64_t>("DATASUM", -1);
-
+//cout << "IS COMPRESSED =-========= " << is_compressed << " " << Get<size_t>("NAXIS1") << endl;
             size_t bytes = 0;
 
@@ -456 +456 @@
         streamoff GetHeapShift() const
         {
-            if (!HasKey("THEAP"))
+            if (!HasKey("ZHEAPPTR"))
                 return 0;
 
-            const size_t shift = Get<size_t>("THEAP");
+            const size_t shift = Get<size_t>("ZHEAPPTR");
             return shift <= total_bytes ? 0 : shift - total_bytes;
         }

trunk/Mars/mcore/ofits.h

@@ -308 +308 @@
     }
 
+protected:
     struct Table
     {
@@ -363 +364 @@
         this->open(fname);
     }
-    ~ofits() { close(); }
-
-    void open(const char * filename, bool addEXTNAMEKey=true)
+    ~ofits() { if (is_open()) close(); }
+
+    virtual void open(const char * filename, bool addEXTNAMEKey=true)
     {
         fDataSum  = 0;
@@ -509 +510 @@
     }
 
+    string CommentFromType(char type)
+    {
+        string comment;
+
+        switch (type)
+        {
+        case 'L': comment = "1-byte BOOL]";  break;
+        case 'A': comment = "1-byte CHAR]";  break;
+        case 'B': comment = "1-byte BOOL]";  break;
+        case 'I': comment = "2-byte INT]";   break;
+        case 'J': comment = "4-byte INT]";   break;
+        case 'K': comment = "8-byte INT]";   break;
+        case 'E': comment = "4-byte FLOAT]"; break;
+        case 'D': comment = "8-byte FLOAT]"; break;
+        case 'Q': comment = "var. Length]"; break;
+        }
+
+        return comment;
+    }
+
+    uint32_t SizeFromType(char type)
+    {
+        size_t size = 0;
+
+        switch (type)
+        {
+        case 'L': size = 1; break;
+        case 'A': size = 1; break;
+        case 'B': size = 1; break;
+        case 'I': size = 2; break;
+        case 'J': size = 4; break;
+        case 'K': size = 8; break;
+        case 'E': size = 4; break;
+        case 'D': size = 8; break;
+        case 'Q': size = 16; break;
+        }
+
+        return size;
+    }
     //ETIENNE to be able to restore the file 1 to 1, I must restore the header keys myself
-    bool AddColumn(uint32_t cnt, char typechar, const string &name, const string &unit, const string &comment="", bool addHeaderKeys=true)
+    virtual bool AddColumn(uint32_t cnt, char typechar, const string &name, const string &unit, const string &comment="", bool addHeaderKeys=true)
     {
         if (tellp()<0)
@@ -550 +590 @@
         typechar = toupper(typechar);
 
-        static const string allow("LABIJKED");
+        static const string allow("LABIJKEDQ");
         if (std::find(allow.begin(), allow.end(), typechar)==allow.end())
         {
@@ -564 +604 @@
 
         ostringstream type;
-        type << cnt << typechar;
+        type << cnt;
+        if (typechar=='Q')
+            type << "QB";
+        else
+            type << typechar;
 
         fTable.num_cols++;
@@ -576 +620 @@
         typecom << "format of " << name << " [";
 
-        switch (typechar)
+        typecom << CommentFromType(typechar);
+/*        switch (typechar)
         {
         case 'L': typecom << "1-byte BOOL]";  break;
@@ -586 +631 @@
         case 'E': typecom << "4-byte FLOAT]"; break;
         case 'D': typecom << "8-byte FLOAT]"; break;
-        }
-
+        case 'Q': typecom << "var. Length]"; break;
+        }
+*/
         if (addHeaderKeys)
         {
@@ -595 +641 @@
                 SetStr(unitkey.str(), unit, unitcom.str());
         }
-        size_t size = 0;
-
-        switch (typechar)
+        size_t size = SizeFromType(typechar);
+
+/*        switch (typechar)
         {
         case 'L': size = 1; break;
@@ -607 +653 @@
         case 'E': size = 4; break;
         case 'D': size = 8; break;
-        }
-
+        case 'Q': size = 16; break;
+        }
+*/
         Table::Column col;
 
@@ -678 +725 @@
     {
         Checksum sum;
+        uint32_t count=0;
         for (auto it=fKeys.begin(); it!=fKeys.end(); it++)
         {
             it->Out(fout);
             sum += it->checksum;
+            count++;
         }
         fout.flush();
@@ -725 +774 @@
     }
 
-    bool WriteTableHeader(const char *name="DATA")
+    virtual bool WriteDrsOffsetsTable ()
+    {
+        return true;
+    }
+
+    virtual bool WriteCatalog()
+    {
+        return true;
+    }
+
+    virtual bool WriteTableHeader(const char *name="DATA")
     {
         if (tellp()>0)
@@ -738 +797 @@
 
         fHeaderSum = WriteFitsHeader();
+
+        WriteDrsOffsetsTable();
 
         if (!fManualExtName)
@@ -748 +809 @@
         WriteHeader();
 
+        WriteCatalog();
+
         return good();
     }
@@ -759 +822 @@
     }
 
-    uint32_t GetBytesPerRow() const { return fTable.bytes_per_row; }
-
-    bool WriteRow(const void *ptr, size_t cnt, bool byte_swap=true)
+    virtual uint32_t GetBytesPerRow() const { return fTable.bytes_per_row; }
+
+    virtual bool WriteRow(const void *ptr, size_t cnt, bool byte_swap=true)
     {
         // FIXME: Make sure that header was already written
@@ -830 +893 @@
 
     // Flushes the number of rows to the header on disk
-    void FlushNumRows()
+    virtual void FlushNumRows()
     {
         SetInt("NAXIS2", fTable.num_rows);
@@ -838 +901 @@
     size_t GetNumRows() const { return fTable.num_rows; }
 
-    bool close()
-    {
-        if (tellp()<0)
-            return false;
-
+    void AlignTo2880Bytes()
+    {
         if (tellp()%(80*36)>0)
         {
-            const vector<char> filler(80*36-tellp()%(80*36));
+            vector<char> filler(80*36-tellp()%(80*36));
             write(filler.data(), filler.size());
         }
-
-        // We don't have to jump back to the end of the file
-        SetInt("NAXIS2",  fTable.num_rows);
+    }
+
+    Checksum UpdateHeaderChecksum()
+    {
 
         ostringstream dataSumStr;
@@ -862 +923 @@
         SetStr("CHECKSUM", (sum+fDataSum).str());
 
-        const Checksum chk = WriteHeader();
+        return WriteHeader();
+    }
+    virtual bool close()
+    {
+        if (tellp()<0)
+            return false;
+
+        AlignTo2880Bytes();
+
+        // We don't have to jump back to the end of the file
+        SetInt("NAXIS2",  fTable.num_rows);
+
+
+        const Checksum chk = UpdateHeaderChecksum();
 
         ofstream::close();