Changeset 11189

Timestamp:

Jan 19, 2007, 12:18:21 PM (19 years ago)

Author:

eugene

Message:

moved psphotPSFstats into psphotChoosePSF

File:

• trunk/psphot/src/psphotChoosePSF.c (modified) (3 diffs)

trunk/psphot/src/psphotChoosePSF.c

@@ -14 +14 @@
     // check if a PSF model is supplied by the user
     psf = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.PSF");
-    if (psf != NULL) return psf;
+    if (psf != NULL) {
+        if (!psphotPSFstats (readout, recipe, psf)) psAbort ("psphotChoosePSF", "cannot measure PSF shape terms");
+        return psf;
+    }
 
     // examine PSF sources in S/N order (brightest first)
@@ -244 +247 @@
     psFree (models);
 
-    psMetadataAdd (recipe, PS_LIST_TAIL, "NPSFSTAR", PS_DATA_S32 | PS_META_REPLACE, "number of stars used to make PSF", psf->nPSFstars);
+    if (!psphotPSFstats (readout, recipe, psf)) psAbort ("psphotChoosePSF", "cannot measure PSF shape terms");
 
     modelName = pmModelGetType (psf->type);
@@ -295 +298 @@
     psMetadataAdd (recipe, PS_LIST_TAIL, "FWHM_Y", PS_DATA_F32 | PS_META_REPLACE, "PSF FWHM Minor axis", FWHM_Y);
     psMetadataAdd (recipe, PS_LIST_TAIL, "ANGLE",  PS_DATA_F32 | PS_META_REPLACE, "PSF angle",           axes.theta);
+    psMetadataAdd (recipe, PS_LIST_TAIL, "NPSFSTAR", PS_DATA_S32 | PS_META_REPLACE, "number of stars used to make PSF", psf->nPSFstars);
 
     psFree (modelEXT);