Changeset 36862

Timestamp:

Jun 13, 2014, 8:49:28 AM (12 years ago)

Author:

eugene

Message:

call model->class->function instead of model->function

Location:

trunk

Files:

• ppSim/src/ppSimInsertGalaxies.c (modified) (2 diffs)
• ppSim/src/ppSimInsertStars.c (modified) (1 diff)
• ppViz/src/ppVizPSF/ppVizPSFLoop.c (modified) (2 diffs)

trunk/ppSim/src/ppSimInsertGalaxies.c

@@ -154 +154 @@
 
         // 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 +163 @@
         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?)

trunk/ppSim/src/ppSimInsertStars.c

@@ -116 +116 @@
         // (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);

trunk/ppViz/src/ppVizPSF/ppVizPSFLoop.c

@@ -117 +117 @@
 
                         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 +135 @@
                     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);