Index: trunk/psModules/src/objects/pmSourceIO_CMP.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_CMP.c	(revision 13034)
+++ trunk/psModules/src/objects/pmSourceIO_CMP.c	(revision 13064)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-26 01:20:29 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-27 22:14:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -53,5 +53,4 @@
     float lsky = 0;
     bool status;
-    psEllipseShape shape;
     psEllipseAxes axes;
 
@@ -119,8 +118,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);
 
         float errMag = isfinite(source->errMag) ? source->errMag : 999;
@@ -155,5 +151,4 @@
     int Ninstar;
     psF32 *PAR, *dPAR;
-    psEllipseShape shape;
     psEllipseAxes axes;
 
@@ -274,9 +269,5 @@
                 goto skip_source;
 
-            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);
 
             psArrayAdd (sources, 100, source);