Changeset 28978

Timestamp:

Aug 19, 2010, 6:21:37 PM (16 years ago)

Author:

eugene

Message:

careful with pmPCMupdate -- need to apply when fit options change

File:

• branches/eam_branches/ipp-20100621/psphot/src/psphotSourceFits.c (modified) (4 diffs)

branches/eam_branches/ipp-20100621/psphot/src/psphotSourceFits.c

@@ -550 +550 @@
         psphotSetRadiusFootprint(&model->fitRadius, readout, source, markVal, 0.5);
 
-        // update the pcm elements if we have changed the circumstance (eg, source->pixels)
-        pmPCMupdate(pcm, source, fitOptions, model);
-
         if (!psphotFitSersicIndexPCM (pcm, readout, source, fitOptions, maskVal, markVal, psfSize)) {
             model->flags |= PM_MODEL_STATUS_BADARGS;
@@ -562 +559 @@
         psphotSetRadiusFootprint(&model->fitRadius, readout, source, markVal, 1.0);
     }
-    // update the pcm elements if we have changed the circumstance (eg, source->pixels)
-    pmPCMupdate(pcm, source, fitOptions, model);
 
     if (modelType == pmModelClassGetType("PS_MODEL_SERSIC")) {
@@ -570 +565 @@
         options.mode = PM_SOURCE_FIT_EXT;
     }
+    // update the pcm elements if we have changed the circumstance (options.mode or source->pixels)
+    pmPCMupdate(pcm, source, &options, model);
 
     // psTraceSetLevel("psLib.math.psMinimizeLMChi2", 5);
@@ -657 +654 @@
     options.nIter = 4;
 
+    // update the pcm elements if we have changed the circumstance (here, options.mode)
+    pmPCMupdate(pcm, source, &options, model);
+
     int iMin = -1;
     float xMin = NAN;