Changeset 27952

Timestamp:

May 13, 2010, 11:45:49 AM (16 years ago)

Author:

eugene

Message:

forgot to sort the pixel fluxes by radius

File:

• branches/eam_branches/psphot.20100506/src/psphotRadialApertures.c (modified) (3 diffs)

branches/eam_branches/psphot.20100506/src/psphotRadialApertures.c

@@ -1 +1 @@
 # include "psphotInternal.h"
+
+bool psphotRadialAperturesSortFlux (psVector *radius, psVector *pixFlux, psVector *pixVar);
 
 // for now, let's store the detections on the readout->analysis for each readout
@@ -154 +156 @@
         }
     }
+    psphotRadialAperturesSortFlux(radius, pixFlux, pixVar);
 
     psVector *flux    = psVectorAllocEmpty(radMax->n, PS_TYPE_F32); // surface brightness of radial bin
@@ -207 +210 @@
     return true;
 }
+
+// *** pmSourceRadialProfileSortPair is a utility function for sorting a pair of vectors
+# define COMPARE_VECT(A,B) (radius->data.F32[A] < radius->data.F32[B])
+# define SWAP_VECT(TYPE,A,B) { \
+  float tmp; \
+  if (A != B) { \
+    tmp = radius->data.F32[A]; \
+    radius->data.F32[A] = radius->data.F32[B];  \
+    radius->data.F32[B] = tmp; \
+    tmp = pixFlux->data.F32[A]; \
+    pixFlux->data.F32[A] = pixFlux->data.F32[B]; \
+    pixFlux->data.F32[B] = tmp; \
+    tmp = pixVar->data.F32[A]; \
+    pixVar->data.F32[A] = pixVar->data.F32[B]; \
+    pixVar->data.F32[B] = tmp; \
+  } \
+}
+
+bool psphotRadialAperturesSortFlux (psVector *radius, psVector *pixFlux, psVector *pixVar) {
+
+    // sort the vector set by the radius
+    PSSORT (radius->n, COMPARE_VECT, SWAP_VECT, NONE);
+    return true;
+}
+