Changeset 36161 for branches/eam_branches/ipp-20130904/psphot/src/psphotGalaxyShape.c

Timestamp:

Sep 30, 2013, 5:41:48 AM (13 years ago)

Author:

eugene

Message:

getting psphotFullForce to run (not quite there)

File:

• branches/eam_branches/ipp-20130904/psphot/src/psphotGalaxyShape.c (modified) (2 diffs)

branches/eam_branches/ipp-20130904/psphot/src/psphotGalaxyShape.c

@@ -11 +11 @@
     psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
     psAssert (recipe, "missing recipe?");
+
+    // perform full non-linear fits / extended source analysis?
+    // XXX for this to be true for psphotFullForce??
+    if (!psMetadataLookupBool (&status, recipe, "GALAXY_SHAPES")) {
+        psLogMsg ("psphot", PS_LOG_INFO, "skipping galaxy shape measurements\n");
+        return true;
+    }
 
     int num = psphotFileruleCount(config, filerule);
@@ -78 +85 @@
     assert (status);
 
-    // source fitting parameters for extended source fits
-    int fitIter = psMetadataLookupS32(&status, recipe, "EXT_FIT_ITER"); // Max number of fit iterations
-    assert (status && fitIter > 0);
-
-    float fitMinTol = psMetadataLookupF32 (&status, recipe, "EXT_FIT_MIN_TOL"); // Fit tolerance
-    if (!status || !isfinite(fitMinTol) || fitMinTol <= 0) {
-        fitMinTol = psMetadataLookupF32 (&status, recipe, "PSF_FIT_TOL"); // Fit tolerance
-        if (!status || !isfinite(fitMinTol) || fitMinTol <= 0) {
-            psAbort("PSF_FIT_MIN_TOL (and PSF_FIT_TOL) not defined or positive");
-        }
-    }
-
-    float fitMaxTol = psMetadataLookupF32 (&status, recipe, "EXT_FIT_MAX_TOL"); // Fit tolerance
-    if (!status || !isfinite(fitMaxTol) || fitMaxTol <= 0) {
-        fitMaxTol = 1.0;
-    }
-
-    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;
-    }
-
-    // perform full extended source non-linear fits?
-    bool isInteractive = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_FITS_INTERACTIVE");
-    if (!status) isInteractive = false;
-
     // Define source fitting parameters for extended source fits
+    // we are not doing LMM fitting, so most options are irrelevant
     pmSourceFitOptions *fitOptions = pmSourceFitOptionsAlloc();
     fitOptions->mode           = PM_SOURCE_FIT_EXT_AND_SKY;
-    fitOptions->saveCovariance = true;  // XXX make this a user option?
     fitOptions->covarFactor    = psImageCovarianceFactorForAperture(readout->covariance, 10.0); // Covariance matrix
-    fitOptions->nIter          = fitIter;
-    fitOptions->minTol         = fitMinTol;
-    fitOptions->maxTol         = fitMaxTol;
-
-    fitOptions->gainFactorMode   = gainFactorMode;
-    fitOptions->chisqConvergence = chisqConvergence;
-    fitOptions->isInteractive    = isInteractive;
 
     // source analysis is done in S/N order (brightest first)