Changeset 21366 for trunk/psphot/src/psphotAnnuli.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/psphotAnnuli.c (modified) (4 diffs)

trunk/psphot/src/psphotAnnuli.c

@@ -11 +11 @@
 
   psVector *radius = source->extpars->profile->radius;
-  psVector *weight = source->extpars->profile->weight;
+  psVector *variance = source->extpars->profile->variance;
   psVector *flux = source->extpars->profile->flux;
 
@@ -22 +22 @@
   psVector *fluxValues = psVectorAlloc (radialBinsLower->n, PS_TYPE_F32);
   psVector *fluxSquare = psVectorAlloc (radialBinsLower->n, PS_TYPE_F32);
-  psVector *fluxWeight = psVectorAlloc (radialBinsLower->n, PS_TYPE_F32);
+  psVector *fluxVariance = psVectorAlloc (radialBinsLower->n, PS_TYPE_F32);
   psVector *pixelCount = psVectorAlloc (radialBinsLower->n, PS_TYPE_F32);
   psVectorInit (fluxValues, 0.0);
   psVectorInit (fluxSquare, 0.0);
-  psVectorInit (fluxWeight, 0.0);
+  psVectorInit (fluxVariance, 0.0);
   psVectorInit (pixelCount, 0.0);
 
   // XXX this code assumes the radii are in pixels.  convert from arcsec with plate scale
   // XXX assume the annulii above are not overlapping?  much faster...
-  // XXX this might be must faster in the reverse order: loop over annulii and use disection to 
+  // XXX this might be must faster in the reverse order: loop over annulii and use disection to
   // skip to the start of the annulus.
   for (int i = 0; i < flux->n; i++) {
@@ -39 +39 @@
       fluxValues->data.F32[j] += flux->data.F32[i];
       fluxSquare->data.F32[j] += PS_SQR(flux->data.F32[i]);
-      fluxWeight->data.F32[j] += weight->data.F32[i];
+      fluxVariance->data.F32[j] += variance->data.F32[i];
       pixelCount->data.F32[j] += 1.0;
     }
@@ -49 +49 @@
     fluxSquare->data.F32[j] -= PS_SQR(fluxValues->data.F32[j]);
   }
-  
+
   source->extpars->annuli = pmSourceAnnuliAlloc ();
   source->extpars->annuli->flux    = fluxValues;
-  source->extpars->annuli->fluxErr = fluxWeight;
+  source->extpars->annuli->fluxErr = fluxVariance;
   source->extpars->annuli->fluxVar = fluxSquare;