Changeset 36884 for branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_CFF.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)
• psModules/src/objects/pmSourceIO_CFF.c (modified) (6 diffs)

branches/eam_branches/ipp-20140610/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"
@@ -208 +208 @@
             axes.minor        = 1.0;
             axes.theta        = 0.0;
-            pmPSF_AxesToModel (PAR, axes, modelType);
+            pmPSF_AxesToModel (PAR, axes, model->class->useReff);
 
             // peak->detValue, rawFlux, smoothFlux are all set to the flux argument which is counts per second
@@ -273 +273 @@
             galaxyAxes.theta = theta * PS_RAD_DEG;
 
-            pmPSF_AxesToModel (xPAR, galaxyAxes, galaxyModelType);
+            pmPSF_AxesToModel (xPAR, galaxyAxes, model->class->useReff);
             if (model->params->n > 7) {
                 xPAR[PM_PAR_7] = 0.5 / Sindex;
@@ -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;
@@ -461 +461 @@
                         yPos[0] = PAR[PM_PAR_YPOS];
 
-                        psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->type);
+                        psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->class->useReff);
                         rMajor[0] = axes.major;
                         rMinor[0] = axes.minor;
@@ -490 +490 @@
                                 yPos[1] = PAR[PM_PAR_YPOS];
 
-                                psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->type);
+                                psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->class->useReff);
                                 rMajor[1] = axes.major;
                                 rMinor[1] = axes.minor;