Changeset 36100 for trunk/psphot/src

Timestamp:

Sep 9, 2013, 10:43:15 AM (13 years ago)

Author:

eugene

Message:

use EXT_AND_SKY for EXP and SERSIC, SHAPE for DEV, and EXT for all other fits

File:

• trunk/psphot/src/psphotSourceFits.c (modified) (1 diff)

trunk/psphot/src/psphotSourceFits.c

@@ -589 +589 @@
     if (TIMING) { psTimerStart ("psphotFitPCM"); }
 
+    // if we are ever (in a given psphot implementation) going to fit a parameter, we must set the options here to include
+    // that parameter (otherwise pmPCMupdate will fail to allocate the dmodelFlux image)
+    // thus, if the sersic analysis below uses an index fit, need to use this EXT_AND_SKY mode for init
+
+    options.mode = PM_SOURCE_FIT_EXT;
     if (modelType == pmModelClassGetType("PS_MODEL_SERSIC")) {
-        options.mode = PM_SOURCE_FIT_NO_INDEX; // XXX note that there may be a conflict with psphotExtendedSourceFits.c:133
         options.mode = PM_SOURCE_FIT_EXT_AND_SKY;
-        // if we are ever (in a given psphot implementation) going to fit a parameter, we must set the options here to include
-        // that parameter (otherwise pmPCMupdate will fail to allocate the dmodelFlux image)
-        // thus, if the sersic analysis below uses an index fit, need to use this EXT_AND_SKY mode for init
-    } else {
+    }
+    if (modelType == pmModelClassGetType("PS_MODEL_DEV")) {
+        options.mode = PM_SOURCE_FIT_SHAPE;
+    }
+    if (modelType == pmModelClassGetType("PS_MODEL_EXP")) {
         options.mode = PM_SOURCE_FIT_EXT_AND_SKY;
     }