Changeset 35640 for branches/eam_branches/ipp-20130509/psphot/src/psphotChoosePSF.c

Timestamp:

Jun 9, 2013, 3:31:46 PM (13 years ago)

Author:

eugene

Message:

thread add/sub noise, thread model background, pass chisq conv options to LMM fitting

File:

• branches/eam_branches/ipp-20130509/psphot/src/psphotChoosePSF.c (modified) (2 diffs)

branches/eam_branches/ipp-20130509/psphot/src/psphotChoosePSF.c

@@ -158 +158 @@
     }
     float maxChisqDOF = psMetadataLookupF32 (&status, recipe, "PSF_FIT_MAX_CHISQ"); // Fit tolerance
+
+    bool chisqConvergence = psMetadataLookupBool (&status, recipe, "LMM_FIT_CHISQ_CONVERGENCE"); // Fit tolerance
+    if (!status) {
+        // default to the old method (chisqConvergence)
+        chisqConvergence = true;
+    }
+
+    int gainFactorMode = psMetadataLookupS32 (&status, recipe, "LMM_FIT_GAIN_FACTOR_MODE"); // Fit tolerance
+    if (!status) {
+        // default to the old method (chisqConvergence)
+        gainFactorMode = 0;
+    }
 
     // options which modify the behavior of the model fitting
@@ -169 +181 @@
     options->fitOptions->mode          = PM_SOURCE_FIT_PSF;
     options->fitOptions->covarFactor   = psImageCovarianceFactorForAperture(readout->covariance, 10.0); // Covariance matrix
-
     
+    options->fitOptions->gainFactorMode   = gainFactorMode;
+    options->fitOptions->chisqConvergence = chisqConvergence;
+
     psArray *stars = psArrayAllocEmpty (sources->n);