Changeset 36858 for trunk/psModules/src/objects/pmSourceIO_CFF.c

Timestamp:

Jun 13, 2014, 6:33:22 AM (12 years ago)

Author:

eugene

Message:

modified pmPSF_ModelToAxes to take useReff as an argument rather than type (with an additional lookup stage): this is supplied by the model->class->useReff element; other places which called pmModelUseReff now use model->class->useReff

File:

• trunk/psModules/src/objects/pmSourceIO_CFF.c (modified) (2 diffs)

trunk/psModules/src/objects/pmSourceIO_CFF.c

@@ -37 +37 @@
 #include "pmMoments.h"
 #include "pmModelFuncs.h"
+#include "pmModelClass.h"
 #include "pmModel.h"
 #include "pmModelUtils.h"
-#include "pmModelClass.h"
 #include "pmSourceMasks.h"
 #include "pmSourceExtendedPars.h"
@@ -403 +403 @@
                         yPos[n_rows] = PAR[PM_PAR_YPOS];
 
-                        psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->type);
+                        psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->class->useReff);
                         rMajor[n_rows] = axes.major;
                         rMinor[n_rows] = axes.minor;