Changeset 16889

Timestamp:

06/22/13 15:31:46 (12 years ago)

Author:

tbretz

Message:

Some cleaning to easier understand the code.

File:

• trunk/Mars/mcore/fits.h (modified) (11 diffs)

trunk/Mars/mcore/fits.h

@@ -71 +71 @@
     //I know I know, you're going to yiell that this does not belong here.
     //It will belong in the global scope eventually, and it makes the coding of zfits much simpler this way.
-    typedef enum
-    {
-        UNKNOWN,
-        FACT
-    } FitsCompression;
+    enum Compression_t
+    {
+        kCompUnknown,
+        kCompFACT
+    };
 
     struct Entry
@@ -116 +116 @@
             char   type;
             string unit;
-            FitsCompression comp;
+            Compression_t comp;
         };
 
@@ -199 +199 @@
                 string com;
                 string val = Trim(vec[i].substr(10));
+
                 if (val[0]=='\'')
                 {
@@ -216 +217 @@
 
                     // Set value, comment and type
-                    if (ppp==string::npos)
-                        com = "";
-                    else
-                    {// comments could be just spaces. take care of this.
-                        if (val.size() == ppp+1)
-                            com = "";
-                        else
-                            com = Trim(val.substr(ppp+1));
-                    }
-//                    com  = ppp==string::npos ? "" : Trim(val.substr(ppp+1));
+                    // comments could be just spaces. take care of this.
+                    if (ppp!=string::npos && val.size() != ppp+1)
+                        com = Trim(val.substr(ppp+1));
+
                     val  = Trim(val.substr(1, p-2));
                     type = 'T';
@@ -233 +228 @@
                     const size_t p = val.find_first_of('/');
 
-                    if (val.size() == p+1)
-                        com = "";
-                    else
+                    if (val.size() != p+1)
                         com = Trim(val.substr(p+2));
+
                     val = Trim(val.substr(0, p));
 
@@ -246 +240 @@
 
                 const Entry e = { type, val, com, vec[i] };
+
                 rc[key] = e;
             }
@@ -253 +248 @@
 
         Table() : offset(0) { }
-        Table(const vector<string> &vec, off_t off) :
-            offset(off), isCompressed(false), keys(ParseBlock(vec))
+        Table(const vector<string> &vec, off_t off) : offset(off),
+            isCompressed(false), keys(ParseBlock(vec))
         {
             if (HasKey("ZTABLE") && Check("ZTABLE", 'B', "T"))
@@ -289 +284 @@
 
             size_t bytes = 0;
-            string tFormName = isCompressed ? "ZFORM" : "TFORM";
+
+            const string tFormName = isCompressed ? "ZFORM" : "TFORM";
             for (size_t i=1; i<=num_cols; i++)
             {
@@ -304 +300 @@
                 const string comp = Get<string>("ZCTYP"+num.str(), "");
 
-                FitsCompression compress = UNKNOWN;
+                Compression_t compress = kCompUnknown;
                 if (comp == "FACT")
-                    compress = FACT;
+                    compress = kCompFACT;
 
                 istringstream sin(fmt);
@@ -664 +660 @@
                 }
 
-                //Check for table name. Skip until eof or requested table are found.
+                // Check for table name. Skip until eof or requested table are found.
                 // skip the current table?
                 if (!tableName.empty() && tableName!=fTable.Get<string>("EXTNAME"))
@@ -676 +672 @@
                 }
 
-                //fTable.PrintKeys();
-
                 fBufferRow.resize(fTable.bytes_per_row + 8-fTable.bytes_per_row%4);
                 fBufferDat.resize(fTable.bytes_per_row);