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

Timestamp:

Mar 13, 2006, 6:40:37 PM (20 years ago)

Author:

Paul Price

Message:

Compiled, but concept ingest not yet working, so can't read FPA

File:

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

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

@@ -175 +175 @@
 }
 
+
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Public functions
@@ -201 +202 @@
                 bool mdok = true;       // Status of MD lookup
                 psString source = psMetadataLookupStr(&mdok, cell->config, nameSource); // The source
-                if (mdok && strlen(source)) {
-                    if (strcasecmp(source, "HEADER") == 0 && conceptItem->type == PS_DATA_STRING) {
-                        value = psMetadataLookup(hdu->header, conceptItem->data.V);
-                    } else if (strcasecmp(source, "VALUE") == 0) {
-                        value = psMemIncrRefCounter(conceptItem);
-                    } else {
-                        psError(PS_ERR_IO, true, "%s isn't HEADER or VALUE --- can't read %s\n", source,
-                                name);
-                        continue;
-                    }
-                } else {
-                    // Assume it's specified by value
+                if (mdok && strlen(source) > 0 && strcasecmp(source, "VALUE") == 0) {
                     value = psMemIncrRefCounter(conceptItem);
+                    conceptParse(spec, value, cameraFormat, target, NULL, NULL, cell);
+                } else if (source && (strlen(source) == 0 || strcasecmp(source, "HEADER") != 0)) {
+                    // We leave "HEADER" to pmConceptsReadFromHeader
+                    psError(PS_ERR_IO, true, "%s isn't HEADER or VALUE --- can't read %s\n", source, name);
+                    continue;
                 }
-                conceptParse(spec, value, cameraFormat, target, NULL, NULL, cell);
             }
         }
@@ -253 +247 @@
 }
 
+
 bool pmConceptsReadFromHeader(psMetadata *specs, // The concept specifications
                               pmFPA *fpa, // The FPA
@@ -265 +260 @@
     psMetadata *transSpec = psMetadataLookupMD(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
     if (mdok && transSpec) {
-        pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
-        psMetadata *cameraFormat = hdu->format; // The camera format
         psMetadataIterator *specsIter = psMetadataIteratorAlloc(specs, PS_LIST_HEAD, NULL); // Iterator
         psMetadataItem *specItem = NULL;    // Item from the specs metadata
@@ -272 +265 @@
             pmConceptSpec *spec = specItem->data.V; // The specification
             psString name = specItem->name; // The concept name
-            psString keywords = psMetadataLookupStr(&mdok, transSpec, name); // The FITS keywords
-            if (mdok && strlen(keywords) > 0) {
-                // In case there are multiple headers
-                psList *keys = psStringSplit(keywords, " ,;"); // List of keywords
-                psMetadataItem *headerItem = NULL; // The item, to be returned
-                if (keys->n == 1) {
-                    // Only one key --- proceed as usual
-                    headerItem = psMetadataLookup(hdu->header, keywords);
-                } else {
-                    psListIterator *keysIter = psListIteratorAlloc(keys, PS_LIST_HEAD, false); // Iterator
-                    psString key = NULL; // Item from iteration
-                    psList *values = psListAlloc(NULL); // List containing the values
-                    while ((key = psListGetAndIncrement(keysIter))) {
-                        psMetadataItem *value = psMetadataLookup(hdu->header, key);
-                        psListAdd(values, PS_LIST_TAIL, value);
+            psMetadataItem *headerItem = NULL; // The value of the concept from the header
+            // First check the cell configuration
+            if (cell && cell->config) {
+                psMetadataItem *conceptItem = psMetadataLookup(cell->config, name); // The concept, or NULL
+                if (conceptItem) {
+                    // Check the SOURCE
+                    psString nameSource = NULL; // String with the concept name and ".SOURCE" added
+                    psStringAppend(&nameSource, "%s.SOURCE", name);
+                    psString source = psMetadataLookupStr(&mdok, cell->config, nameSource); // The source
+                    if (mdok && strlen(source) && strcasecmp(source, "HEADER") == 0) {
+                        headerItem = psMetadataLookup(hdu->header, conceptItem->data.V);
                     }
-                    psFree(keysIter);
-                    headerItem = psMetadataItemAlloc(name, PS_DATA_LIST, specItem->comment, values);
-                    psFree(values);
+                    // Leave the error handling to pmConceptsFromCamera, which should already have been called
                 }
-                psFree(keys);
-
-                // This will also clean up the name
-                conceptParse(spec, headerItem, cameraFormat, target, fpa, chip, cell);
-            }
+            }
+            if (! headerItem) {
+                psString keywords = psMetadataLookupStr(&mdok, transSpec, name); // The FITS keywords
+                if (mdok && strlen(keywords) > 0) {
+                    // In case there are multiple headers
+                    psList *keys = psStringSplit(keywords, " ,;"); // List of keywords
+                    if (keys->n == 1) {
+                        // Only one key --- proceed as usual
+                        headerItem = psMetadataLookup(hdu->header, keywords);
+                    } else {
+                        psListIterator *keysIter = psListIteratorAlloc(keys, PS_LIST_HEAD, false); // Iterator
+                        psString key = NULL; // Item from iteration
+                        psList *values = psListAlloc(NULL); // List containing the values
+                        while ((key = psListGetAndIncrement(keysIter))) {
+                            psMetadataItem *value = psMetadataLookup(hdu->header, key);
+                            psListAdd(values, PS_LIST_TAIL, value);
+                        }
+                        psFree(keysIter);
+                        headerItem = psMetadataItemAlloc(name, PS_DATA_LIST, specItem->comment, values);
+                        psFree(values);
+                    }
+                    psFree(keys);
+                }
+            }
+
+            // This will also clean up the name
+            conceptParse(spec, headerItem, cameraFormat, target, fpa, chip, cell);
         }
         psFree(specsIter);
@@ -303 +312 @@
     return false;
 }
+
 
 // XXX --- the below code has NOT been tested!