Changeset 26691 for branches/eam_branches/psphot.stack.20100120/src/psphotLoadPSF.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/psphotLoadPSF.c (modified) (3 diffs)

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

@@ -2 +2 @@
 
 // load an externally supplied psf model
-pmPSF *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, psMetadata *recipe) {
+
+    bool status;
 
     // find the currently selected readout
     pmFPAfile *file = pmFPAfileSelectSingle(config->files, filename, index); // File of interest
-    psAssert (readout, "missing file?");
+    psAssert (file, "missing file?");
 
     // find the currently selected chip
@@ -13 +15 @@
 
     // find the currently selected readout
-    pmReadout *readout = pmFPAfileThisReadout (view, file->fpa);
+    pmReadout *readout = pmFPAviewThisReadout (view, file->fpa);
     if (!readout) return false;
 
     // check if a PSF model is supplied by the user
-    pmPSF *psf = psMetadataLookupPtr (NULL, chip->analysis, "PSPHOT.PSF");
+    pmPSF *psf = psMetadataLookupPtr (&status, chip->analysis, "PSPHOT.PSF");
     if (psf == NULL) {
         psLogMsg ("psphot", 3, "no psf supplied for this chip");
@@ -30 +32 @@
 
     // 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;