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

Timestamp:

Nov 16, 2012, 3:45:22 PM (13 years ago)

Author:

Serge CHASTEL

Message:

Removed the dirty bug fix related code

File:

• trunk/ppTranslate/src/ppMopsRead.c (modified) (7 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 0
-/*
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- */
 
 #ifdef HAVE_CONFIG_H
@@ -90 +14 @@
 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
 
 /*
@@ -244 +165 @@
             // 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
             //Not written anymore but still used in computation
             renameDummyValuesF32("PLTSCALE", fittedTrails, "PLTSCALE_EXT", det->table, idet);
@@ -333 +251 @@
       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]) ||
           !isfinite(det->ra->data.F64[row]) || !isfinite(det->dec->data.F64[row]) ||
@@ -375 +288 @@
         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);
@@ -410 +319 @@
   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) {
@@ -444 +346 @@
     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));