Changeset 36884 for branches/eam_branches/ipp-20140610/ppViz/src/ppVizPSF/ppVizPSFLoop.c

Timestamp:

Jun 17, 2014, 5:58:38 AM (12 years ago)

Author:

eugene

Message:

merge in changes from trunk (up through pv3 tag)

Location:

branches/eam_branches/ipp-20140610

Files:

• . (modified) (1 prop)
• ppViz/src/ppVizPSF/ppVizPSFLoop.c (modified) (2 diffs)

branches/eam_branches/ipp-20140610/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);