Index: branches/eam_branches/ipp-20110710/psModules/src/camera/pmReadoutFake.c
===================================================================
--- branches/eam_branches/ipp-20110710/psModules/src/camera/pmReadoutFake.c	(revision 31992)
+++ branches/eam_branches/ipp-20110710/psModules/src/camera/pmReadoutFake.c	(revision 32149)
@@ -51,5 +51,5 @@
 
     psF32 *params = model->params->data.F32; // Model parameters
-    psEllipseAxes axes = pmPSF_ModelToAxes(params, MAX_AXIS_RATIO); // Ellipse axes
+    psEllipseAxes axes = pmPSF_ModelToAxes(params, MAX_AXIS_RATIO, model->type); // Ellipse axes
     // Curiously, the minor axis can be larger than the major axis, so need to check.
     if (axes.major >= axes.minor) {
@@ -58,5 +58,5 @@
         axes.major = axes.minor;
     }
-    return pmPSF_AxesToModel(params, axes);
+    return pmPSF_AxesToModel(params, axes, model->type);
 }
 
Index: branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMF.c.in
===================================================================
--- branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMF.c.in	(revision 31992)
+++ branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMF.c.in	(revision 32149)
@@ -292,5 +292,5 @@
         @ALL@     dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
 
-        pmPSF_AxesToModel (PAR, axes);
+        pmPSF_AxesToModel (PAR, axes, modelType);
 
         @ALL@     float peakMag     = psMetadataLookupF32 (&status, row, "PEAK_FLUX_AS_MAG");
@@ -607,5 +607,5 @@
             yErr = dPAR[PM_PAR_YPOS];
 
-            axes = pmPSF_ModelToAxes (PAR, 20.0);
+            axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
 
             row = psMetadataAlloc ();
Index: branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMF_PS1_SV1.c
===================================================================
--- branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMF_PS1_SV1.c	(revision 31992)
+++ branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMF_PS1_SV1.c	(revision 32149)
@@ -280,5 +280,5 @@
         dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
 
-        pmPSF_AxesToModel (PAR, axes);
+        pmPSF_AxesToModel (PAR, axes, modelType);
 
         float peakMag     = psMetadataLookupF32 (&status, row, "PEAK_FLUX_AS_MAG");
@@ -607,5 +607,5 @@
             yErr = dPAR[PM_PAR_YPOS];
 
-            axes = pmPSF_ModelToAxes (PAR, 20.0);
+            axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
 
             row = psMetadataAlloc ();
Index: branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMP.c
===================================================================
--- branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMP.c	(revision 31992)
+++ branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMP.c	(revision 32149)
@@ -135,5 +135,5 @@
         lsky = (source->sky < 1.0) ? 0.0 : log10(source->sky);
 
-        axes = pmPSF_ModelToAxes (PAR, 20.0);
+        axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
 
         float psfMagErr = isfinite(source->psfMagErr) ? source->psfMagErr : 999;
@@ -293,5 +293,5 @@
                 goto skip_source;
 
-            pmPSF_AxesToModel (PAR, axes);
+            pmPSF_AxesToModel (PAR, axes, modelType);
 
             psArrayAdd (sources, 100, source);
Index: branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_OBJ.c
===================================================================
--- branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_OBJ.c	(revision 31992)
+++ branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_OBJ.c	(revision 32149)
@@ -91,5 +91,5 @@
         }
 
-        axes = pmPSF_ModelToAxes (PAR, 20.0);
+        axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
 
         psLineInit (line);
Index: branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_PS1_CAL_0.c
===================================================================
--- branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_PS1_CAL_0.c	(revision 31992)
+++ branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_PS1_CAL_0.c	(revision 32149)
@@ -113,5 +113,5 @@
             yErr = dPAR[PM_PAR_YPOS];
 	    if (isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXX])) {
-		axes = pmPSF_ModelToAxes (PAR, 20.0);
+		axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
 	    } else {
 		axes.major = NAN;
@@ -288,5 +288,5 @@
 	dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
 
-        pmPSF_AxesToModel (PAR, axes);
+        pmPSF_AxesToModel (PAR, axes, modelType);
 
         float peakMag     = psMetadataLookupF32 (&status, row, "PEAK_FLUX_AS_MAG");
@@ -618,5 +618,5 @@
 	    yErr = dPAR[PM_PAR_YPOS];
 
-	    axes = pmPSF_ModelToAxes (PAR, 20.0);
+	    axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
 
 	    // generate RA,DEC
Index: branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_PS1_DEV_0.c
===================================================================
--- branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_PS1_DEV_0.c	(revision 31992)
+++ branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_PS1_DEV_0.c	(revision 32149)
@@ -89,5 +89,5 @@
             yErr = dPAR[PM_PAR_YPOS];
 
-            axes = pmPSF_ModelToAxes (PAR, 20.0);
+            axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
         } else {
             // XXX: This code seg faults if source->peak is NULL.
@@ -214,5 +214,5 @@
         source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
 
-        pmPSF_AxesToModel (PAR, axes);
+        pmPSF_AxesToModel (PAR, axes, modelType);
 
         float peakMag = psMetadataLookupF32 (&status, row, "PEAK_FLUX_AS_MAG");
Index: branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_SMPDATA.c
===================================================================
--- branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_SMPDATA.c	(revision 31992)
+++ branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_SMPDATA.c	(revision 32149)
@@ -92,5 +92,5 @@
 	    lsky = (source->sky < 1.0) ? 0.0 : log10(source->sky);
 
-	    axes = pmPSF_ModelToAxes (PAR, 20.0);
+	    axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
 
 	} else {
@@ -190,5 +190,5 @@
         axes.theta       = psMetadataLookupF32 (&status, row, "THETA");
 
-	pmPSF_AxesToModel (PAR, axes);
+	pmPSF_AxesToModel (PAR, axes, modelType);
 
         source->psfMag = psMetadataLookupF32 (&status, row, "MAG_RAW") - ZERO_POINT;
Index: branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_SX.c
===================================================================
--- branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_SX.c	(revision 31992)
+++ branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_SX.c	(revision 32149)
@@ -81,5 +81,5 @@
         // pmSourceSextractType (source, &type, &flags);
 
-        axes = pmPSF_ModelToAxes (PAR, 20.0);
+        axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
 
         psLineInit (line);