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

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

@@ -5 +5 @@
 psF32 psphotEllipticalContourFunc (psVector *deriv, const psVector *params, const psVector *coord);
 
-bool psphotEllipticalContour (pmSource *source, pmPetrosian *petrosian) {
+bool psphotEllipticalContour (pmSource *source) {
+
+    pmSourceRadialProfile *profile = source->extpars->profile;
 
     // use LMM to fit theta vs radius to an ellipse
-    psVector *theta = petrosian->theta;
-    psVector *radius = petrosian->isophotalRadii;
+    psVector *theta = profile->theta;
+    psVector *radius = profile->isophotalRadii;
 
     // find Rmin and Rmax for the initial guess
@@ -83 +85 @@
     /// XXX rationalize? if epsilon > 1, flip major and minor axes (rotate by 90 degrees)
     if (params->data.F32[PAR_EPSILON] < 1.0) {
-        petrosian->axes.major = params->data.F32[PAR_RMIN] / params->data.F32[PAR_EPSILON];
-        petrosian->axes.minor = params->data.F32[PAR_RMIN];
-        petrosian->axes.theta = params->data.F32[PAR_PHI];
+        profile->axes.major = params->data.F32[PAR_RMIN] / params->data.F32[PAR_EPSILON];
+        profile->axes.minor = params->data.F32[PAR_RMIN];
+        profile->axes.theta = params->data.F32[PAR_PHI];
     } else {
-        petrosian->axes.major = params->data.F32[PAR_RMIN];
-        petrosian->axes.minor = params->data.F32[PAR_RMIN] / params->data.F32[PAR_EPSILON];
-        petrosian->axes.theta = params->data.F32[PAR_PHI] + 0.5*M_PI;
+        profile->axes.major = params->data.F32[PAR_RMIN];
+        profile->axes.minor = params->data.F32[PAR_RMIN] / params->data.F32[PAR_EPSILON];
+        profile->axes.theta = params->data.F32[PAR_PHI] + 0.5*M_PI;
     }
 
     psTrace ("psphot", 4, "# fitted values:\n");
-    psTrace ("psphot", 4, "Phi:   %f\n", petrosian->axes.theta*PS_DEG_RAD);
-    psTrace ("psphot", 4, "Rmaj:  %f\n", petrosian->axes.major);
-    psTrace ("psphot", 4, "Rmin:  %f\n", petrosian->axes.minor);
+    psTrace ("psphot", 4, "Phi:   %f\n", profile->axes.theta*PS_DEG_RAD);
+    psTrace ("psphot", 4, "Rmaj:  %f\n", profile->axes.major);
+    psTrace ("psphot", 4, "Rmin:  %f\n", profile->axes.minor);
     
     // show the results