Changeset 7757 for trunk/ppImage/src/ppFocusGetFWHM.c

Timestamp:

Jun 29, 2006, 10:47:55 AM (20 years ago)

Author:

eugene

Message:

fixed up focus

File:

• trunk/ppImage/src/ppFocusGetFWHM.c (modified) (2 diffs)

trunk/ppImage/src/ppFocusGetFWHM.c

@@ -37 +37 @@
 
                 // get average FWHM
-                // XXX one option is to use the PSF model to determine the FWHM somewhere
-                # if 0
-                psf = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.PSF");
-                if (psf == NULL) continue;
-                # endif
-
-                // in this example, we use the supplied PSPHOT.HEADER data in which FWHM_X,Y are supplied
+                // psphotReadout writes the FWHM values into the PSPHOT.HEADER table
+                // the source of this value depends on the psphot options.
+                // - if breakPoint is set to PEAKS, the value will not be defined
+                // - if breakPoint is set to MOMENTS, the PSFSTAR moments are used
+                // - in all other cases, the psf model is used
                 header = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.HEADER");
                 if (header == NULL) {
@@ -63 +61 @@
     FWHM = FWHMsum / FWHMnum;
 
-    // FOCUS = pmConcepts (&status, input->fpa, "FOCUS");
-    FOCUS = 0;
+    FOCUS = psMetadataLookupF32 (&status, input->fpa->concepts, "FPA.FOCUS");
 
     fwhm->data.F32[fwhm->n] = FWHM;