Changeset 36858 for trunk/psModules/src/objects/pmSourceIO_PS1_CAL_0.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_PS1_CAL_0.c (modified) (3 diffs)

trunk/psModules/src/objects/pmSourceIO_PS1_CAL_0.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"
@@ -115 +115 @@
             yErr = dPAR[PM_PAR_YPOS];
             if (isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXX])) {
-                axes = pmPSF_ModelToAxes (PAR, model->type);
+                axes = pmPSF_ModelToAxes (PAR, model->class->useReff);
             } else {
                 axes.major = NAN;
@@ -624 +624 @@
             yErr = dPAR[PM_PAR_YPOS];
 
-            axes = pmPSF_ModelToAxes (PAR, model->type);
+            axes = pmPSF_ModelToAxes (PAR, model->class->useReff);
 
             // generate RA,DEC