Index: trunk/psModules/src/objects/pmSourceIO_CMF.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_CMF.c	(revision 13034)
+++ trunk/psModules/src/objects/pmSourceIO_CMF.c	(revision 13064)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-26 01:20:29 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-27 22:14:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -68,8 +68,5 @@
         lsky = (source->sky < 1.0) ? 0.0 : log10(source->sky);
 
-        shape.sx  = PAR[PM_PAR_SXX];
-        shape.sy  = PAR[PM_PAR_SYY];
-        shape.sxy = PAR[PM_PAR_SXY];
-        axes = psEllipseShapeToAxes (shape, 20.0);
+        axes = pmPSF_ModelToAxes (PAR, 20.0);
 
         row = psMetadataAlloc ();
@@ -158,9 +155,5 @@
         axes.theta       = psMetadataLookupF32 (&status, row, "THETA");
 
-        shape = psEllipseAxesToShape (axes);
-
-        PAR[PM_PAR_SXX] = shape.sx;
-        PAR[PM_PAR_SYY] = shape.sy;
-        PAR[PM_PAR_SXY] = shape.sxy;
+	pmPSF_AxesToModel (PAR, axes);
 
         source->psfMag = psMetadataLookupF32 (&status, row, "MAG_RAW") - ZERO_POINT;