Changeset 34284 for trunk/ppTranslate/src/ppMopsWrite.c

Timestamp:

Aug 2, 2012, 4:54:24 PM (14 years ago)

Author:

Serge CHASTEL

Message:

MOPS trails fitting integration (all bugs fixed now)

File:

• trunk/ppTranslate/src/ppMopsWrite.c (modified) (6 diffs)

trunk/ppTranslate/src/ppMopsWrite.c

@@ -9 +9 @@
 #include "ppTranslateVersion.h"
 
-static bool addOutputColumn(psMetadata *table, const psArray *detections, long total, int extension, char *outColName, char *inColName, bool convertTo32);
+static bool addOutputColumn(psMetadata *table, const psArray *detections, long total, char *outColName, char *inColName, bool convertTo32);
 static bool addSkyfileIDColumn(psMetadata *table, const psArray *detections, long total, char *colName);
 
@@ -180 +180 @@
 
 #define addColumn(_outName, _inName, _convertTo32)                      \
-    if (!addOutputColumn(table, detections, total, 0, _outName, _inName, _convertTo32)) { \
+    if (!addOutputColumn(table, detections, total, _outName, _inName, _convertTo32)) { \
       psError(PS_ERR_UNKNOWN, false, "Failed to add column %s", _outName); \
       return false;                                                     \
@@ -241 +241 @@
       addColumn("N_FRAMES", NULL, 0);
       addColumn("PADDING", NULL, 0);
-      if (det->fittedTrails != NULL) {
-#define addFittedTrailColumn(_outName, _inName, _convertTo32)                   \
-        if (!addOutputColumn(table, detections, total, 1, _outName, _inName, _convertTo32)) { \
-          psTrace("ppMops.write", 1, "Failed to add column %s -> Replaced with NAN", _outName); \
-        }
-        addFittedTrailColumn("X_EXT", NULL, 0);
-        addFittedTrailColumn("Y_EXT", NULL, 0);
-        addFittedTrailColumn("X_EXT_SIG", NULL, 0);
-        addFittedTrailColumn("Y_EXT_SIG", NULL, 0);
-        addFittedTrailColumn("EXT_INST_MAG", NULL, 0);
-        addFittedTrailColumn("EXT_INST_MAG_SIG", NULL, 0);
-        addFittedTrailColumn("NPARAMS", NULL, 0);
-        addFittedTrailColumn("EXT_WIDTH_MAJ", NULL, 0);
-        addFittedTrailColumn("EXT_WIDTH_MIN", NULL, 0);
-        addFittedTrailColumn("EXT_THETA", NULL, 0);
-        addFittedTrailColumn("EXT_WIDTH_MAJ_ERR", NULL, 0);
-        addFittedTrailColumn("EXT_WIDTH_MIN_ERR", NULL, 0);
-        addFittedTrailColumn("EXT_THETA_ERR", NULL, 0);
-      }
+      addColumn("X_EXT", NULL, 0);
+      addColumn("Y_EXT", NULL, 0);
+      addColumn("X_EXT_SIG", NULL, 0);
+      addColumn("Y_EXT_SIG", NULL, 0);
+      addColumn("EXT_INST_MAG", NULL, 0);
+      addColumn("EXT_INST_MAG_SIG", NULL, 0);
+      addColumn("NPARAMS", NULL, 0);
+      addColumn("EXT_WIDTH_MAJ", NULL, 0);
+      addColumn("EXT_WIDTH_MIN", NULL, 0);
+      addColumn("EXT_THETA", NULL, 0);
+      addColumn("EXT_WIDTH_MAJ_ERR", NULL, 0);
+      addColumn("EXT_WIDTH_MIN_ERR", NULL, 0);
+      addColumn("EXT_THETA_ERR", NULL, 0);
     }
     if (!psFitsWriteTableAllColumns(fits, header, table, OUT_EXTNAME)) {
@@ -280 +274 @@
 // 1: SkyChip.xfit
 // Any other value is ignored
-static bool addOutputColumn(psMetadata *table, const psArray *detections, long outputSize, int extension, char *outColumnName, char *inColumnName, bool convertTo32)
+static bool addOutputColumn(psMetadata *table, const psArray *detections, long outputSize, char *outColumnName, char *inColumnName, bool convertTo32)
 {
   if (inColumnName == NULL) {
@@ -297 +291 @@
       }
       psVector *in = NULL;
-      if (extension == 0) {
-        in = psMetadataLookupVector(NULL, det->table, inColumnName);
-      } else if (extension == 1) {
-        in = psMetadataLookupVector(NULL, det->fittedTrails, inColumnName);
-      } else {
-        //Error?
-      }
+      in = psMetadataLookupVector(NULL, det->table, inColumnName);
       if (!in) {
         psError(PS_ERR_PROGRAMMING, true, "failed to find input column: %s (convertTo32 is true)", inColumnName);
@@ -339 +327 @@
       }
       psVector *in = NULL;
-      if (extension == 0) {
-        psTrace("ppMops.write", 1, "Using det->table for %s", inColumnName);
-        in = psMetadataLookupVector(NULL, det->table, inColumnName);
-      } else if (extension == 1) {
-        psTrace("ppMops.write", 1, "Using det->fittedTrails for %s", inColumnName);
-        in = psMetadataLookupVector(NULL, det->fittedTrails, inColumnName);
-      } else {
-        //Error?
-      }
+      in = psMetadataLookupVector(NULL, det->table, inColumnName);
       if (!in) {
         psError(PS_ERR_PROGRAMMING, true, "failed to find input column: %s (convertTo32 is false)", inColumnName);