Changeset 25178 for branches/eam_branches/20090715/psphot/src/psphotEllipticalContour.c

Timestamp:

Aug 24, 2009, 8:40:34 AM (17 years ago)

Author:

eugene

Message:

various petrosian / radial profile analysis improvements

File:

• branches/eam_branches/20090715/psphot/src/psphotEllipticalContour.c (modified) (1 diff)

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

@@ -73 +73 @@
     psMinimizeLMChi2(myMin, covar, params, constraint, x, y, yErr, psphotEllipticalContourFunc);
 
+    /// 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];
+    } 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;
+    }
+
     fprintf (stderr, "# fitted values:\n");
     fprintf (stderr, "Po:  %f\n", params->data.F32[PAR_PHI]*PS_DEG_RAD);
     fprintf (stderr, "Ep:  %f\n", params->data.F32[PAR_EPSILON]);
     fprintf (stderr, "Rm:  %f\n", params->data.F32[PAR_RMIN]);
-
-    /// XXX rationalize? if epsilon > 1, flip major and minor axes (rotate by 90 degrees)
-    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];
 
     // show the results