Changeset 25476 for branches/eam_branches/20090715/psModules/src/objects/pmPSFtryFitPSF.c

Timestamp:

Sep 21, 2009, 8:37:01 PM (17 years ago)

Author:

eugene

Message:

re-organize pmPSFtry (split into clearer files); modify 2D psf variation analysis to use psf-aper mags as the metric

File:

• branches/eam_branches/20090715/psModules/src/objects/pmPSFtryFitPSF.c (modified) (2 diffs)

branches/eam_branches/20090715/psModules/src/objects/pmPSFtryFitPSF.c

@@ -39 +39 @@
 // stage 3: Refit with fixed shape parameters.  This function uses the LMM fitting, but could
 // be re-written to use the simultaneous linear fitting (see psphotFitSourcesLinear.c)
-bool pmPSFtryFitPSF (pmPSFtry *psfTry) {
+bool pmPSFtryFitPSF (pmPSFtry *psfTry, pmPSFOptions *options, psImageMaskType maskVal, psImageMaskType markVal) {
+
+    bool status;
 
     psTimerStart ("psf.fit");
+
+    // maskVal is used to test for rejected pixels, and must include markVal
+    maskVal |= markVal;
+
+    int Npsf = 0;
     for (int i = 0; i < psfTry->sources->n; i++) {
 
@@ -98 +105 @@
     psfTry->psf->nPSFstars = Npsf;
 
-    psLogMsg ("psphot.psftry", PS_LOG_MINUTIA, "fit psf:   %f sec for %d of %ld sources\n", psTimerMark ("psf.fit"), Npsf, sources->n);
-    psTrace ("psModules.object", 3, "keeping %d of %ld PSF candidates (PSF)\n", Npsf, sources->n);
+    psLogMsg ("psphot.psftry", PS_LOG_MINUTIA, "fit psf:   %f sec for %d of %ld sources\n", psTimerMark ("psf.fit"), Npsf, psfTry->sources->n);
+    psTrace ("psModules.object", 3, "keeping %d of %ld PSF candidates (PSF)\n", Npsf, psfTry->sources->n);
 
     if (Npsf == 0) {
         psError(PS_ERR_UNKNOWN, false, "No sources with good PSF fits after model is built.");
-        psFree(psfTry);
-        return NULL;
+        return false;
     }
 
+    return true;
+}