Changeset 25452 for branches/eam_branches/20090715/psphot/src/psphotRadiiFromProfiles.c

Timestamp:

Sep 19, 2009, 8:49:41 AM (17 years ago)

Author:

eugene

Message:

further work on the petrosian analysis & extended sources

File:

• branches/eam_branches/20090715/psphot/src/psphotRadiiFromProfiles.c (modified) (3 diffs)

branches/eam_branches/20090715/psphot/src/psphotRadiiFromProfiles.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-// Given the Petrosian data (radii, fluxes) determine the radius for each profile at the desisred isophote
+// Given the Radial Profiles (radii, fluxes) determine the radius for each profile at the desired isophote
 
-bool psphotRadiiFromProfiles (pmSource *source, pmPetrosian *petrosian, float fluxMin, float fluxMax) {
+bool psphotRadiiFromProfiles (pmSource *source, float fluxMin, float fluxMax) {
 
-  petrosian->isophotalRadii = psVectorAlloc(petrosian->theta->n, PS_TYPE_F32);
+    pmSourceRadialProfile *profile = source->extpars->profile;
 
-  for (int i = 0; i < petrosian->theta->n; i++) {
-      psVector *radii = petrosian->radii->data[i];
-      psVector *fluxes = petrosian->fluxes->data[i];
-      float radius = psphotRadiusFromProfile (source, radii, fluxes, fluxMin, fluxMax);
+    psFree(profile->isophotalRadii);
+    profile->isophotalRadii = psVectorAlloc(profile->theta->n, PS_TYPE_F32);
 
-      // psphotPetrosianVisualProfileByAngle (radii, fluxes, radius);
+    for (int i = 0; i < profile->theta->n; i++) {
+        psVector *radii = profile->radii->data[i];
+        psVector *fluxes = profile->fluxes->data[i];
+        float radius = psphotRadiusFromProfile (source, radii, fluxes, fluxMin, fluxMax);
 
-      // warn on NAN?
-      petrosian->isophotalRadii->data.F32[i] = radius;
-  }
-  return true;
+        // psphotPetrosianVisualProfileByAngle (radii, fluxes, radius);
+
+        // warn on NAN?
+        profile->isophotalRadii->data.F32[i] = radius;
+    }
+    return true;
 }
 
@@ -79 +82 @@
 
         // sort the flux by the radius
-        psphotPetrosianSortPair (radius, flux);
+        pmSourceRadialProfileSortPair (radius, flux);
 
         int nOut = 0;
@@ -128 +131 @@
             // XXX is there a macro in psLib that does this interpolation?
             if (i == 0) { 
-                psLogMsg ("psphot", 3, "bogus radial profile for ..., skipping");
+                psTrace ("psphot", 4, "bogus radial profile for source at %f, %f, skipping", source->peak->xf, source->peak->yf);
                 psFree (fluxBinned);
                 psFree (radiusBinned);