Changeset 36884 for branches/eam_branches/ipp-20140610/psphot/src/psphotVisual.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)
• psphot/src/psphotVisual.c (modified) (1 diff)

branches/eam_branches/ipp-20140610/psphot/src/psphotVisual.c

@@ -1444 +1444 @@
             coord->data.F32[1] = r;
             coord->data.F32[0] = 0.0;
-            fmaj->data.F32[i] = log10(source->modelPSF->modelFunc (NULL, params, coord));
+            fmaj->data.F32[i] = log10(source->modelPSF->class->modelFunc (NULL, params, coord));
 
             coord->data.F32[0] = r;
             coord->data.F32[1] = 0.0;
-            fmin->data.F32[i] = log10(source->modelPSF->modelFunc (NULL, params, coord));
+            fmin->data.F32[i] = log10(source->modelPSF->class->modelFunc (NULL, params, coord));
         }
         psFree (coord);
         psFree (params);
 
-        float FWHM_MAJOR = 2.0*source->modelPSF->modelRadius (source->modelPSF->params, 0.5*source->modelPSF->params->data.F32[PM_PAR_I0]);
+        float FWHM_MAJOR = 2.0*source->modelPSF->class->modelRadius (source->modelPSF->params, 0.5*source->modelPSF->params->data.F32[PM_PAR_I0]);
         float FWHM_MINOR = FWHM_MAJOR * (axes.minor / axes.major);
         if (FWHM_MAJOR < FWHM_MINOR) PS_SWAP (FWHM_MAJOR, FWHM_MINOR);