Changeset 34511 for trunk/ppTranslate/src/ppMopsRead.c

Timestamp:

Oct 4, 2012, 2:22:04 PM (14 years ago)

Author:

Serge CHASTEL

Message:

Dirty bug fix for posangle value

File:

• trunk/ppTranslate/src/ppMopsRead.c (modified) (9 diffs)

trunk/ppTranslate/src/ppMopsRead.c

@@ +1 @@
+/*
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ * THIS CODE CONTAINS DIRTY BUG FIXES!
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ * Look for "DIRTY_BUG_FIX" to know where
+ * 
+ * and set the following to 0 to change the code
+ */
+#define DIRTY_BUG_FIX 1
+/*
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -12 +90 @@
 static void replaceDummyValuesS32(const char* colName, psMetadata* source, psMetadata* target, psVector* indexes);
 static void renameDummyValuesF32(const char* colNameSource, psMetadata* source, const char* colNameTarget, psMetadata* target, psVector* indexes);
+#if DIRTY_BUG_FIX
+static psVector* createDummyF32_default(long size, float default_value);
+#endif
 
 /*
@@ -145 +226 @@
           replaceDummyValuesF32("EXT_INST_MAG",  fittedTrails, det->table, idet);
           replaceDummyValuesF32("EXT_INST_MAG_SIG",  fittedTrails, det->table, idet);
-          replaceDummyValuesF32("NPARAMS",  fittedTrails, det->table, idet);
+          replaceDummyValuesS32("NPARAMS",  fittedTrails, det->table, idet);
           replaceDummyValuesF32("EXT_WIDTH_MAJ",  fittedTrails, det->table, idet);
           replaceDummyValuesF32("EXT_WIDTH_MIN",  fittedTrails, det->table, idet);
@@ -163 +244 @@
             // Note: DEC_EXT_SIGMA is computed (see det->decExtErr)
             //Note: POSANG_EXT is POSANGLE in xfit
+#if DIRTY_BUG_FIX
+#else
             renameDummyValuesF32("POSANGLE",  fittedTrails, "POSANG_EXT", det->table, idet);
+#endif    
             //Note: PLTSCALE_EXT in xfit is PLTSCALE
             renameDummyValuesF32("PLTSCALE", fittedTrails, "PLTSCALE_EXT", det->table, idet);
@@ -249 +333 @@
       double yErr = yErrV->data.F32[row];
       double scale = scaleV->data.F32[row];
+#if DIRTY_BUG_FIX
+      double angle = 0. * angleV->data.F32[row];
+#else
       double angle = angleV->data.F32[row];
+#endif
 
       if (!isfinite(det->x->data.F32[row]) || !isfinite(det->y->data.F32[row]) ||
@@ -283 +371 @@
         yErr = yExtErrV->data.F32[row];
         scale = scaleExtV->data.F32[row]/3600.;
+#if DIRTY_BUG_FIX
+        angle = 0.;
+#else
         angle = angleExtV->data.F32[row];
-
+#endif
         cosAngle = cos(angle);
         sinAngle = sin(angle);
@@ -315 +406 @@
   return dummy;
 }
+#if DIRTY_BUG_FIX
+static psVector* createDummyF32_default(long size, float default_value) {
+  psVector* dummy = psVectorAlloc(size, PS_TYPE_F32);
+  psVectorInit(dummy, default_value);
+  return dummy;
+}
+#endif
 static psVector* createDummyS32(long size) {
   psVector* dummy = psVectorAlloc(size, PS_TYPE_S32);
@@ -328 +426 @@
   psMetadataAdd(md, PS_LIST_TAIL, "EXT_INST_MAG",  PS_DATA_VECTOR, "EXT fit instrumental magnitude", createDummyF32(size));
   psMetadataAdd(md, PS_LIST_TAIL, "EXT_INST_MAG_SIG",  PS_DATA_VECTOR, "Sigma of PSF instrumental magnitude", createDummyF32(size));
-  psMetadataAdd(md, PS_LIST_TAIL, "NPARAMS",  PS_DATA_VECTOR, "Number of model parameters", createDummyF32(size));
+  psMetadataAdd(md, PS_LIST_TAIL, "NPARAMS",  PS_DATA_VECTOR, "Number of model parameters", createDummyS32(size));
   psMetadataAdd(md, PS_LIST_TAIL, "EXT_WIDTH_MAJ",  PS_DATA_VECTOR, "EXT width (major axis), length for trail", createDummyF32(size));
   psMetadataAdd(md, PS_LIST_TAIL, "EXT_WIDTH_MIN",  PS_DATA_VECTOR, "EXT width (minor axis), sigma for trail", createDummyF32(size));
@@ -341 +439 @@
     psMetadataAdd(md, PS_LIST_TAIL, "DEC_EXT",  PS_DATA_VECTOR, "Fitted centroid DEC", createDummyF32(size));
 /*     psMetadataAdd(md, PS_LIST_TAIL, "DEC_EXT_SIGMA",  PS_DATA_VECTOR, "Fitted DEC sigma", createDummyF32(size)); *\/ */
+#if DIRTY_BUG_FIX
+    psMetadataAdd(md, PS_LIST_TAIL, "POSANG_EXT",  PS_DATA_VECTOR, "Fitted position angle", createDummyF32_default(size, 0.));
+#else
     psMetadataAdd(md, PS_LIST_TAIL, "POSANG_EXT",  PS_DATA_VECTOR, "Fitted position angle", createDummyF32(size));
+#endif
     psMetadataAdd(md, PS_LIST_TAIL, "PLTSCALE_EXT",  PS_DATA_VECTOR, "Plate scale at centroid", createDummyF32(size));
     psMetadataAdd(md, PS_LIST_TAIL, "EXT_FLUX",  PS_DATA_VECTOR, "Fitted flux", createDummyF32(size));