Changeset 25452 for branches/eam_branches/20090715/psphot/src/psphotEllipticalProfile.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/psphotEllipticalProfile.c (modified) (3 diffs)

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

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-bool psphotEllipticalProfile (pmSource *source, pmPetrosian *petrosian) {
+bool psphotEllipticalProfile (pmSource *source) {
 
-    petrosian->radiusElliptical = psVectorAllocEmpty(100, PS_TYPE_F32);
-    petrosian->fluxElliptical = psVectorAllocEmpty(100, PS_TYPE_F32);
+    pmSourceRadialProfile *profile = source->extpars->profile;
 
-    psVector *radius = petrosian->radiusElliptical;
-    psVector *flux = petrosian->fluxElliptical;
+    profile->radiusElliptical = psVectorAllocEmpty(100, PS_TYPE_F32);
+    profile->fluxElliptical = psVectorAllocEmpty(100, PS_TYPE_F32);
+
+    psVector *radius = profile->radiusElliptical;
+    psVector *flux = profile->fluxElliptical;
 
     // the psEllipse functions use z = 0.5(x/Sxx)^2 + 0.5(y/Syy)^2 + x y Sxy
@@ -20 +22 @@
     psEllipseAxes axes;
     axes.major = M_SQRT1_2;
-    axes.minor = M_SQRT1_2 * (petrosian->axes.minor / petrosian->axes.major);
+    axes.minor = M_SQRT1_2 * (profile->axes.minor / profile->axes.major);
 
     // axes.major = 1.0;
-    // axes.minor = petrosian->axes.minor / petrosian->axes.major;
+    // axes.minor = profile->axes.minor / profile->axes.major;
 
-    axes.theta = petrosian->axes.theta;
+    axes.theta = profile->axes.theta;
     psEllipseShape shape = psEllipseAxesToShape (axes);
 
@@ -56 +58 @@
     // psVector *radiusRaw = psVectorAllocEmpty(100, PS_TYPE_F32);
     // psVector *fluxRaw = psVectorAllocEmpty(100, PS_TYPE_F32);
-    // for (int i = 0; i < petrosian->radii->n; i++) {
-    //   psVector *r = petrosian->radii->data[i];
-    //   psVector *f = petrosian->fluxes->data[i];
+    // for (int i = 0; i < profile->radii->n; i++) {
+    //   psVector *r = profile->radii->data[i];
+    //   psVector *f = profile->fluxes->data[i];
     //   for (int j = 0; j < r->n; j++) {
     //  psVectorAppend(radiusRaw, r->data.F32[j]);