Changeset 6552 for branches/rel10_ifa/psModules/src/astrom/pmConceptsRead.c

Timestamp:

Mar 8, 2006, 5:08:08 PM (20 years ago)

Author:

Paul Price

Message:

Broad changes to introduce pmHDU, and allow read/write at any level. Modified the camera configuration to use camera config (components of the camera) and format descriptions (FITS file layout).

File:

• branches/rel10_ifa/psModules/src/astrom/pmConceptsRead.c (modified) (2 diffs)

branches/rel10_ifa/psModules/src/astrom/pmConceptsRead.c

@@ -13 +13 @@
 {
     if (cell) {
-        psMetadata *camera = cell->camera;      // Camera data
+        psMetadata *camera = cell->config; // Camera configuration
         psMetadataItem *item = psMetadataLookup(camera, concept);
         return item;
@@ -55 +55 @@
         if (fpa->hdu) {
             psMetadataItem *fpaItem = psMetadataLookup(fpa->hdu->header, keyword);
-            if (fpaItem) {
-                // XXX: Need to clean up before returning
-                return fpaItem;
-            }
-        }
-
-        if (fpa->phu) {
-            psMetadataItem *fpaItem = psMetadataLookup(fpa->phu, keyword);
             if (fpaItem) {
                 // XXX: Need to clean up before returning