Changeset 28643 for branches/eam_branches/ipp-20100621/psModules/src/imcombine/pmPSFEnvelope.c

Timestamp:

Jul 9, 2010, 10:56:32 AM (16 years ago)

Author:

eugene

Message:

changed pmSourceFitModel and related APIs to pass a structure of fit options; this lets us change the options between soruces within the multithreaded context; also re-organized the include orders to avoid conflicts

File:

• branches/eam_branches/ipp-20100621/psModules/src/imcombine/pmPSFEnvelope.c (modified) (2 diffs)

branches/eam_branches/ipp-20100621/psModules/src/imcombine/pmPSFEnvelope.c

@@ -10 +10 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
-#include "pmReadoutFake.h"
-
-#include "pmMoments.h"
+
+#include "pmTrend2D.h"
 #include "pmResiduals.h"
 #include "pmGrowthCurve.h"
-#include "pmTrend2D.h"
-#include "pmPSF.h"
-#include "pmModel.h"
-#include "pmModelClass.h"
-#include "pmModelUtils.h"
 #include "pmSpan.h"
+#include "pmFootprintSpans.h"
 #include "pmFootprint.h"
 #include "pmPeaks.h"
+#include "pmMoments.h"
+#include "pmModelFuncs.h"
+#include "pmModel.h"
+#include "pmModelUtils.h"
+#include "pmModelClass.h"
+#include "pmSourceMasks.h"
+#include "pmSourceExtendedPars.h"
+#include "pmSourceDiffStats.h"
 #include "pmSource.h"
-#include "pmSourceUtils.h"
 #include "pmSourceFitModel.h"
+#include "pmPSF.h"
 #include "pmPSFtry.h"
 
-
+#include "pmReadoutFake.h"
 #include "pmPSFEnvelope.h"
 #include "pmStackVisual.h"
@@ -410 +413 @@
     options->chiFluxTrend = false;      // All sources have similar flux, so fitting a trend often fails
 
-    pmSourceFitModelInit(SOURCE_FIT_ITERATIONS, 0.01, VARIANCE_VAL, true);
+    // options which modify the behavior of the model fitting
+    options->fitOptions                = pmSourceFitOptionsAlloc();
+    options->fitOptions->nIter         = SOURCE_FIT_ITERATIONS;
+    options->fitOptions->tol           = 0.01;
+    options->fitOptions->poissonErrors = true;
+    options->fitOptions->weight        = VARIANCE_VAL;
+    options->fitOptions->mode          = PM_SOURCE_FIT_PSF;
+
     pmModelClassSetLimits(PM_MODEL_LIMITS_STRICT); // Important for getting a good stack target PSF