Changeset 26691 for branches/eam_branches/psphot.stack.20100120/src/psphotChoosePSF.c

Timestamp:

Jan 27, 2010, 9:17:17 AM (16 years ago)

Author:

eugene

Message:

build works

File:

• branches/eam_branches/psphot.stack.20100120/src/psphotChoosePSF.c (modified) (4 diffs)

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

@@ -10 +10 @@
     psAssert (recipe, "missing recipe?");
 
-    int num = psMetadataAddS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
+    int num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
     psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
 
@@ -28 +28 @@
     bool status;
 
-    // do not generate a PSF if we already were supplied one
-    if (psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.PSF")) {
-        psLogMsg ("psphot", PS_LOG_DETAIL, "psf model supplied for input file %d", i);
-        return true;
-    }
-
     psTimerStart ("psphot.choose.psf");
 
@@ -42 +36 @@
     pmReadout *readout = pmFPAviewThisReadout(view, file->fpa);
     psAssert (readout, "missing readout?");
+
+    // do not generate a PSF if we already were supplied one
+    if (psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.PSF")) {
+        psLogMsg ("psphot", PS_LOG_DETAIL, "psf model supplied for input file %d", index);
+        return true;
+    }
 
     pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
@@ -350 +350 @@
 
     // save PSF on readout->analysis
-    if (!psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_DATA_PTR, "psphot psf model", psf)) {
+    if (!psMetadataAddPtr (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_META_REPLACE | PS_DATA_UNKNOWN, "psphot psf model", psf)) {
         psError (PSPHOT_ERR_UNKNOWN, false, "problem saving sources on readout");
         return false;