Changeset 16890

Timestamp:

06/22/13 16:28:00 (12 years ago)

Author:

tbretz

Message:

Consistency of member names

Location:

trunk/Mars/mcore

Files:

• fits.h (modified) (8 diffs)
• zfits.h (modified) (9 diffs)

trunk/Mars/mcore/fits.h

@@ -100 +100 @@
         off_t offset;
 
-        bool isCompressed;
+        bool is_compressed;
 
         string name;
@@ -124 +124 @@
 
         Columns cols;
-        SortedColumns sortedCols;
+        SortedColumns sorted_cols;
         Keys    keys;
 
@@ -249 +249 @@
         Table() : offset(0) { }
         Table(const vector<string> &vec, off_t off) : offset(off),
-            isCompressed(false), keys(ParseBlock(vec))
-        {
-            if (HasKey("ZTABLE") && Check("ZTABLE", 'B', "T"))
-                isCompressed = true;
+            keys(ParseBlock(vec))
+        {
+            is_compressed = HasKey("ZTABLE") && Check("ZTABLE", 'B', "T");
 
             if (!Check("XTENSION", 'T', "BINTABLE") ||
@@ -264 +263 @@
                 return;
 
-            if (isCompressed)
+            if (is_compressed)
             {
                 if (!Check("ZNAXIS1", 'I') ||
@@ -278 +277 @@
 
             total_bytes   = Get<size_t>("NAXIS1")*Get<size_t>("NAXIS2");
-            bytes_per_row = isCompressed ? Get<size_t>("ZNAXIS1") : Get<size_t>("NAXIS1");
-            num_rows      = isCompressed ? Get<size_t>("ZNAXIS2") : Get<size_t>("NAXIS2");
+            bytes_per_row = is_compressed ? Get<size_t>("ZNAXIS1") : Get<size_t>("NAXIS1");
+            num_rows      = is_compressed ? Get<size_t>("ZNAXIS2") : Get<size_t>("NAXIS2");
             num_cols      = Get<size_t>("TFIELDS");
-            datasum       = isCompressed ? Get<int64_t>("ZDATASUM", -1) : Get<int64_t>("DATASUM", -1);
+            datasum       = is_compressed ? Get<int64_t>("ZDATASUM", -1) : Get<int64_t>("DATASUM", -1);
 
             size_t bytes = 0;
 
-            const string tFormName = isCompressed ? "ZFORM" : "TFORM";
+            const string tFormName = is_compressed ? "ZFORM" : "TFORM";
             for (size_t i=1; i<=num_cols; i++)
             {
-                ostringstream num;
-                num << i;
-
-                if (!Check("TTYPE"+num.str(), 'T') ||
-                    !Check(tFormName+num.str(), 'T'))
+                const string num(to_string(i));
+
+                if (!Check("TTYPE"+num, 'T') ||
+                    !Check(tFormName+num, 'T'))
                     return;
 
-                const string id   = Get<string>("TTYPE"+num.str());
-                const string fmt  = Get<string>(tFormName+num.str());
-                const string unit = Get<string>("TUNIT"+num.str(), "");
-                const string comp = Get<string>("ZCTYP"+num.str(), "");
+                const string id   = Get<string>("TTYPE"+num);
+                const string fmt  = Get<string>(tFormName+num);
+                const string unit = Get<string>("TUNIT"+num, "");
+                const string comp = Get<string>("ZCTYP"+num, "");
 
                 Compression_t compress = kCompUnknown;
@@ -346 +344 @@
 
                 cols[id] = col;
-                sortedCols.push_back(col);
+                sorted_cols.push_back(col);
                 bytes  += n*size;
             }
@@ -988 +986 @@
     bool     HasColumn(const string& col) const { return fTable.HasColumn(col);}
     const Table::Columns &GetColumns() const { return fTable.GetColumns();}
-    const Table::SortedColumns& GetSortedColumns() const { return fTable.sortedCols;}
+    const Table::SortedColumns& GetSortedColumns() const { return fTable.sorted_cols;}
     const Table::Keys &GetKeys() const { return fTable.GetKeys();}
 
@@ -1012 +1010 @@
     bool IsFileOk() const { return (fChkHeader+fChkData).valid(); }
 
-    bool IsCompressedFITS() const { return fTable.isCompressed;}
+    bool IsCompressedFITS() const { return fTable.is_compressed;}
 };
 

trunk/Mars/mcore/zfits.h

@@ -63 +63 @@
     bool SkipNextRow()
     {
-        if (!fTable.isCompressed)
+        if (!fTable.is_compressed)
             return fits::SkipNextRow();
 
@@ -76 +76 @@
     virtual void StageRow(size_t row, char* dest)
     {
-        if (!fTable.isCompressed)
+        if (!fTable.is_compressed)
         {
             fits::StageRow(row, dest);
@@ -122 +122 @@
     void InitCompressionReading()
     {
-        if (!fTable.isCompressed)
+        if (!fTable.is_compressed)
             return;
 
@@ -129 +129 @@
             return;
 
-        if (fTable.isCompressed)
-        {
-            for (auto it=fTable.sortedCols.begin(); it!= fTable.sortedCols.end(); it++)
+        if (fTable.is_compressed)
+        {
+            for (auto it=fTable.sorted_cols.begin(); it!= fTable.sorted_cols.end(); it++)
             {
                 if (it->comp == kCompFACT)
@@ -146 +146 @@
         }
 
-        fColumnOrdering.resize(fTable.sortedCols.size());
+        fColumnOrdering.resize(fTable.sorted_cols.size());
         for (auto it=fColumnOrdering.begin(); it != fColumnOrdering.end(); it++)
             (*it) = kOrderByRow;
         //Get compressed specific keywords
-        fNumTiles       = fTable.isCompressed ? GetInt("NAXIS2") : 0;
-        fNumRowsPerTile = fTable.isCompressed ? GetInt("ZTILELEN") : 0;
+        fNumTiles       = fTable.is_compressed ? GetInt("NAXIS2") : 0;
+        fNumRowsPerTile = fTable.is_compressed ? GetInt("ZTILELEN") : 0;
 
         //give it some space for uncompressing
@@ -166 +166 @@
     void MoveColumnDataToUserSpace(char* dest, const char* src, const Table::Column& c)
     {
-        if (!fTable.isCompressed)
+        if (!fTable.is_compressed)
         {
             fits::MoveColumnDataToUserSpace(dest, src, c);
@@ -334 +334 @@
 
             uint32_t i=0;
-            for (auto it=fTable.sortedCols.begin(); it!=fTable.sortedCols.end(); it++, i++)
+            for (auto it=fTable.sorted_cols.begin(); it!=fTable.sorted_cols.end(); it++, i++)
             {
                 char *buffer = fBuffer.data() + it->offset; // pointer to column (destination buffer)
@@ -433 +433 @@
 
         //uncompress column by column
-        for (uint32_t i=0; i<fTable.sortedCols.size(); i++)
-        {
-            const fits::Table::Column &col = fTable.sortedCols[i];
+        for (uint32_t i=0; i<fTable.sorted_cols.size(); i++)
+        {
+            const fits::Table::Column &col = fTable.sorted_cols[i];
             if (col.num == 0)
                 continue;
@@ -524 +524 @@
             {
                 //zero sized column do not have headers. Skip it
-                if (fTable.sortedCols[i].num == 0)
+                if (fTable.sorted_cols[i].num == 0)
                 {
                     catalog.back().push_back(make_pair(0,0));