Changeset 35646 for branches/eam_branches/ipp-20130509/psModules/src/objects/pmSource.c

Timestamp:

Jun 11, 2013, 9:23:27 AM (13 years ago)

Author:

eugene

Message:

new functions pmModelUseReff, pmModelAxesToParams, pmModelParamsToAxes; add useReff to pmModelSetShape; remove deprecated code (pmPSF_SXYtoModel, pmPSF_SXYtoModel); replace code which converts the PAR[SXX,SXY,SYY] values to shape and then axes with calls to pmModelParamsToAxes and pmModelAxesToParams

File:

• branches/eam_branches/ipp-20130509/psModules/src/objects/pmSource.c (modified) (2 diffs)

branches/eam_branches/ipp-20130509/psModules/src/objects/pmSource.c

@@ -1145 +1145 @@
     bool status;
     psEllipseShape oldshape;
-    psEllipseShape newshape;
     psEllipseAxes axes;
 
@@ -1166 +1165 @@
     if (!isfinite(oldI0)) return false;
 
+    bool useReff = pmModelUseReff (model->type);
+    pmModelParamsToAxes (&axes, PAR[PM_PAR_SXX], PAR[PM_PAR_SXY], PAR[PM_PAR_SYY], useReff);
+
     // increase size and height of source
-    axes = psEllipseShapeToAxes (oldshape, 20.0);
     axes.major *= SIZE;
     axes.minor *= SIZE;
-    newshape = psEllipseAxesToShape (axes);
+
+    pmModelAxesToParams (&PAR[PM_PAR_SXX], &PAR[PM_PAR_SXY], &PAR[PM_PAR_SYY], axes, useReff);
     PAR[PM_PAR_I0]  = FACTOR*oldI0;
-    PAR[PM_PAR_SXX] = newshape.sx;
-    PAR[PM_PAR_SYY] = newshape.sy;
-    PAR[PM_PAR_SXY] = newshape.sxy;
 
     psImage *target = source->variance;