Changeset 32263 for trunk/psLib/src/fits/psFitsTableNew.h

Timestamp:

Aug 31, 2011, 4:28:27 PM (15 years ago)

Author:

bills

Message:

Implement the accessor functions. Remove the GetCell accessor versions.

File:

• trunk/psLib/src/fits/psFitsTableNew.h (modified) (1 diff)

trunk/psLib/src/fits/psFitsTableNew.h

@@ -44 +44 @@
 } psFitsTable;
 
-// return index of column by name
-int psFitsTableGetColumnIndex(psFitsTable *table, psString name);
-
-// return type for column
-// Most code knows it's tables so this won't be used much
-int psFitsTableGetColumnType(psFitsTable *table, int col);
+// return column number of column with name (-1 if not found)
+int psFitsTableGetColumnNumber(psFitsTable *table, const char *name);
 
 psFitsTable *psFitsReadTableNew(const psFits *fits);
 bool psFitsWriteTableNew(psFits *fits, const psMetadata *header, psFitsTable *table, const char *extname);
+
+// remove rows from table whose entry in the supplied array are true
 bool psFitsTableCensor(psFitsTable *table, bool *rowMask);
 
-psF32 psFitsTableGetCellF32(psFitsTable *table, int row, int col);
+// Get value for given row and column name
+psBool psFitsTableGetBool(bool *status, psFitsTable *table, int row, const char* name);
+psS8 psFitsTableGetS8(bool *status, psFitsTable *table, int row, const char* name);
+psU8 psFitsTableGetU8(bool *status, psFitsTable *table, int row, const char* name);
+psS16 psFitsTableGetS16(bool *status, psFitsTable *table, int row, const char* name);
+psU16 psFitsTableGetU16(bool *status, psFitsTable *table, int row, const char* name);
+psS32 psFitsTableGetS32(bool *status, psFitsTable *table, int row, const char* name);
+psU32 psFitsTableGetU32(bool *status, psFitsTable *table, int row, const char* name);
+psS64 psFitsTableGetS64(bool *status, psFitsTable *table, int row, const char* name);
+psU64 psFitsTableGetU64(bool *status, psFitsTable *table, int row, const char* name);
 
-psF32 psFitsTableGetF32(bool *status, psFitsTable *table, psString name, int row);
+psF32 psFitsTableGetF32(bool *status, psFitsTable *table, int row, const char* name);
+psF64 psFitsTableGetF64(bool *status, psFitsTable *table, int row, const char* name);
 
-
-#ifdef notdef
-// Accessors
-psF32 psFitsTableGetCellF32(psFitsTable *table, int row, int col)
-{
-    assert(row >= 0 && row < table->numRows);
-    assert(col >= 0 && col < table->numCols);
-    assert(table->columns[col].type == PS_TYPE_F32);
-
-    return table->columns[col].data.F32[row];
-}
-
----------------------------
-// code in streaksremove censore sources beocomes
-
-    psFitsTable *table = psFitsReadTableNew(in->fits);
-    int x_col = psFitsGetColumnIndex(table, "X_PSF");
-    int y_col = psFitsGetColumnIndex(table, "X_PSF");
-
-    // Array of booleans. If true don't write the row.
-    bool rowMask = psAlloc(table->numRows * sizeof(bool));
-    bzero(rowMask, table->numRows * sizeof(bool));
-
-    for (int i=0; i < table->numRows; i++) {
-        psF32 x = psFitsTableGetCellF32(table, row, x_col);
-        psF32 y = psFitsTableGetCellF32(table, row, y_col);
-
-        if ((x >= maskImage->numCols) || (y >= maskImage->numRows) 
-            || (x <  0) || (y < 0) || isnan(x) || isnan(y)) {
-            mask = maskStreak;
-        } else {
-            mask = maskImage->data.PS_TYPE_IMAGE_MASK_DATA[(int)y][(int)x];
-        }
-
-        // Key the source if the center pixel is not masked with maskStreak
-        if (mask & maskStreak) {
-            numCensored++;
-            rowMask[i] = true;
-        }
-    }
-
-    if (numCensored < table->numRows) {
-        psFitsWriteTableNew(out->fits, header, table, extname, rowMask);
-    } else {
-        psFitsWriteTableNewEmpty(out->fits, header, table, extname);
-    }
-#endif // notdef
-
-#endif // #ifndef PS_FITSTABLENEW_H
+#endif