Changeset 18002 for trunk/psphot/src

Timestamp:

Jun 8, 2008, 2:45:29 PM (18 years ago)

Author:

eugene

Message:

psf must be put on chip; select explicitly

File:

• trunk/psphot/src/psphotLoadPSF.c (modified) (1 diff)

trunk/psphot/src/psphotLoadPSF.c

@@ -4 +4 @@
 pmPSF *psphotLoadPSF (pmConfig *config, const pmFPAview *view, psMetadata *recipe) {
 
+    // find the currently selected chip
+    pmChip *chip = pmFPAfileThisChip (config->files, view, "PSPHOT.PSF.LOAD");
+    if (!chip) return NULL;
+
     // find the currently selected readout
-    pmReadout  *readout = pmFPAfileThisReadout (config->files, view, "PSPHOT.PSF.LOAD");
+    pmReadout *readout = pmFPAfileThisReadout (config->files, view, "PSPHOT.PSF.LOAD");
     if (!readout) return NULL;
 
     // check if a PSF model is supplied by the user
-    pmPSF *psf = psMetadataLookupPtr (NULL, readout->parent->parent->analysis, "PSPHOT.PSF");
+    pmPSF *psf = psMetadataLookupPtr (NULL, chip->analysis, "PSPHOT.PSF");
     if (psf == NULL) {
-        psLogMsg ("psphot", 3, "no psf supplied for this readout");
+        psLogMsg ("psphot", 3, "no psf supplied for this chip");
         return NULL;
     }