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

branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryMakePSF.c

@@ -28 +28 @@
 #include "pmMoments.h"
 #include "pmModelFuncs.h"
+#include "pmModelClass.h"
 #include "pmModel.h"
 #include "pmModelUtils.h"
-#include "pmModelClass.h"
 #include "pmSourceMasks.h"
 #include "pmSourceExtendedPars.h"
@@ -212 +212 @@
         assert (source->modelEXT); // all unmasked sources should have modelEXT
 
-        bool useReff = pmModelUseReff (source->modelEXT->type);
+        bool useReff = source->modelEXT->class->useReff;
         psEllipsePol pol = pmPSF_ModelToFit (source->modelEXT->params->data.F32, useReff);