Changeset 17561 for trunk/psphot/src/psphotPetrosian.c

Timestamp:

May 7, 2008, 11:14:09 AM (18 years ago)

Author:

Paul Price

Message:

Reworking due to compiler error which seems to be due to initialising static value to NAN: 'initializer element is not constant'. Got rid of the static --- no need for this, unless the psMetadataLookup is too heavy (shouldn't be, and there's more processing going on in these functions than is going on in psMetadataLookup).

File:

• trunk/psphot/src/psphotPetrosian.c (modified) (6 diffs)

trunk/psphot/src/psphotPetrosian.c

@@ -1 +1 @@
 # include "psphotInternal.h"
-
-static float PETROSIAN_R0 = NAN;
-static float PETROSIAN_RF = NAN;
 
 bool psphotPetrosian (pmSource *source, psMetadata *recipe, psMaskType maskVal) {
@@ -17 +14 @@
 
   // flux at which to measure isophotal parameters
-  if (!isfinite(PETROSIAN_R0)) {
-    PETROSIAN_R0 = psMetadataLookupF32 (&status, recipe, "PETROSIAN_R0");
-    PETROSIAN_RF = psMetadataLookupF32 (&status, recipe, "PETROSIAN_FLUX_RATIO");
-    assert (status);
-  }
+  float PETROSIAN_R0 = psMetadataLookupF32 (&status, recipe, "PETROSIAN_R0");
+  float PETROSIAN_RF = psMetadataLookupF32 (&status, recipe, "PETROSIAN_FLUX_RATIO");
+  assert (status);
 
   // first find flux at R0
@@ -50 +45 @@
   }
   fluxR0 /= (float)(fluxRn);
-  
+
   // target flux for petrosian radius
   float fluxRP = fluxR0 * PETROSIAN_RF;
@@ -56 +51 @@
   // find the first bin below the flux level and the last above the level
   // XXX can this be done faster with bisection?
-  // XXX do I need to worry about crazy outliers?  
+  // XXX do I need to worry about crazy outliers?
   // XXX should i be smoothing or fitting the curve?
   int firstBelow = -1;
@@ -97 +92 @@
     source->extpars->petrosian = pmSourcePetrosianValuesAlloc ();
   }
-  
+
   // these are uncalibrated: instrumental mags and pixel units
   source->extpars->petrosian->mag    = -2.5*log10(fluxRPSum);
@@ -106 +101 @@
 
   psTrace ("psphot", 5, "Petrosian flux:%f +/- %f @ %f +/- %f for %f, %f\n",
-           source->extpars->petrosian->mag, source->extpars->petrosian->magErr,
-           source->extpars->petrosian->rad, source->extpars->petrosian->radErr,
-           source->peak->xf, source->peak->yf);
+           source->extpars->petrosian->mag, source->extpars->petrosian->magErr,
+           source->extpars->petrosian->rad, source->extpars->petrosian->radErr,
+           source->peak->xf, source->peak->yf);
 
   return true;