Changeset 26748 for branches/eam_branches/psphot.stack.20100120/src/psphotLoadPSF.c

Timestamp:

Jan 31, 2010, 5:01:05 PM (16 years ago)

Author:

eugene

Message:

updates relative to 20091201, fixes for all psphot variants

Location:

branches/eam_branches/psphot.stack.20100120

Files:

• . (modified) (1 prop)
• src/psphotLoadPSF.c (modified) (4 diffs)

branches/eam_branches/psphot.stack.20100120/src/psphotLoadPSF.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
+// NOTE : pmPSF_IO.c functions must load the psf model onto the chip->analysis metadata because
+// the I/O operation likely occurs before the readout exists.  This implementation assumes that
+// a single psf model is valid for the entire set of readouts (not valid for a time series of readouts)
+
+// XXX for now (2010.01.27), the supporting programs do not define multiple PSPHOT.PSF.LOAD
+// files to go with multiple PSPHOT.INPUT files.  as a result, the implementation below is
+// currently going to work for the case of a single input file, but will fail if we try with a
+// stack of images.
+
 // load an externally supplied psf model
-bool psphotLoadPSFReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe) {
+bool psphotLoadPSFReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index) {
 
     bool status;
@@ -25 +34 @@
     }
 
-    if (!psphotPSFstats (readout, recipe, psf)) {
+    if (!psphotPSFstats (readout, psf)) {
         psAbort("cannot measure PSF shape terms");
     }
@@ -44 +53 @@
     bool status = false;
 
-    // select the appropriate recipe information
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
-    psAssert (recipe, "missing recipe?");
-
-    // XXX PSPHOT.PSF.LOAD vs PSPHOT.INPUT??
+    // XXX PSPHOT.PSF.LOAD vs PSPHOT.INPUT -- see note at top
     int num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
     psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
@@ -56 +61 @@
 
         // Generate the mask and weight images, including the user-defined analysis region of interest
-        if (!psphotLoadPSFReadout (config, view, "PSPHOT.PSF.LOAD", i, recipe)) {
+        if (!psphotLoadPSFReadout (config, view, "PSPHOT.PSF.LOAD", i)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to load PSF model for PSPHOT.PSF.LOAD entry %d", i);
             return false;