Changeset 21366 for trunk/psphot/src/psphotRadialProfile.c

Timestamp:

Feb 5, 2009, 5:03:33 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

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

trunk/psphot/src/psphotRadialProfile.c

@@ -11 +11 @@
     flux->data.F32[A] = flux->data.F32[B]; \
     flux->data.F32[B] = tmp; \
-    tmp = weight->data.F32[A]; \
-    weight->data.F32[A] = weight->data.F32[B]; \
-    weight->data.F32[B] = tmp; \
+    tmp = variance->data.F32[A]; \
+    variance->data.F32[A] = variance->data.F32[B]; \
+    variance->data.F32[B] = tmp; \
   } \
 }
@@ -31 +31 @@
     source->extpars->profile->radius = psVectorAllocEmpty (nPts, PS_TYPE_F32);
     source->extpars->profile->flux   = psVectorAllocEmpty (nPts, PS_TYPE_F32);
-    source->extpars->profile->weight = psVectorAllocEmpty (nPts, PS_TYPE_F32);
+    source->extpars->profile->variance = psVectorAllocEmpty (nPts, PS_TYPE_F32);
 
     psVector *radius = source->extpars->profile->radius;
     psVector *flux   = source->extpars->profile->flux;
-    psVector *weight = source->extpars->profile->weight;
+    psVector *variance = source->extpars->profile->variance;
 
     // XXX use the extended source model here for Xo, Yo?
@@ -41 +41 @@
 
     int n = 0;
-    
+
     float Xo = 0.0;
     float Yo = 0.0;
@@ -57 +57 @@
             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];
+            variance->data.F32[n] = source->variance->data.F32[iy][ix];
             n++;
         }
     }
     radius->n = n;
-    weight->n = n;
+    variance->n = n;
     flux->n = n;