Index: /trunk/ppSim/src/ppSimInsertGalaxies.c
===================================================================
--- /trunk/ppSim/src/ppSimInsertGalaxies.c	(revision 36861)
+++ /trunk/ppSim/src/ppSimInsertGalaxies.c	(revision 36862)
@@ -154,5 +154,5 @@
 
 	// XXX let the flux limit be a user-defined number of sky sigmas (not just 1.0)
-	float radius = model->modelRadius (model->params, 0.1*roughNoise);
+	float radius = model->class->modelRadius (model->params, 0.1*roughNoise);
 	radius = PS_MAX (radius, 1.0);
 
@@ -163,5 +163,5 @@
 	pmSource *source = pmSourceFromModel (model, readout, radius, PM_SOURCE_TYPE_EXTENDED);
 
-	galaxy->flux = model->modelFlux (model->params);
+	galaxy->flux = model->class->modelFlux (model->params);
 
 	// XXX set the mag & err values (should this be done in pmSourceFromModel?)
Index: /trunk/ppSim/src/ppSimInsertStars.c
===================================================================
--- /trunk/ppSim/src/ppSimInsertStars.c	(revision 36861)
+++ /trunk/ppSim/src/ppSimInsertStars.c	(revision 36862)
@@ -116,5 +116,5 @@
 	// (inserting flux with a variable radius introduces a flux-dependent bias)
 	if (radius < 0) {
-	  radius = model->modelRadius (model->params, nSigmaLim * roughNoise);
+	  radius = model->class->modelRadius (model->params, nSigmaLim * roughNoise);
 	  radius = PS_MAX (radius,  1.0);
 	  radius = PS_MIN (radius, 50.0);
Index: /trunk/ppViz/src/ppVizPSF/ppVizPSFLoop.c
===================================================================
--- /trunk/ppViz/src/ppVizPSF/ppVizPSFLoop.c	(revision 36861)
+++ /trunk/ppViz/src/ppVizPSF/ppVizPSFLoop.c	(revision 36862)
@@ -117,5 +117,5 @@
 
                         pmModel *model = pmModelFromPSFforXY(psf, xSrc, ySrc, 1.0); // Model for normalisation
-                        float fluxNorm = model->modelFlux(model->params);               // Flux for peak=1
+                        float fluxNorm = model->class->modelFlux(model->params);               // Flux for peak=1
                         float fluxPeak = powf(10.0, -0.4 * data->fakeMag) / fluxNorm; // Peak flux
                         source->peak = pmPeakAlloc(xSrc, ySrc, fluxPeak, PM_PEAK_LONE);
@@ -135,5 +135,5 @@
                     source->peak = pmPeakAlloc(xSrc, ySrc, 1.0, PM_PEAK_LONE);
                     pmModel *model = pmModelFromPSFforXY(psf, xSrc, ySrc, 1.0); // Model for normalisation
-                    float flux = model->modelFlux(model->params);               // Flux for peak=1
+                    float flux = model->class->modelFlux(model->params);               // Flux for peak=1
                     psFree(model);
                     source->psfMag = -2.5 * log10(flux);