Index: trunk/psphot/src/psphotOutput.c
===================================================================
--- trunk/psphot/src/psphotOutput.c	(revision 34796)
+++ trunk/psphot/src/psphotOutput.c	(revision 35769)
@@ -379,17 +379,15 @@
         psF32 *outPar = source->modelEXT->params->data.F32;
 
-        psEllipseShape shape;
-
-        shape.sx  = outPar[PM_PAR_SXX] / M_SQRT2;
-        shape.sy  = outPar[PM_PAR_SYY] / M_SQRT2;
-        shape.sxy = outPar[PM_PAR_SXY];
-
-        psEllipsePol pol = pmPSF_ModelToFit (outPar);
+	bool useReff = pmModelUseReff (source->modelEXT->type);
+
+        psEllipseAxes axes1;
+	pmModelParamsToAxes (&axes1, outPar[PM_PAR_SXX], outPar[PM_PAR_SXY], outPar[PM_PAR_SYY], useReff);
+
+        psEllipsePol pol = pmPSF_ModelToFit (outPar, useReff);
         inPar[PM_PAR_E0] = pol.e0;
         inPar[PM_PAR_E1] = pol.e1;
         inPar[PM_PAR_E2] = pol.e2;
-        pmPSF_FitToModel (inPar, 0.1);
-
-        psEllipseAxes axes1 = psEllipseShapeToAxes (shape, 20.0);
+        pmPSF_FitToModel (inPar, 0.1, useReff);
+
         psEllipseAxes axes2 = psEllipsePolToAxes(pol, 0.1);