Changeset 15400 for branches/eam_branch_20071023/psphot/src/psphotIsophotal.c

Timestamp:

Oct 28, 2007, 3:41:13 PM (19 years ago)

Author:

eugene

Message:

adding extended source measurements

File:

• branches/eam_branch_20071023/psphot/src/psphotIsophotal.c (modified) (4 diffs)

branches/eam_branch_20071023/psphot/src/psphotIsophotal.c

@@ -7 +7 @@
   assert (source->extpars->profile->radius);
   assert (source->extpars->profile->flux);
+
+  bool status;
 
   psVector *radius = source->extpars->profile->radius;
@@ -19 +21 @@
   // XXX do I need to worry about crazy outliers?  
   // XXX should i be smoothing or fitting the curve?
-  firstBelow = -1;
-  lastAbove = -1;
+  int firstBelow = -1;
+  int lastAbove = -1;
   for (int i = 0; i < flux->n; i++) {
     if (flux->data.F32[i] > ISOPHOT_FLUX) lastAbove = i;
@@ -31 +33 @@
   for (int i = 0; i <= PS_MAX(firstBelow, lastAbove); i++) {
     if (i <= firstBelow) {
-      isophotFluxFirst += flux->data.F32[i];
+      isophotalFluxFirst += flux->data.F32[i];
     }
     if (i <= lastAbove) {
-      isophotFluxLast += flux->data.F32[i];
+      isophotalFluxLast += flux->data.F32[i];
     }
   }
-  float isophotalFlux    = 0.5*(isophotFluxLast + isophotFluxFirst);
-  float isophotalFluxErr = 0.5*fabs(isophotFluxLast - isophotFluxFirst);
+  float isophotalFlux    = 0.5*(isophotalFluxLast + isophotalFluxFirst);
+  float isophotalFluxErr = 0.5*fabs(isophotalFluxLast - isophotalFluxFirst);
 
   float isophotalRad     = 0.5*(radius->data.F32[firstBelow] + radius->data.F32[lastAbove]);
@@ -57 +59 @@
 
 }
-
-# if (0)
-  // XXX cache the tmpScalar 
-  psScalar fluxScalar;
-  fluxScalar.type.type = PS_TYPE_F32;
-  fluxScalar.data.F32  = ISOPHOT_FLUX;
-
-  // radius and flux must be sorted by radius
-
-  // XXX in general, flux decreases monotonically with radius.  however, since exceptions are
-  // possible we need to do something to smooth or otherwise handle the flux variations
-  
-  // get the index of the flux-sorted vector
-  psVector *fluxIndex = psVectorSortIndex (flux);
-
-  // XXX need to write psVectorIndexBinaryDisect, which operates on a 
-
-  // use disection to get in the right vicinity
-  binS = psVectorIndexBinaryDisect (&result, flux, fluxIndex, fluxScalar, PS_BISECT_FIRST);
-  binE = psVectorIndexBinaryDisect (&result, flux, fluxIndex, fluxScalar, PS_BISECT_LAST);
-
-  // find the min and max radius bins in this range
-
-  // XXX do something to choose a more accurate radial bin
-
-# endif