Changeset 15819

Timestamp:

Dec 13, 2007, 2:40:29 PM (18 years ago)

Author:

Paul Price

Message:

Fixing syntax so it builds.

File:

• trunk/psphot/src/psphotRadialProfile.c (modified) (4 diffs)

trunk/psphot/src/psphotRadialProfile.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-# define COMPARE(A,B) (radius->data.F32[A] < radius->data.F32[B])
-# define SWAPFUNC(TYPE,A,B) { \
+# define COMPARE_RADIUS(A,B) (radius->data.F32[A] < radius->data.F32[B])
+# define SWAP_RADIUS(TYPE,A,B) { \
   float tmp; \
   if (A != B) { \
@@ -14 +14 @@
     weight->data.F32[A] = weight->data.F32[B]; \
     weight->data.F32[B] = tmp; \
-  }
-    
+  } \
+}
+
 bool psphotRadialProfile (pmSource *source, psMetadata *recipe, psMaskType maskVal) {
 
     // allocate pmSourceExtendedParameters, if not already defined
     if (!source->extpars) {
-        source->extpars = pmSourceExtendedParsAlloc ();
+        source->extpars = pmSourceExtendedParsAlloc ();
     }
 
     if (!source->extpars->profile) {
-        source->extpars->profile = pmSourceRadialProfileAlloc (); 
-    }    
-    
+        source->extpars->profile = pmSourceRadialProfileAlloc ();
+    }
+
     int nPts = source->pixels->numRows * source->pixels->numCols;
     source->extpars->profile->radius = psVectorAllocEmpty (nPts, PS_TYPE_F32);
@@ -43 +44 @@
     float Yo = source->modelEXT->params->data.F32[PM_PAR_YPOS] - source->pixels->row0;
     for (int iy = 0; iy < source->pixels->numRows; iy++) {
-        for (int ix = 0; ix < source->pixels->numCols; ix++) {
-            if (source->maskObj->data.U8[iy][ix]) continue;
-            radius->data.F32[n] = hypot (ix - Xo, iy - Yo) ;
-            flux->data.F32[n]   = source->pixels->data.F32[iy][ix];
-            weight->data.F32[n] = source->weight->data.F32[iy][ix];
-            n++;
-        }
+        for (int ix = 0; ix < source->pixels->numCols; ix++) {
+            if (source->maskObj->data.U8[iy][ix]) continue;
+            radius->data.F32[n] = hypot (ix - Xo, iy - Yo) ;
+            flux->data.F32[n]   = source->pixels->data.F32[iy][ix];
+            weight->data.F32[n] = source->weight->data.F32[iy][ix];
+            n++;
+        }
     }
     radius->n = n;
@@ -56 +57 @@
 
     // sort the vector set by the radius
-    PSSORT (radius->n, COMPARE, SWAPFUNC, NONE);
+    PSSORT (radius->n, COMPARE_RADIUS, SWAP_RADIUS, NONE);
 
     return true;