Changeset 13529

Timestamp:

May 25, 2007, 5:09:39 PM (19 years ago)

Author:

eugene

Message:

fixed the psf I/O functions

Location:

trunk/psphot/src

Files:

• psphotLoadPSF.c (modified) (1 diff)
• psphotMakeResiduals.c (modified) (1 diff)
• psphotReadoutCleanup.c (modified) (2 diffs)

trunk/psphot/src/psphotLoadPSF.c

@@ -16 +16 @@
 
     if (!psphotPSFstats (readout, recipe, psf)) psAbort("cannot measure PSF shape terms");
+
+    psLogMsg ("psphot", 3, "using externally supplied PSF model for this readout");
+
+    // we return a psf which can be free (and which may be removed from the metadata)
+    psMemIncrRefCounter (psf);
     return psf;
 }

trunk/psphot/src/psphotMakeResiduals.c

@@ -12 +12 @@
 
     int SPATIAL_ORDER = psMetadataLookupS32(&status, recipe, "PSF.RESIDUALS.SPATIAL_ORDER");
-#if 0                                   // True when PSF.RESIDUALS.SPATIAL_ORDER's in default recipe
-    PS_ASSERT (status, false);
-#else
-    if (!status) {
-        SPATIAL_ORDER = 1;              // i.e. linear
-    }
-#endif
+    PS_ASSERT (status, false);
     if (SPATIAL_ORDER != 0 && SPATIAL_ORDER != 1) {
         psError(PSPHOT_ERR_CONFIG, true, "PSF.RESIDUALS.SPATIAL_ORDER must be 0 or 1 (not %d)",

trunk/psphot/src/psphotReadoutCleanup.c

@@ -40 +40 @@
     }
     if (psf) {
-        psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF",     PS_DATA_UNKNOWN,  "psphot psf", psf);
+        // save the psf for possible output.  if there was already an entry, it was loaded from external sources
+        // the new one may have been updated or modified, so replace the existing entry
+        psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_DATA_UNKNOWN | PS_META_REPLACE,  "psphot psf", psf);
     }
 
@@ -48 +50 @@
     pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND");
 
-    if (psErrorCodeLast() != PS_ERR_NONE) abort();
+    if (psErrorCodeLast() != PS_ERR_NONE) {
+        psErrorStackPrint(stderr, "unexpected remaining errors");
+        abort();
+    }
 
     // XXX move this to top of loop