Changeset 15400 for branches/eam_branch_20071023/psphot/src/psphotPetrosian.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/psphotPetrosian.c (modified) (5 diffs)

branches/eam_branch_20071023/psphot/src/psphotPetrosian.c

@@ -2 +2 @@
 
 bool psphotPetrosian (pmSource *source, psMetadata *recipe, psMaskType maskVal) {
+
+  bool status;
 
   assert (source->extpars);
@@ -17 +19 @@
 
   // first find flux at R0
-  firstBelow = -1;
-  lastAbove = -1;
+  int firstBelow = -1;
+  int lastAbove = -1;
   for (int i = 0; i < radius->n; i++) {
     if (radius->data.F32[i] > PETROSIAN_R0) lastAbove = i;
@@ -25 +27 @@
 
   // average flux in this range
-  fluxR0 = 0.0;
-  fluxRn = 0;
+  float fluxR0 = 0.0;
+  int fluxRn = 0;
   for (int i = PS_MIN(firstBelow, lastAbove); i <= PS_MAX(firstBelow, lastAbove); i++) {
     fluxR0 += flux->data.F32[i];
     fluxRn ++;
   }
-  fluxR0 = fluxR0 / (float)(fluxRn);
+  fluxR0 /= (float)(fluxRn);
   
   // target flux for petrosian radius
-  fluxRP = fluxR0 * PETROSIAN_RF;
+  float fluxRP = fluxR0 * PETROSIAN_RF;
 
   // find the first bin below the flux level and the last above the level
@@ -58 +60 @@
     }
   }
-  float flux    = 0.5*(fluxLast + fluxFirst);
-  float fluxErr = 0.5*fabs(fluxLast - fluxFirst);
+  float fluxRPSum    = 0.5*(fluxLast + fluxFirst);
+  float fluxRPSumErr = 0.5*fabs(fluxLast - fluxFirst);
   // XXX need to use the weight appropriately here...
 
@@ -70 +72 @@
   
   // these are uncalibrated: instrumental mags and pixel units
-  source->extpars->petrosian->mag    = -2.5*log10(flux);
-  source->extpars->petrosian->magErr = fluxErr / flux;
+  source->extpars->petrosian->mag    = -2.5*log10(fluxRPSum);
+  source->extpars->petrosian->magErr = fluxRPSumErr / fluxRPSum;
 
   source->extpars->petrosian->rad    = rad;