Index: /trunk/psphot/src/psphotIsophotal.c
===================================================================
--- /trunk/psphot/src/psphotIsophotal.c	(revision 17560)
+++ /trunk/psphot/src/psphotIsophotal.c	(revision 17561)
@@ -1,5 +1,3 @@
 # include "psphotInternal.h"
-
-static float ISOPHOT_FLUX = NAN;
 
 bool psphotIsophotal (pmSource *source, psMetadata *recipe, psMaskType maskVal) {
@@ -16,13 +14,11 @@
 
   // flux at which to measure isophotal parameters
-  if (!isfinite(ISOPHOT_FLUX)) {
-    // XXX ISOPHOTAL_FLUX should be specified in mags, need the zero point to get counts/sec
-    ISOPHOT_FLUX = psMetadataLookupF32 (&status, recipe, "ISOPHOTAL_FLUX");
-    assert (status);
-  }
+  // XXX ISOPHOTAL_FLUX should be specified in mags, need the zero point to get counts/sec
+  float ISOPHOT_FLUX = psMetadataLookupF32 (&status, recipe, "ISOPHOTAL_FLUX");
+  assert (status);
 
   // 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;
@@ -44,5 +40,5 @@
     return false;
   }
-  
+
   // need to examine pixels in this vicinity
   float isophotalFluxFirst = 0;
@@ -65,5 +61,5 @@
     source->extpars->isophot = pmSourceIsophotalValuesAlloc ();
   }
-  
+
   // these are uncalibrated: instrumental mags and pixel units
   source->extpars->isophot->mag    = -2.5*log10(isophotalFlux);
@@ -74,7 +70,7 @@
 
   psTrace ("psphot", 5, "Isophot flux:%f +/- %f @ %f +/- %f for %f, %f\n",
-	   source->extpars->isophot->mag, source->extpars->isophot->magErr,
-	   source->extpars->isophot->rad, source->extpars->isophot->radErr,
-	   source->peak->xf, source->peak->yf);
+           source->extpars->isophot->mag, source->extpars->isophot->magErr,
+           source->extpars->isophot->rad, source->extpars->isophot->radErr,
+           source->peak->xf, source->peak->yf);
 
   return true;
Index: /trunk/psphot/src/psphotPetrosian.c
===================================================================
--- /trunk/psphot/src/psphotPetrosian.c	(revision 17560)
+++ /trunk/psphot/src/psphotPetrosian.c	(revision 17561)
@@ -1,6 +1,3 @@
 # include "psphotInternal.h"
-
-static float PETROSIAN_R0 = NAN;
-static float PETROSIAN_RF = NAN;
 
 bool psphotPetrosian (pmSource *source, psMetadata *recipe, psMaskType maskVal) {
@@ -17,9 +14,7 @@
 
   // 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,5 +45,5 @@
   }
   fluxR0 /= (float)(fluxRn);
-  
+
   // target flux for petrosian radius
   float fluxRP = fluxR0 * PETROSIAN_RF;
@@ -56,5 +51,5 @@
   // 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,5 +92,5 @@
     source->extpars->petrosian = pmSourcePetrosianValuesAlloc ();
   }
-  
+
   // these are uncalibrated: instrumental mags and pixel units
   source->extpars->petrosian->mag    = -2.5*log10(fluxRPSum);
@@ -106,7 +101,7 @@
 
   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;