Index: /trunk/ppSim/src/ppSimInsertGalaxies.c
===================================================================
--- /trunk/ppSim/src/ppSimInsertGalaxies.c	(revision 36867)
+++ /trunk/ppSim/src/ppSimInsertGalaxies.c	(revision 36868)
@@ -145,5 +145,5 @@
 	    axes.minor       = galaxy->Rmin;
 	    axes.theta       = galaxy->theta;
-	    pmPSF_AxesToModel (PAR, axes, type);
+	    pmPSF_AxesToModel (PAR, axes, model->class->useReff);
 	}
 	psF64 Area = 2.0 * M_PI * galaxy->Rmaj * galaxy->Rmin;
Index: /trunk/ppSim/src/ppSimInsertStars.c
===================================================================
--- /trunk/ppSim/src/ppSimInsertStars.c	(revision 36867)
+++ /trunk/ppSim/src/ppSimInsertStars.c	(revision 36868)
@@ -126,5 +126,5 @@
 	// XXX set the mag & err values (should this be done in pmSourceFromModel?)
 	// XXX i should be applying the gain and the correct effective area
-	psEllipseAxes axes = pmPSF_ModelToAxes (model->params->data.F32, model->type);
+	psEllipseAxes axes = pmPSF_ModelToAxes (model->params->data.F32, model->class->useReff);
 	float Area = 2.0 * M_PI * axes.major * axes.minor;
 
Index: /trunk/psastro/src/psastroConvert.c
===================================================================
--- /trunk/psastro/src/psastroConvert.c	(revision 36867)
+++ /trunk/psastro/src/psastroConvert.c	(revision 36868)
@@ -199,5 +199,5 @@
 	// effect (all affected data was processed BEFORE the bug was introduced), and it
 	// does not affect any of the PV2 or PV3 data processed AFTER the bug was fixed.
-	psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->type);
+	psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->class->useReff);
 
         pmAstromObj *obj = pmAstromObjAlloc ();
Index: /trunk/psphot/src/psphotFullForceSummaryReadout.c
===================================================================
--- /trunk/psphot/src/psphotFullForceSummaryReadout.c	(revision 36867)
+++ /trunk/psphot/src/psphotFullForceSummaryReadout.c	(revision 36868)
@@ -425,5 +425,5 @@
                 // copy the best fit params to the model
                 // fractional radii with the lowest chisq
-                psEllipseAxes axes = pmPSF_ModelToAxes(model->params->data.F32, model->type);
+                psEllipseAxes axes = pmPSF_ModelToAxes(model->params->data.F32, model->class->useReff);
 
                 // examine the params for the trial with minimum chisq.
@@ -637,5 +637,5 @@
                 // now save the model parameters in the model structure
 
-                pmPSF_AxesToModel (model->params->data.F32, axes, modelType);
+                pmPSF_AxesToModel (model->params->data.F32, axes, model->class->useReff);
 
                 model->mag = -2.5 * log10(flux0);
Index: /trunk/psphot/src/psphotGalaxyShape.c
===================================================================
--- /trunk/psphot/src/psphotGalaxyShape.c	(revision 36867)
+++ /trunk/psphot/src/psphotGalaxyShape.c	(revision 36868)
@@ -283,5 +283,5 @@
 
         // I have some source guess (e0, e1, e2)
-        psEllipseAxes guessAxes = pmPSF_ModelToAxes (PAR, modelType);
+        psEllipseAxes guessAxes = pmPSF_ModelToAxes (PAR, model->class->useReff);
 
         float fRmajorBest = NAN;
@@ -295,5 +295,5 @@
                 testAxes.minor = guessAxes.minor * fRminor;
                 
-                pmPSF_AxesToModel (PAR, testAxes, modelType);
+                pmPSF_AxesToModel (PAR, testAxes, model->class->useReff);
                 
                 psphotGalaxyShapeSource (pcm, source, galaxyFits, maskVal, psfSize, true);
@@ -324,5 +324,5 @@
 #endif
             
-            pmPSF_AxesToModel (PAR, testAxes, modelType);
+            pmPSF_AxesToModel (PAR, testAxes, model->class->useReff);
                 
             psphotGalaxyShapeSource (pcm, source, galaxyFits, maskVal, psfSize, false);
Index: /trunk/psphot/src/psphotLoadSRCTEXT.c
===================================================================
--- /trunk/psphot/src/psphotLoadSRCTEXT.c	(revision 36867)
+++ /trunk/psphot/src/psphotLoadSRCTEXT.c	(revision 36868)
@@ -73,5 +73,5 @@
 	    dPAR[PM_PAR_I0]   = 0.0;
 
-	    pmPSF_AxesToModel (PAR, axes, modelType);
+	    pmPSF_AxesToModel (PAR, axes, model->class->useReff);
 
 	    float peakFlux    = 1.0;
Index: /trunk/pswarp/src/pswarpTransformSources.c
===================================================================
--- /trunk/pswarp/src/pswarpTransformSources.c	(revision 36867)
+++ /trunk/pswarp/src/pswarpTransformSources.c	(revision 36868)
@@ -120,6 +120,6 @@
 #if 0
         // XXX Note that this will not set the correct axes
-	psEllipseAxes axes = pmPSF_ModelToAxes(source->modelPSF->params->data.F32, 20.0, source->modelPSF->type);
-        pmPSF_AxesToModel(new->modelPSF->params->data.F32, axes, new->modelPSF->type);
+	psEllipseAxes axes = pmPSF_ModelToAxes(source->modelPSF->params->data.F32, 20.0, source->modelPSF->class->useReff);
+        pmPSF_AxesToModel(new->modelPSF->params->data.F32, axes, new->modelPSF->class->useReff);
 #endif