Changeset 25105 for branches/eam_branches/20090715/psphot/src/psphotEllipticalProfile.c

Timestamp:

Aug 18, 2009, 6:24:53 AM (17 years ago)

Author:

eugene

Message:

updates for petrosian analysis study

Location:

branches/eam_branches/20090715/psphot/src

Files:

• . (modified) (1 prop)
• psphotEllipticalProfile.c (modified) (3 diffs)

branches/eam_branches/20090715/psphot/src

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy

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

@@ -3 +3 @@
 bool psphotEllipticalProfile (pmSource *source, pmPetrosian *petrosian) {
 
-    petrosian->radiusElli = psArrayAllocEmpty(100);
-    petrosian->fluxElli = psArrayAllocEmpty(100);
+    petrosian->radiusElliptical = psVectorAllocEmpty(100, PS_TYPE_F32);
+    petrosian->fluxElliptical = psVectorAllocEmpty(100, PS_TYPE_F32);
 
-    psVector *radius = petrosian->radiusElli;
-    psVector *flux = petrosian->fluxElli;
+    psVector *radius = petrosian->radiusElliptical;
+    psVector *flux = petrosian->fluxElliptical;
 
     // the psEllipse functions use z = 0.5(x/Sxx)^2 + 0.5(y/Syy)^2 + x y Sxy
@@ -14 +14 @@
     // a = A / sqrt(2)
 
+    // we have the shape parameters of the elliptical contour at the reference isophote.
+    // use the axis ratio (major/minor) to rescale the radial profile so that 1 pixel
+    // along the major axis is 1 pixel, and a smaller amount on the minor axis
+
     psEllipseAxes axes;
-    axes.major = petrosian->axes.major * M_SQRT1_2;
-    axes.minor = petrosian->axes.minor * M_SQRT1_2;
+    axes.major = M_SQRT1_2;
+    axes.minor = M_SQRT1_2 * (petrosian->axes.minor / petrosian->axes.major);
+
+    // axes.major = 1.0;
+    // axes.minor = petrosian->axes.minor / petrosian->axes.major;
+
     axes.theta = petrosian->axes.theta;
-    psEllipseShape shape = psEllipseShapeFromAxes (petrosian->axes);
+    psEllipseShape shape = psEllipseAxesToShape (axes);
 
     float Sxx = shape.sx;
@@ -24 +32 @@
     float Syy = shape.sy;
 
-    for (int iy = 0; iy < Ny; iy++) {
-        for (int ix = 0; ix < Nx; ix++) {
+    psVector *radiusRaw = psVectorAllocEmpty(100, PS_TYPE_F32);
+    psVector *fluxRaw = psVectorAllocEmpty(100, PS_TYPE_F32);
+
+    for (int iy = 0; iy < source->pixels->numRows; iy++) {
+        for (int ix = 0; ix < source->pixels->numCols; ix++) {
 
             float x = ix - source->peak->xf + source->pixels->col0;
             float y = iy - source->peak->yf + source->pixels->row0;
 
-            psVectorAppend(radius, sqrt(0.5*PS_SQR(x/Sxx) + 0.5*PS_SQR(y/Syy) + x*y*Sxy));
-            psVectorAppend(flux, pixels[iy][ix]);
+            float r2 = 0.5*PS_SQR(x/Sxx) + 0.5*PS_SQR(y/Syy) + x*y*Sxy;
+            // float r2 = PS_SQR(x/Sxx) + PS_SQR(y/Syy) + x*y*Sxy;
+
+            psVectorAppend(radius, sqrt(r2));
+            psVectorAppend(flux, source->pixels->data.F32[iy][ix]);
+
+            float Rraw = hypot(x, y);
+            psVectorAppend(radiusRaw, Rraw);
+            psVectorAppend(fluxRaw, source->pixels->data.F32[iy][ix]);
         }
     }
 
+    // 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 j = 0; j < r->n; j++) {
+    //  psVectorAppend(radiusRaw, r->data.F32[j]);
+    //  psVectorAppend(fluxRaw, f->data.F32[j]);
+    //   }
+    // }
+
+    // psphotPetrosianVisualProfileRadii (radius, flux, radiusRaw, fluxRaw, 0.0);
+    psphotPetrosianVisualProfileByAngle (radius, flux);
     return true;
 }

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy