Changeset 14758

Timestamp:

Sep 5, 2007, 12:09:09 PM (19 years ago)

Author:

eugene

Message:

do we have a PSF when making the rough class?

File:

• trunk/psphot/src/psphotReadout.c (modified) (2 diffs)

trunk/psphot/src/psphotReadout.c

@@ -79 +79 @@
     psphotModelTest (config, view, recipe, maskVal, maskMark);
 
-    // load the psf model, if suppled
-    // XXX include code in here to save FWHM_X,FWHM_Y in the recipe
+    // load the psf model, if suppled.  FWHM_X,FWHM_Y,etc are saved in the recipe
     pmPSF *psf = psphotLoadPSF (config, view, recipe);
+
+    // several functions below behave differently if we have a PSF model already
+    bool havePSF = (psf != NULL);
     
     // find the peaks in the image.  
@@ -126 +128 @@
     }
 
-    // use source classes to select PSF candidate stars (from PSF clump)?
-    bool findPSFClump = (psf == NULL);
-
     // classify sources based on moments, brightness
-    if (!psphotRoughClass (sources, recipe, findPSFClump, maskSat)) {
+    if (!psphotRoughClass (sources, recipe, havePSF, maskSat)) {
         psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
         return psphotReadoutCleanup (config, readout, recipe, NULL, sources);