Changeset 22699

Timestamp:

Feb 26, 2009, 2:45:31 PM (17 years ago)

Author:

Paul Price

Message:

Reorganised the concepts files, moving the Write functions into pmConceptsWrite, and the Read functions into pmConceptsRead, which sort of makes sense. Added new type of concept property: copy. Most concepts use the default copy method (which is to simply copy the item), but for the TIMESYS concepts, we want to ensure that the target is of the correct type --- if it's already set (e.g., via the DEFAULTS), then we don't copy it. This will allow us to set the target TIMESYS using the DEFAULTS in the camera format, and have the output time be adjusted appropriately. Without this, the TIMESYS is simply copied, and specifying the TIMESYS in the DEFAULTS results in a warning ('values don't match'). Removed pmFPACopyConcepts, since it is pretty much the same as pmConceptsCopyFPA.

Location:

trunk

Files:

• ppSub/src/ppSubReadoutSubtract.c (modified) (1 diff)
• psModules/src/camera/pmFPAConstruct.c (modified) (1 diff)
• psModules/src/camera/pmFPACopy.c (modified) (1 diff)
• psModules/src/camera/pmFPAHeader.c (modified) (1 diff)
• psModules/src/camera/pmFPARead.c (modified) (1 diff)
• psModules/src/camera/pmFPAWrite.c (modified) (1 diff)
• psModules/src/camera/pmFPAfile.c (modified) (2 diffs)
• psModules/src/camera/pmFPAfileDefine.c (modified) (3 diffs)
• psModules/src/camera/pmFPAfileFitsIO.c (modified) (1 diff)
• psModules/src/concepts/Makefile.am (modified) (2 diffs)
• psModules/src/concepts/pmConcepts.c (modified) (19 diffs)
• psModules/src/concepts/pmConcepts.h (modified) (6 diffs)
• psModules/src/concepts/pmConceptsCopy.c (added)
• psModules/src/concepts/pmConceptsCopy.h (added)
• psModules/src/concepts/pmConceptsRead.c (modified) (2 diffs)
• psModules/src/concepts/pmConceptsRead.h (modified) (2 diffs)
• psModules/src/concepts/pmConceptsStandard.c (modified) (1 diff)
• psModules/src/concepts/pmConceptsStandard.h (modified) (1 diff)
• psModules/src/concepts/pmConceptsWrite.c (modified) (3 diffs)
• psModules/src/concepts/pmConceptsWrite.h (modified) (2 diffs)
• psModules/src/config/pmConfigCamera.c (modified) (3 diffs)
• psModules/src/imcombine/pmSubtractionIO.c (modified) (1 diff)
• psModules/src/objects/pmSourceIO.c (modified) (2 diffs)
• psModules/src/psmodules.h (modified) (1 diff)

trunk/ppSub/src/ppSubReadoutSubtract.c

@@ -88 +88 @@
     pmFPAfile *outFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.OUTPUT"); // Output file
     pmFPA *outFPA = outFile->fpa;       // Output FPA
-    if (!pmFPACopyConcepts(outFPA, inFPA)) {
+    if (!pmConceptsCopyFPA(outFPA, inFPA, true, true)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to copy concepts from input to output.");
         psFree(outRO);

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -14 +14 @@
 #include "pmFPAview.h"
 #include "pmFPAFlags.h"
-#include "pmConcepts.h"
+#include "pmConceptsRead.h"
 #include "pmFPAConstruct.h"
 #include "pmFPAUtils.h"

trunk/psModules/src/camera/pmFPACopy.c

@@ -13 +13 @@
 #include "pmFPAUtils.h"
 #include "pmHDUUtils.h"
-#include "pmConcepts.h"
+#include "pmConceptsCopy.h"
 #include "pmFPACopy.h"
 

trunk/psModules/src/camera/pmFPAHeader.c

@@ -10 +10 @@
 #include "pmFPA.h"
 #include "pmFPALevel.h"
-#include "pmConcepts.h"
+#include "pmConceptsRead.h"
 #include "pmFPAHeader.h"
 

trunk/psModules/src/camera/pmFPARead.c

@@ -17 +17 @@
 #include "pmFPAFlags.h"
 #include "pmHDUUtils.h"
-#include "pmConcepts.h"
+#include "pmConceptsRead.h"
 #include "pmFPAHeader.h"
 

trunk/psModules/src/camera/pmFPAWrite.c

@@ -18 +18 @@
 #include "pmHDUUtils.h"
 #include "pmHDUGenerate.h"
-#include "pmConcepts.h"
+#include "pmConceptsWrite.h"
 
 #include "pmFPAWrite.h"

trunk/psModules/src/camera/pmFPAfile.c

@@ -18 +18 @@
 #include "pmFPAfile.h"
 #include "pmFPACopy.h"
-#include "pmConcepts.h"
+#include "pmConceptsCopy.h"
 
 static void pmFPAfileFree(pmFPAfile *file)
@@ -409 +409 @@
     // XXX this should be smarter (ie, only copy concepts from the current chips)
     // but such a call is needed, so re-copy stuff rather than no copy
-    pmFPACopyConcepts (out, in);
+    pmConceptsCopyFPA(out, in, true, true);
 
     // pmFPAWrite takes care of all PHUs as needed

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -21 +21 @@
 #include "pmFPAConstruct.h"
 
-#include "pmConcepts.h"
+#include "pmConceptsCopy.h"
 
 # define FPA_TEST_ASSERT(A){ \
@@ -1024 +1024 @@
         }
 
-        // XXX A TEST: this is a provisional fpa until we read the first header for this pmFPAfile
-        // we are going to replace it when we determine the true file.  blow this away here...
-        psFree (file->fpa);
-        file->fpa = NULL;
+        // XXX A TEST: this is a provisional fpa until we read the first header for this pmFPAfile
+        // we are going to replace it when we determine the true file.  blow this away here...
+        psFree (file->fpa);
+        file->fpa = NULL;
     }
 
@@ -1184 +1184 @@
 
     // inherit the concepts from the src fpa:
-    pmFPACopyConcepts(file->fpa, file->src);
+    pmConceptsCopyFPA(file->fpa, file->src, true, true);
 
     return file;

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -22 +22 @@
 #include "pmFPAConstruct.h"
 #include "pmDark.h"
-#include "pmConcepts.h"
+#include "pmConceptsWrite.h"
 
 // Get a suitable FPA for the file; generate it if necessary

trunk/psModules/src/concepts/Makefile.am

@@ -8 +8 @@
         pmConceptsRead.c \
         pmConceptsWrite.c \
+        pmConceptsCopy.c \
         pmConceptsStandard.c \
         pmConceptsPhotcode.c \
@@ -17 +18 @@
         pmConceptsRead.h \
         pmConceptsWrite.h \
+        pmConceptsCopy.h \
         pmConceptsStandard.h \
         pmConceptsPhotcode.h \

trunk/psModules/src/concepts/pmConcepts.c

@@ -19 +19 @@
 #include "pmConceptsWrite.h"
 #include "pmConceptsStandard.h"
-#include "pmConceptsUpdate.h"
 
 static bool conceptsInitialised = false;// Have concepts been read?
@@ -49 +48 @@
 
 pmConceptSpec *pmConceptSpecAlloc(psMetadataItem *blank, pmConceptParseFunc parse,
-                                  pmConceptFormatFunc format, bool required)
+                                  pmConceptFormatFunc format, pmConceptCopyFunc copy,
+                                  bool required)
 {
     pmConceptSpec *spec = psAlloc(sizeof(pmConceptSpec));
@@ -57 +57 @@
     spec->parse = parse;
     spec->format = format;
+    spec->copy = copy;
     spec->required = required;
 
@@ -86 +87 @@
 }
 
+psMetadata *pmConceptsSpecs(pmFPALevel level)
+{
+    if (!conceptsInitialised) {
+        pmConceptsInit();
+    }
+
+    // Get the appropriate concepts
+    psMetadata *concepts = conceptsFromLevel(level); // Metadata of concepts specs
+    if (!concepts) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Invalid concept level provided: %d\n", level);
+        return NULL;
+    }
+
+    return concepts;
+}
+
 bool pmConceptGetRequired(const char *name, pmFPALevel level)
 {
@@ -129 +146 @@
 
 bool pmConceptRegister(psMetadataItem *blank, pmConceptParseFunc parse,
-                        pmConceptFormatFunc format, bool required, pmFPALevel level)
+                       pmConceptFormatFunc format, pmConceptCopyFunc copy,
+                       bool required, pmFPALevel level)
 {
     PS_ASSERT_PTR_NON_NULL(blank, false);
@@ -144 +162 @@
     }
 
-    pmConceptSpec *spec = pmConceptSpecAlloc(blank, parse, format, required); // The concept specification
+    pmConceptSpec *spec = pmConceptSpecAlloc(blank, parse, format, copy, required); // Concept specification
     psMetadataAdd(target, PS_LIST_TAIL, blank->name, PS_DATA_UNKNOWN | PS_META_REPLACE,
                   "Concepts specification", spec);
@@ -188 +206 @@
 
 
-
-// Read all registered concepts for the specified level
-static bool conceptsRead(psMetadata **specs, // One of the concepts specifications
-                         pmFPA *fpa,    // The FPA
-                         pmChip *chip,  // The chip
-                         pmCell *cell, // The cell
-                         unsigned int *read,     // What's already been read
-                         pmConceptSource source, // The source of the concepts to read
-                         pmConfig *config, // Configuration
-                         psMetadata *target // Place into which to read the concepts
-                        )
-{
-    assert(specs);
-    assert(read);
-    assert(target);
-
-    if (!conceptsInitialised) {
-        pmConceptsInit();
-    }
-
-    // At least one HDU is required for the reading functions
-    pmHDU *hduLow = pmHDUGetLowest(fpa, chip, cell); // Lowest HDU.
-    if (!hduLow) {
-        // Can't do anything --- don't record any success, but don't return an error either
-        return true;
-    }
-    pmHDU *hduHigh = pmHDUGetHighest(fpa, chip, cell); // Highest HDU
-
-    if (cell && (cell->conceptsRead == PM_CONCEPT_SOURCE_NONE)) {
-        pmConceptsBlankCell(cell);
-        cell->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
-    }
-    if (chip && (chip->conceptsRead == PM_CONCEPT_SOURCE_NONE)) {
-        pmConceptsBlankChip(chip);
-        chip->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
-    }
-    if (fpa && (fpa->conceptsRead == PM_CONCEPT_SOURCE_NONE)) {
-        pmConceptsBlankFPA(fpa);
-        fpa->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
-    }
-
-    bool success = true;                // Success in reading concepts?
-    if (source & PM_CONCEPT_SOURCE_CELLS && !(*read & PM_CONCEPT_SOURCE_CELLS) && cell) {
-        if (p_pmConceptsReadFromCells(target, *specs, cell)) {
-            *read |= PM_CONCEPT_SOURCE_CELLS;
-        } else {
-            psError(PS_ERR_UNKNOWN, false, "Error reading concepts from camera configuration.\n");
-            success = false;
-        }
-    }
-
-    if (source & PM_CONCEPT_SOURCE_DEFAULTS && !(*read & PM_CONCEPT_SOURCE_DEFAULTS)) {
-        if (p_pmConceptsReadFromDefaults(target, *specs, fpa, chip, cell)) {
-            *read |= PM_CONCEPT_SOURCE_DEFAULTS;
-        } else {
-            psError(PS_ERR_UNKNOWN, false, "Error reading concepts from defaults.\n");
-            success = false;
-        }
-    }
-
-    if (source & PM_CONCEPT_SOURCE_PHU && !(*read & PM_CONCEPT_SOURCE_PHU) && hduHigh->header) {
-        if (p_pmConceptsReadFromHeader(target, *specs, fpa, chip, cell)) {
-            *read |= PM_CONCEPT_SOURCE_PHU;
-        } else {
-            psError(PS_ERR_UNKNOWN, false, "Error reading concepts from PHU.\n");
-            success = false;
-        }
-    }
-
-    // If there are multiple HDUs, then it may be that one of them hasn't been read yet (hdu->header not set)
-    if (source & PM_CONCEPT_SOURCE_HEADER && !(*read & PM_CONCEPT_SOURCE_HEADER) &&
-        hduLow != hduHigh && hduLow->header) {
-        if (p_pmConceptsReadFromHeader(target, *specs, fpa, chip, cell)) {
-            *read |= PM_CONCEPT_SOURCE_HEADER;
-        } else {
-            psError(PS_ERR_UNKNOWN, false, "Error reading concepts from header.\n");
-            success = false;
-        }
-    }
-
-    #ifdef HAVE_PSDB
-    if (source & PM_CONCEPT_SOURCE_DATABASE && !(*read & PM_CONCEPT_SOURCE_DATABASE)) {
-        if (p_pmConceptsReadFromDatabase(target, *specs, fpa, chip, cell, config)) {
-            *read |= PM_CONCEPT_SOURCE_DATABASE;
-        } else {
-            psError(PS_ERR_UNKNOWN, false, "Error reading concepts from database.\n");
-            success = false;
-        }
-    }
-    #endif
-
-    pmConceptsUpdate(fpa, chip, cell);
-
-    return success;
-}
-
-// Write all registered concepts for the specified level
-static bool conceptsWrite(psMetadata **specs, // One of the concepts specifications
-                          const pmFPA *fpa,   // The FPA
-                          const pmChip *chip, // The chip
-                          const pmCell *cell, // The cell
-                          pmConceptSource source, // The source of the concepts to write
-                          pmConfig *config, // Configuration
-                          const psMetadata *concepts // The concepts to write out
-                         )
-{
-    assert(specs);
-    assert(concepts);
-
-    if (!conceptsInitialised) {
-        pmConceptsInit();
-    }
-
-    psTrace("psModules.concepts", 3, "Writing concepts (%p %p %p): %d\n", fpa, chip, cell, source);
-
-    if (source & PM_CONCEPT_SOURCE_CELLS) {
-        p_pmConceptsWriteToCells(*specs, cell, concepts);
-    }
-    if (source & PM_CONCEPT_SOURCE_DEFAULTS) {
-        p_pmConceptsWriteToDefaults(*specs, fpa, chip, cell, concepts);
-    }
-    if (source & (PM_CONCEPT_SOURCE_PHU | PM_CONCEPT_SOURCE_HEADER)) {
-        p_pmConceptsWriteToHeader(*specs, fpa, chip, cell, concepts);
-    }
-    if (source & PM_CONCEPT_SOURCE_DATABASE) {
-        p_pmConceptsWriteToDatabase(*specs, fpa, chip, cell, config, concepts);
-    }
-
-    return true;
-}
-
-
-bool pmConceptsRead(pmFPA *fpa, pmChip *chip, pmCell *cell, pmConceptSource source, pmConfig *config)
-{
-    PS_ASSERT_PTR_NON_NULL(fpa, false);
-    bool success = conceptsRead(&conceptsFPA, fpa, chip, cell, &fpa->conceptsRead, source,
-                                config, fpa->concepts);
-    if (chip) {
-        success &= conceptsRead(&conceptsChip, fpa, chip, cell, &chip->conceptsRead, source,
-                                config, chip->concepts);
-    }
-    if (cell) {
-        success &= conceptsRead(&conceptsCell, fpa, chip, cell, &cell->conceptsRead, source,
-                                config, cell->concepts);
-    }
-
-    return success;
-}
-
-
 bool pmConceptsBlankFPA(pmFPA *fpa)
 {
@@ -345 +213 @@
 }
 
-
-bool pmConceptsReadFPA(pmFPA *fpa, pmConceptSource source, bool propagateDown, pmConfig *config)
-{
-    PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModules.concepts", 5, "Reading FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
-    bool success = conceptsRead(&conceptsFPA, fpa, NULL, NULL, &fpa->conceptsRead, source,
-                                config, fpa->concepts);
-    if (propagateDown) {
-        psArray *chips = fpa->chips;    // Array of chips
-        for (long i = 0; i < chips->n; i++) {
-            pmChip *chip = chips->data[i]; // Chip of interest
-            if (chip) {
-                success &= pmConceptsReadChip(chip, source, false, true, config);
-            }
-        }
-    }
-
-    return success;
-}
-
-bool pmConceptsWriteFPA(const pmFPA *fpa, pmConceptSource source, bool propagateDown, pmConfig *config)
-{
-    PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModules.concepts", 5, "Writing FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
-    bool success = conceptsWrite(&conceptsFPA, fpa, NULL, NULL, source, config, fpa->concepts);
-    if (propagateDown) {
-        psArray *chips = fpa->chips;        // Array of chips
-        for (long i = 0; i < chips->n; i++) {
-            pmChip *chip = chips->data[i];  // Chip of interest
-            if (chip && !chip->hdu) {
-                success &= pmConceptsWriteChip(chip, source, false, true, config);
-            }
-        }
-    }
-    return success;
-}
-
 bool pmConceptsBlankChip(pmChip *chip)
 {
@@ -389 +220 @@
 }
 
-bool pmConceptsReadChip(pmChip *chip, pmConceptSource source, bool propagateUp,
-                        bool propagateDown, pmConfig *config)
-{
-    PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModules.concepts", 5, "Reading chip concepts: %p %p\n", conceptsChip, chip->concepts);
-    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    bool success = conceptsRead(&conceptsChip, fpa, chip, NULL, &chip->conceptsRead, source, config,
-                                chip->concepts);
-    if (propagateUp) {
-        success &= conceptsRead(&conceptsFPA, fpa, chip, NULL, &fpa->conceptsRead, source,
-                                config, fpa->concepts);
-    }
-    if (propagateDown) {
-        psArray *cells = chip->cells;        // Array of cells
-        for (long i = 0; i < cells->n; i++) {
-            pmCell *cell = cells->data[i];  // Cell of interest
-            if (cell) {
-                success &= pmConceptsReadCell(cell, source, false, config);
-            }
-        }
-    }
-    return success;
-}
-
-bool pmConceptsWriteChip(const pmChip *chip, pmConceptSource source, bool propagateUp,
-                         bool propagateDown, pmConfig *config)
-{
-    PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModules.concepts", 5, "Writing chip concepts: %p %p\n", conceptsChip, chip->concepts);
-    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    bool success = conceptsWrite(&conceptsChip, fpa, chip, NULL, source, config, chip->concepts);
-    if (propagateUp && !fpa->hdu) {
-        success &= conceptsWrite(&conceptsFPA, fpa, chip, NULL, source, config, fpa->concepts);
-    }
-    if (propagateDown) {
-        psArray *cells = chip->cells;        // Array of cells
-        for (long i = 0; i < cells->n; i++) {
-            pmCell *cell = cells->data[i];  // Cell of interest
-            if (cell && !cell->hdu) {
-                success &= pmConceptsWriteCell(cell, source, false, config);
-            }
-        }
-    }
-    return success;
-}
-
 bool pmConceptsBlankCell(pmCell *cell)
 {
@@ -440 +225 @@
     psTrace("psModules.concepts", 5, "Blanking cell concepts: %p %p\n", conceptsCell, cell->concepts);
     return conceptsBlank(&conceptsCell, cell->concepts);
-}
-
-bool pmConceptsReadCell(pmCell *cell, pmConceptSource source, bool propagateUp, pmConfig *config)
-{
-    PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModules.concepts", 5, "Reading cell concepts: %p %p\n", conceptsCell, cell->concepts);
-    pmChip *chip = cell->parent;        // Chip to which the cell belongs
-    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-
-    bool success = conceptsRead(&conceptsCell, fpa, chip, cell, &cell->conceptsRead, source, config,
-                                cell->concepts);
-    if (propagateUp) {
-        success &= conceptsRead(&conceptsChip, fpa, chip, cell, &chip->conceptsRead, source, config,
-                                chip->concepts);
-        success &= conceptsRead(&conceptsFPA, fpa, chip, cell, &fpa->conceptsRead, source, config,
-                                fpa->concepts);
-    }
-
-    return success;
-}
-
-bool pmConceptsWriteCell(const pmCell *cell, pmConceptSource source, bool propagateUp, pmConfig *config)
-{
-    PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModules.concepts", 5, "Writing cell concepts: %p %p\n", conceptsCell, cell->concepts);
-    pmChip *chip = cell->parent;        // Chip to which the cell belongs
-    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-
-    bool success = conceptsWrite(&conceptsCell, fpa, chip, cell, source, config, cell->concepts);
-    if (propagateUp) {
-        if (!chip->hdu) {
-            success &= conceptsWrite(&conceptsChip, fpa, chip, cell, source, config, chip->concepts);
-            if (!fpa->hdu) {
-                success &= conceptsWrite(&conceptsFPA, fpa, chip, cell, source, config, fpa->concepts);
-            }
-        }
-    }
-
-    return success;
 }
 
@@ -485 +231 @@
 static void conceptRegister##SUFFIX(const char *name, /* Name of concept */ \
                                     const char *comment, /* Comment for concept */ \
-                                    pmConceptParseFunc parse, /* Parsing function */ \
-                                    pmConceptFormatFunc format, /* Formatting function */ \
+                                    pmConceptParseFunc parse, /* Parsing function, or NULL */ \
+                                    pmConceptFormatFunc format, /* Formatting function, or NULL */ \
+                                    pmConceptCopyFunc copy, /* Copying function, or NULL */ \
                                     bool required, /* Required concept? */ \
                                     pmFPALevel level /* Level at which concept applies */ \
@@ -492 +239 @@
 { \
     psMetadataItem *item = psMetadataItemAlloc##TYPENAME(name, comment, DEFAULT); /* Item to add */ \
-    pmConceptRegister(item, parse, format, required, level); \
+    pmConceptRegister(item, parse, format, copy, required, level); \
     psFree(item); \
     return; \
@@ -515 +262 @@
     psMetadataItem *item = psMetadataItemAlloc(name, PS_DATA_TIME, comment, time);
     psFree(time);
-    pmConceptRegister(item, p_pmConceptParse_TIME, p_pmConceptFormat_TIME, required, level);
+    pmConceptRegister(item, p_pmConceptParse_TIME, p_pmConceptFormat_TIME, NULL, required, level);
     psFree(item);
 }
@@ -521 +268 @@
 bool pmConceptsInit(void)
 {
+    if (conceptsInitialised) {
+        return true;
+    }
+
     conceptsInitialised = true;
 
@@ -527 +278 @@
     bool init = false;                  // Did we initialise anything?
 
-    if (! conceptsFPA) {
+    if (!conceptsFPA) {
         conceptsFPA = psMetadataAlloc();
         init = true;
 
         // Install the standard concepts
-        conceptRegisterStr("FPA.TELESCOPE", "Telescope of origin", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterStr("FPA.INSTRUMENT", "Instrument name (according to the instrument)", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterStr("FPA.DETECTOR", "Detector name", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterStr("FPA.COMMENT", "Observation comment", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterStr("FPA.OBS.MODE", "Observation mode (eg, survey id)", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterStr("FPA.OBS.GROUP", "Observation group (eg, associated images)", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.FOCUS", "Telescope focus", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.AIRMASS", "Airmass at boresight", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterStr("FPA.FILTERID", "Filter used (parsed, abstract name)", p_pmConceptParse_FPA_FILTER, p_pmConceptFormat_FPA_FILTER, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterStr("FPA.FILTER", "Filter used (instrument name)", false, NULL, NULL, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.POSANGLE", "Position angle of instrument", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.ROTANGLE", "Rotator angle of instrument", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterStr("FPA.RADECSYS", "Celestial coordinate system", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF64("FPA.RA", "Right Ascension of boresight", p_pmConceptParse_FPA_Coords, p_pmConceptFormat_FPA_Coords, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF64("FPA.DEC", "Declination of boresight", p_pmConceptParse_FPA_Coords, p_pmConceptFormat_FPA_Coords, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF64("FPA.LONGITUDE", "West longitude of observatory", p_pmConceptParse_FPA_Coords, p_pmConceptFormat_FPA_Coords, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF64("FPA.LATITUDE", "Latitude of observatory", p_pmConceptParse_FPA_Coords, p_pmConceptFormat_FPA_Coords, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.ELEVATION", "Elevation of observatory (metres)", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterStr("FPA.OBSTYPE", "Type of observation", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterStr("FPA.OBJECT", "Object of observation", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF64("FPA.ALT", "Altitude of boresight", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF64("FPA.AZ", "Azimuth of boresight", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterEnum("FPA.TIMESYS", "Time system", p_pmConceptParse_TIMESYS, p_pmConceptFormat_TIMESYS, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.TELESCOPE", "Telescope of origin", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.INSTRUMENT", "Instrument name (according to the instrument)", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.DETECTOR", "Detector name", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.COMMENT", "Observation comment", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.OBS.MODE", "Observation mode (eg, survey id)", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.OBS.GROUP", "Observation group (eg, associated images)", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.FOCUS", "Telescope focus", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.AIRMASS", "Airmass at boresight", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.FILTERID", "Filter used (parsed, abstract name)", p_pmConceptParse_FPA_FILTER, p_pmConceptFormat_FPA_FILTER, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.FILTER", "Filter used (instrument name)", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.POSANGLE", "Position angle of instrument", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.ROTANGLE", "Rotator angle of instrument", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.RADECSYS", "Celestial coordinate system", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF64("FPA.RA", "Right Ascension of boresight", p_pmConceptParse_FPA_Coords, p_pmConceptFormat_FPA_Coords, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF64("FPA.DEC", "Declination of boresight", p_pmConceptParse_FPA_Coords, p_pmConceptFormat_FPA_Coords, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF64("FPA.LONGITUDE", "West longitude of observatory", p_pmConceptParse_FPA_Coords, p_pmConceptFormat_FPA_Coords, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF64("FPA.LATITUDE", "Latitude of observatory", p_pmConceptParse_FPA_Coords, p_pmConceptFormat_FPA_Coords, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.ELEVATION", "Elevation of observatory (metres)", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.OBSTYPE", "Type of observation", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.OBJECT", "Object of observation", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF64("FPA.ALT", "Altitude of boresight", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF64("FPA.AZ", "Azimuth of boresight", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterEnum("FPA.TIMESYS", "Time system", p_pmConceptParse_TIMESYS, p_pmConceptFormat_TIMESYS, p_pmConceptCopy_TIMESYS, false, PM_FPA_LEVEL_FPA);
         conceptRegisterTime("FPA.TIME", "Time of exposure", false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.TEMP", "Temperature of focal plane", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.M1X", "Primary Mirror X Position", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.M1Y", "Primary Mirror Y Position", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.M1Z", "Primary Mirror Z Position", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.M1TIP", "Primary Mirror TIP", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.M1TILT", "Primary Mirror TILT", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.M2X", "Primary Mirror X Position", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.M2Y", "Primary Mirror Y Position", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.M2Z", "Primary Mirror Z Position", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.M2TIP", "Primary Mirror TIP", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.M2TILT", "Primary Mirror TILT", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.ENV.TEMP", "Environment: Temperature", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.ENV.HUMID", "Environment: Humidity", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.ENV.WIND", "Environment: Wind speed", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.ENV.DIR", "Environment: Wind direction", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.TELTEMP.M1", "Telescope Temperatures: M1", p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.TELTEMP.M1CELL", "Telescope Temperatures: M1 cell", p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.TELTEMP.M2", "Telescope Temperatures: M2", p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.TELTEMP.SPIDER", "Telescope Temperatures: spider", p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.TELTEMP.TRUSS", "Telescope Temperatures: truss", p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.TELTEMP.EXTRA", "Telescope Temperatures: extra", p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.PON.TIME", "Power On Time", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-        conceptRegisterF32("FPA.EXPOSURE", "Exposure time (sec)", NULL, NULL, false, PM_FPA_LEVEL_FPA);
-    }
-    if (! conceptsChip) {
+        conceptRegisterF32("FPA.TEMP", "Temperature of focal plane", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.M1X", "Primary Mirror X Position", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.M1Y", "Primary Mirror Y Position", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.M1Z", "Primary Mirror Z Position", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.M1TIP", "Primary Mirror TIP", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.M1TILT", "Primary Mirror TILT", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.M2X", "Primary Mirror X Position", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.M2Y", "Primary Mirror Y Position", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.M2Z", "Primary Mirror Z Position", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.M2TIP", "Primary Mirror TIP", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.M2TILT", "Primary Mirror TILT", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.ENV.TEMP", "Environment: Temperature", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.ENV.HUMID", "Environment: Humidity", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.ENV.WIND", "Environment: Wind speed", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.ENV.DIR", "Environment: Wind direction", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.TELTEMP.M1", "Telescope Temperatures: M1", p_pmConceptParse_TELTEMPS, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.TELTEMP.M1CELL", "Telescope Temperatures: M1 cell", p_pmConceptParse_TELTEMPS, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.TELTEMP.M2", "Telescope Temperatures: M2", p_pmConceptParse_TELTEMPS, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.TELTEMP.SPIDER", "Telescope Temperatures: spider", p_pmConceptParse_TELTEMPS, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.TELTEMP.TRUSS", "Telescope Temperatures: truss", p_pmConceptParse_TELTEMPS, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.TELTEMP.EXTRA", "Telescope Temperatures: extra", p_pmConceptParse_TELTEMPS, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.PON.TIME", "Power On Time", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+        conceptRegisterF32("FPA.EXPOSURE", "Exposure time (sec)", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+    }
+    if (!conceptsChip) {
         conceptsChip = psMetadataAlloc();
         init = true;
 
         // Install the standard concepts
-        conceptRegisterS32("CHIP.XPARITY", "Orientation in x compared to the rest of the FPA", NULL, NULL, true, PM_FPA_LEVEL_CHIP);
-        conceptRegisterS32("CHIP.YPARITY", "Orientation in y compared to the rest of the FPA", NULL, NULL, true, PM_FPA_LEVEL_CHIP);
-        conceptRegisterS32("CHIP.X0", "Position of (0,0) on the FPA",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CHIP);
-        conceptRegisterS32("CHIP.Y0", "Position of (0,0) on the FPA",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CHIP);
-        conceptRegisterS32("CHIP.XSIZE", "Size of chip (pixels)", NULL, NULL, true, PM_FPA_LEVEL_CHIP);
-        conceptRegisterS32("CHIP.YSIZE", "Size of chip (pixels)", NULL, NULL, true, PM_FPA_LEVEL_CHIP);
-        conceptRegisterF32("CHIP.TEMP", "Temperature of chip", NULL, NULL, false, PM_FPA_LEVEL_CHIP);
-        conceptRegisterStr("CHIP.ID", "Chip identifier", NULL, NULL, false, PM_FPA_LEVEL_CHIP);
-    }
-
-    if (! conceptsCell) {
+        conceptRegisterS32("CHIP.XPARITY", "Orientation in x compared to the rest of the FPA", NULL, NULL, NULL, true, PM_FPA_LEVEL_CHIP);
+        conceptRegisterS32("CHIP.YPARITY", "Orientation in y compared to the rest of the FPA", NULL, NULL, NULL, true, PM_FPA_LEVEL_CHIP);
+        conceptRegisterS32("CHIP.X0", "Position of (0,0) on the FPA",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, NULL, true, PM_FPA_LEVEL_CHIP);
+        conceptRegisterS32("CHIP.Y0", "Position of (0,0) on the FPA",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, NULL, true, PM_FPA_LEVEL_CHIP);
+        conceptRegisterS32("CHIP.XSIZE", "Size of chip (pixels)", NULL, NULL, NULL, true, PM_FPA_LEVEL_CHIP);
+        conceptRegisterS32("CHIP.YSIZE", "Size of chip (pixels)", NULL, NULL, NULL, true, PM_FPA_LEVEL_CHIP);
+        conceptRegisterF32("CHIP.TEMP", "Temperature of chip", NULL, NULL, NULL, false, PM_FPA_LEVEL_CHIP);
+        conceptRegisterStr("CHIP.ID", "Chip identifier", NULL, NULL, NULL, false, PM_FPA_LEVEL_CHIP);
+    }
+
+    if (!conceptsCell) {
         conceptsCell = psMetadataAlloc();
         init = true;
 
         // Install the standard concepts
-        conceptRegisterF32("CELL.GAIN", "CCD gain (e/count)", NULL, NULL, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterF32("CELL.READNOISE", "CCD read noise (e)", p_pmConceptParse_CELL_READNOISE, p_pmConceptFormat_CELL_READNOISE, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterF32("CELL.SATURATION", "Saturation level (counts)", NULL, NULL, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterF32("CELL.BAD", "Bad level (counts)", NULL, NULL, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterS32("CELL.XPARITY", "Orientation in x compared to the rest of the chip", NULL, NULL, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterS32("CELL.YPARITY", "Orientation in y compared to the rest of the chip", NULL, NULL, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterS32("CELL.READDIR", "Read direction, rows=1, cols=2", NULL, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterF32("CELL.GAIN", "CCD gain (e/count)", NULL, NULL, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterF32("CELL.READNOISE", "CCD read noise (e)", p_pmConceptParse_CELL_READNOISE, p_pmConceptFormat_CELL_READNOISE, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterF32("CELL.SATURATION", "Saturation level (counts)", NULL, NULL, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterF32("CELL.BAD", "Bad level (counts)", NULL, NULL, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterS32("CELL.XPARITY", "Orientation in x compared to the rest of the chip", NULL, NULL, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterS32("CELL.YPARITY", "Orientation in y compared to the rest of the chip", NULL, NULL, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterS32("CELL.READDIR", "Read direction, rows=1, cols=2", NULL, NULL, NULL, true, PM_FPA_LEVEL_CELL);
 
         // These (CELL.EXPOSURE and CELL.DARKTIME) used to be READOUT.EXPOSURE and READOUT.DARKTIME, but that
@@ -613 +364 @@
         // readout is a plane in a 3D image.  We'll have to dream up some additional suffix to specify these,
         // but for now....
-        conceptRegisterF32("CELL.EXPOSURE", "Exposure time (sec)", NULL, NULL, false, PM_FPA_LEVEL_CELL);
-        conceptRegisterF32("CELL.DARKTIME", "Time since flush (sec)", NULL, NULL, false, PM_FPA_LEVEL_CELL);
-
-        conceptRegisterS32("CELL.XBIN", "Binning in x", p_pmConceptParse_CELL_Binning,p_pmConceptFormat_CELL_XBIN, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterS32("CELL.YBIN", "Binning in y",p_pmConceptParse_CELL_Binning,p_pmConceptFormat_CELL_YBIN, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterEnum("CELL.TIMESYS", "Time system", p_pmConceptParse_TIMESYS,p_pmConceptFormat_TIMESYS, false, PM_FPA_LEVEL_CELL);
+        conceptRegisterF32("CELL.EXPOSURE", "Exposure time (sec)", NULL, NULL, NULL, false, PM_FPA_LEVEL_CELL);
+        conceptRegisterF32("CELL.DARKTIME", "Time since flush (sec)", NULL, NULL, NULL, false, PM_FPA_LEVEL_CELL);
+
+        conceptRegisterS32("CELL.XBIN", "Binning in x", p_pmConceptParse_CELL_Binning,p_pmConceptFormat_CELL_XBIN, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterS32("CELL.YBIN", "Binning in y",p_pmConceptParse_CELL_Binning,p_pmConceptFormat_CELL_YBIN, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterEnum("CELL.TIMESYS", "Time system", p_pmConceptParse_TIMESYS,p_pmConceptFormat_TIMESYS, p_pmConceptCopy_TIMESYS, false, PM_FPA_LEVEL_CELL);
         conceptRegisterTime("CELL.TIME", "Time of exposure", false, PM_FPA_LEVEL_CELL);
-        conceptRegisterS32("CELL.X0", "Position of (0,0) on the chip",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterS32("CELL.Y0", "Position of (0,0) on the chip",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterS32("CELL.XSIZE", "Size of cell (pixels)", NULL, NULL, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterS32("CELL.YSIZE", "Size of cell (pixels)", NULL, NULL, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterS32("CELL.XWINDOW", "Start of cell window (pixels)",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterS32("CELL.YWINDOW", "Start of cell window (pixels)",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterF32("CELL.VARFACTOR", "Variance factor for conversion from large to small scales", NULL, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterS32("CELL.X0", "Position of (0,0) on the chip",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterS32("CELL.Y0", "Position of (0,0) on the chip",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterS32("CELL.XSIZE", "Size of cell (pixels)", NULL, NULL, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterS32("CELL.YSIZE", "Size of cell (pixels)", NULL, NULL, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterS32("CELL.XWINDOW", "Start of cell window (pixels)",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterS32("CELL.YWINDOW", "Start of cell window (pixels)",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, NULL, true, PM_FPA_LEVEL_CELL);
+        conceptRegisterF32("CELL.VARFACTOR", "Variance factor for conversion from large to small scales", NULL, NULL, NULL, true, PM_FPA_LEVEL_CELL);
 
         // CELL.TRIMSEC
@@ -635 +386 @@
                                           "Trim section", trimsec);
             psFree(trimsec);
-            pmConceptRegister(cellTrimsec, p_pmConceptParse_CELL_TRIMSEC,p_pmConceptFormat_CELL_TRIMSEC, true, PM_FPA_LEVEL_CELL);
+            pmConceptRegister(cellTrimsec, p_pmConceptParse_CELL_TRIMSEC,p_pmConceptFormat_CELL_TRIMSEC, NULL, true, PM_FPA_LEVEL_CELL);
             psFree(cellTrimsec);
         }
@@ -645 +396 @@
                                           "Bias sections", biassecs);
             psFree(biassecs);
-            pmConceptRegister(cellBiassec, p_pmConceptParse_CELL_BIASSEC, p_pmConceptFormat_CELL_BIASSEC, true, PM_FPA_LEVEL_CELL);
+            pmConceptRegister(cellBiassec, p_pmConceptParse_CELL_BIASSEC, p_pmConceptFormat_CELL_BIASSEC, NULL, true, PM_FPA_LEVEL_CELL);
             psFree(cellBiassec);
         }
@@ -666 +417 @@
 
     conceptsInitialised = false;
-}
-
-
-// List of concepts not to copy, for each level.
-// Must be NULL-terminated
-static const char *dontCopyConceptsFPA[] = { "FPA.OBS", "FPA.NAME", "FPA.CAMERA", 0 };
-static const char *dontCopyConceptsChip[] = { "CHIP.NAME", 0 };
-static const char *dontCopyConceptsCell[] = { "CELL.NAME", "CELL.TRIMSEC", "CELL.BIASSEC", 0 };
-
-// Copy concepts from a source container to a target container, avoiding certain entries
-static void copyConcepts(psMetadata *target, // Target metadata container
-                         psMetadata *source, // Source metadata container
-                         const char *dontCopyConcepts[] // Don't copy these concepts
-                         )
-{
-    assert(target);
-    assert(source);
-    assert(dontCopyConcepts);
-
-    psMetadataIterator *iter = psMetadataIteratorAlloc(source, PS_LIST_HEAD, NULL);
-    psMetadataItem *item;               // Item from iteration
-    while ((item = psMetadataGetAndIncrement(iter))) {
-        const char *name = item->name;  // Name of concept
-        bool copyOK = true;            // OK to copy
-        for (int i = 0; dontCopyConcepts[i] && copyOK; i++) {
-            if (!strcmp(name, dontCopyConcepts[i])) {
-                copyOK = false;
-            }
-        }
-        if (!copyOK) {
-            continue;
-        }
-        psMetadataItem *new = psMetadataItemCopy(item); // New item, a copy of the old
-        psMetadataAddItem(target, new, PS_LIST_TAIL, PS_META_REPLACE);
-        psFree(new);                    // Drop reference
-    }
-    psFree(iter);
-
-    return;
-}
-
-
-bool pmFPACopyConcepts(pmFPA *target, const pmFPA *source)
-{
-    PS_ASSERT_PTR_NON_NULL(target, false);
-    PS_ASSERT_PTR_NON_NULL(source, false);
-
-    // Copy FPA concepts
-    copyConcepts(target->concepts, source->concepts, dontCopyConceptsFPA);
-
-    // Copy chip concepts
-    psArray *targetChips = target->chips; // Chips in target
-    psArray *sourceChips = source->chips; // Chips in source
-    if (targetChips->n != sourceChips->n) {
-        psError(PS_ERR_IO, true, "Number of chips in target (%ld) and source (%ld) differ --- unable to copy "
-                "concepts.\n", targetChips->n, sourceChips->n);
-        return false;
-    }
-    for (int i = 0; i < targetChips->n; i++) {
-        pmChip *targetChip = targetChips->data[i]; // Target chip of interest
-        pmChip *sourceChip = sourceChips->data[i]; // Source chip of interest
-        if (! targetChip || ! sourceChip) {
-            continue;
-        }
-
-        copyConcepts(targetChip->concepts, sourceChip->concepts, dontCopyConceptsChip);
-
-        // Copy cell concepts
-        psArray *targetCells = targetChip->cells; // Cells in target
-        psArray *sourceCells = sourceChip->cells; // Cells in source
-        if (targetCells->n != sourceCells->n) {
-            psError(PS_ERR_IO, true, "Number of cells in target (%ld) and source (%ld) differ for chip %d ---"
-                    " unable to copy concepts.\n", targetCells->n, sourceCells->n, i);
-            return false;
-        }
-        for (int j = 0; j < targetCells->n; j++) {
-            pmCell *targetCell = targetCells->data[j]; // Target chip of interest
-            pmCell *sourceCell = sourceCells->data[j]; // Source chip of interest
-            if (! targetCell || ! sourceCell) {
-                continue;
-            }
-
-            copyConcepts(targetCell->concepts, sourceCell->concepts, dontCopyConceptsCell);
-        }
-    }
-
-    return true;
-}
-
-
-bool pmConceptsCopyFPA(pmFPA *target, const pmFPA *source, bool chips, bool cells)
-{
-    PS_ASSERT_PTR_NON_NULL(target, false);
-    PS_ASSERT_PTR_NON_NULL(source, false);
-
-    // Copy FPA concepts
-    copyConcepts(target->concepts, source->concepts, dontCopyConceptsFPA);
-
-    // Copy chip concepts
-    bool status = true;                 // Status of chips
-    if (chips) {
-        psArray *targetChips = target->chips; // Chips in target
-        psArray *sourceChips = source->chips; // Chips in source
-        if (targetChips->n != sourceChips->n) {
-            psError(PS_ERR_IO, true,
-                    "Number of chips in target (%ld) and source (%ld) differ --- unable to copy concepts.",
-                    targetChips->n, sourceChips->n);
-            return false;
-        }
-        for (int i = 0; i < targetChips->n; i++) {
-            pmChip *targetChip = targetChips->data[i]; // Target chip of interest
-            pmChip *sourceChip = sourceChips->data[i]; // Source chip of interest
-            if (! targetChip || ! sourceChip) {
-                continue;
-            }
-
-            status &= pmConceptsCopyChip(targetChip, sourceChip, cells);
-        }
-    }
-
-    return status;
-}
-
-bool pmConceptsCopyChip(pmChip *target, const pmChip *source, bool cells)
-{
-    PS_ASSERT_PTR_NON_NULL(target, false);
-    PS_ASSERT_PTR_NON_NULL(source, false);
-
-    // Copy chip concepts
-    copyConcepts(target->concepts, source->concepts, dontCopyConceptsChip);
-
-    // Copy cell concepts
-    bool status = true;                 // Status of cells
-    if (cells) {
-        psArray *targetCells = target->cells; // Cells in target
-        psArray *sourceCells = source->cells; // Cells in source
-        if (targetCells->n != sourceCells->n) {
-            psError(PS_ERR_IO, true,
-                    "Number of cells in target (%ld) and source (%ld) differ --- unable to copy concepts.",
-                    targetCells->n, sourceCells->n);
-            return false;
-        }
-        for (int j = 0; j < targetCells->n; j++) {
-            pmCell *targetCell = targetCells->data[j]; // Target chip of interest
-            pmCell *sourceCell = sourceCells->data[j]; // Source chip of interest
-            if (! targetCell || ! sourceCell) {
-                continue;
-            }
-
-            status &= pmConceptsCopyCell(targetCell, sourceCell);
-        }
-    }
-
-    return status;
-}
-
-
-bool pmConceptsCopyCell(pmCell *target, const pmCell *source)
-{
-    PS_ASSERT_PTR_NON_NULL(target, false);
-    PS_ASSERT_PTR_NON_NULL(source, false);
-
-    copyConcepts(target->concepts, source->concepts, dontCopyConceptsCell);
-
-    return true;
 }
 

trunk/psModules/src/concepts/pmConcepts.h

@@ -37 +37 @@
 
 /// Function to call to parse a concept once it has been read
-typedef psMetadataItem* (*pmConceptParseFunc)(const psMetadataItem *concept, ///< Concept to parse
-        const psMetadataItem *pattern, ///< Pattern for parsing
-                                              pmConceptSource source, ///< Source of concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                             );
+typedef psMetadataItem* (*pmConceptParseFunc)(
+    const psMetadataItem *concept, ///< Concept to parse
+    const psMetadataItem *pattern, ///< Pattern for parsing
+    pmConceptSource source, ///< Source of concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Function to call to format a concept for writing
-typedef psMetadataItem* (*pmConceptFormatFunc)(const psMetadataItem *concept, ///< Concept to format
-                                               pmConceptSource source, ///< Source of concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                              );
+typedef psMetadataItem* (*pmConceptFormatFunc)(
+    const psMetadataItem *concept, ///< Concept to format
+    pmConceptSource source, ///< Source of concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
+
+/// Function to call to copy a concept
+typedef psMetadataItem* (*pmConceptCopyFunc)(
+    const psMetadataItem *target,       ///< Target concept
+    const psMetadataItem *source,       ///< Source concept
+    const psMetadata *cameraFormat,     ///< Camera format definition
+    const pmFPA *fpa,                   ///< Source FPA for concept, or NULL
+    const pmChip *chip,                 ///< Source chip for concept, or NULL
+    const pmCell *cell                  ///< Source cell for concept, or NULL
+    );
+
 
 /// A "concept" specification
@@ -59 +72 @@
 /// Defines the name, default comment, blank value, and functions to parse (after reading) and format (before
 /// writing) the concept.
-typedef struct
-{
+typedef struct {
     psMetadataItem *blank;              ///< Blank value of concept; also contains the name and comment
-    pmConceptParseFunc parse;           ///< Function to call to read the concept
-    pmConceptFormatFunc format;         ///< Function to call to write the concept
+    pmConceptParseFunc parse;           ///< Function to call to read the concept, or NULL
+    pmConceptFormatFunc format;         ///< Function to call to write the concept, or NULL
+    pmConceptCopyFunc copy;             ///< Function to call to copy the concept, or NULL
     bool required;                      ///< Is concept required (throw an error on problems)?
 }
@@ -70 +83 @@
 /// Allocator for pmConceptSpec
 pmConceptSpec *pmConceptSpecAlloc(psMetadataItem *blank, ///< Blank value; contains the name
-                                  pmConceptParseFunc parse, ///< Function to call to parse the concept
-                                  pmConceptFormatFunc format, ///< Function to call to format the concept
+                                  pmConceptParseFunc parse, ///< Function to call to parse the concept/NULL
+                                  pmConceptFormatFunc format, ///< Function to call to format the concept/NULL
+                                  pmConceptCopyFunc copy, ///< Function to call to copy the concept, or NULL
                                   bool required ///< Is concept required?
                                  );
@@ -95 +109 @@
                        pmConceptParseFunc parse, ///< Function to call to parse the concept, or NULL
                        pmConceptFormatFunc format, ///< Function to call to format the concept, or NULL
+                       pmConceptCopyFunc copy, ///< Function to call to copy the concept, or NULL
                        bool required,   ///< Is concept required?
                        pmFPALevel level ///< Level at which to store concept in the FPA hierarchy
                       );
 
-/// Get a list of defined concepts for a particular level.
-psList *pmConceptsList(pmFPALevel level);
+/// Get the specifications for defined concepts of a particular level
+psMetadata *pmConceptsSpecs(pmFPALevel level);
 
-/// Read the concepts for the given set of fpa, chip, cell
-///
-/// Attempts to read as many concepts as possible from the specified source for the specified FPA, chip and
-/// cell.  That is, it will read chip- and cell-level concepts in addition to fpa-level concepts, if the chip
-/// and cell are provided.
-bool pmConceptsRead(pmFPA *fpa,         ///< FPA for which to read concepts
-                    pmChip *chip,       ///< Chip for which to read concepts, or NULL
-                    pmCell *cell,       ///< Cell for which to read concepts, or NULL
-                    pmConceptSource source, ///< The source of the concepts to read
-                    pmConfig *config    ///< Configuration
-                   );
 
 /// Set the concepts within the FPA to the blank value
 bool pmConceptsBlankFPA(pmFPA *fpa      ///< FPA for which to set blank concepts
-                       );
-
-/// Read concepts for an FPA; optionally, read concepts at all lower levels.
-///
-/// Once concepts should be available for reading at the FPA-level, this function attempts to read the
-/// concepts from the specified source.  It also allows concepts to be read at lower levels by iterating over
-/// the components.
-bool pmConceptsReadFPA(pmFPA *fpa,      ///< FPA for which to read concepts
-                       pmConceptSource source, ///< Source for concepts
-                       bool propagateDown, ///< Propagate to lower levels?
-                       pmConfig *config         ///< Configuration
-                      );
-
-/// Write concepts for an FPA; optionally, write concepts at all lower levels.
-///
-/// This function writes all concepts for the FPA to the specified "source".  It also allows concepts to be
-/// written for all lower levels by iterating over the components.
-bool pmConceptsWriteFPA(const pmFPA *fpa,     ///< FPA for which to write concepts
-                        pmConceptSource source, ///< Source for concepts
-                        bool propagateDown, ///< Propagate to lower levels?
-                        pmConfig *config        ///< Configuration
                        );
 
@@ -143 +126 @@
                         );
 
-/// Read concepts for a chip; optionally, read concepts at the FPA and cell levels.
-///
-/// Once concepts should be available for reading at the FPA-level, this function attempts to read the
-/// concepts from the specified source.  It also allows concepts to be read at the fpa level (through the
-/// parent), and the cell level by iterating over the components.
-bool pmConceptsReadChip(pmChip *chip,   ///< Chip for which to read concepts
-                        pmConceptSource source, ///< Source for concepts
-                        bool propagateUp, ///< Propagate to higher levels?
-                        bool propagateDown, ///< Propagate to lower levels?
-                        pmConfig *config        ///< Configuration
-                       );
-
-/// Write concepts for a chip; optionally, write concepts at the FPA and cell levels.
-///
-/// This function writes all concepts for the chip to the specified "source".  It also allows concepts to be
-/// written for the FPA, and the cell level by iterating over the components.
-bool pmConceptsWriteChip(const pmChip *chip,  ///< Chip for which to write concepts
-                         pmConceptSource source, ///< Source for concepts
-                         bool propagateUp,///< Propagate to higher levels?
-                         bool propagateDown, ///< Propagate to lower levels?
-                         pmConfig *config       ///< Configuration
-                        );
-
 /// Set the concepts within the cell to the blank value
 bool pmConceptsBlankCell(pmCell *cell   ///< Cell for which to set blank concepts
-                        );
-
-/// Read concepts for a cell; optionally, read concepts for the parents.
-///
-/// Once concepts should be available for reading at the FPA-level, this function attempts to read the
-/// concepts from the specified source.  It also allows concepts to be read at upper levels through the
-/// parents (note, it would not read concepts for all chips, but only the parent of this cell).
-bool pmConceptsReadCell(pmCell *cell,   ///< Cell for which to read concepts
-                        pmConceptSource source, ///< Source for concepts
-                        bool propagateUp, ///< Propagate to higher levels?
-                        pmConfig *config        ///< Configuration
-                       );
-
-/// Write concepts for a cell; optionally, write concepts for the parents.
-///
-/// This function writes all concepts for the chip to the specified "source".  It also allows concepts to be
-/// written for the upper levels through the parents (note, it would not write concepts for all chips, but
-/// only the parent of this cell).
-bool pmConceptsWriteCell(const pmCell *cell,  ///< FPA for which to write concepts
-                         pmConceptSource source, ///< Source for concepts
-                         bool propagateUp, ///< Propagate to higher levels?
-                         pmConfig *config ///< Configuration
                         );
 
@@ -202 +140 @@
 /// Frees the registered concepts so there is no memory leak when the user checks "persistent" memory.
 void pmConceptsDone(void);
-
-/// Copy all the concepts within an FPA to another FPA
-///
-/// Iterates over all components of the FPA, and copies the concepts metadata from the source to the target.
-bool pmFPACopyConcepts(pmFPA *target,   ///< The target FPA
-                       const pmFPA *source    ///< The source FPA
-                      );
-
-/// Copy the concepts within an FPA to another FPA; optionally recurse to lower levels
-bool pmConceptsCopyFPA(pmFPA *target,   ///< Target FPA
-                       const pmFPA *source, ///< Source FPA
-                       bool chips,      ///< Recurse to chips level?
-                       bool cells       ///< Recurse to cells level?
-    );
-
-/// Copy the concepts within a chip to another chip; optionally recurse to lower level
-bool pmConceptsCopyChip(pmChip *target, ///< Target chip
-                        const pmChip *source, ///< Source chip
-                        bool cells      ///< Recurse to cells level?
-    );
-
-/// Copy the concepts within a cell to another cell
-bool pmConceptsCopyCell(pmCell *target, ///< Target cell
-                        const pmCell *source ///< Source cell
-    );
 
 /// Interpolate a concept name to the actual value

trunk/psModules/src/concepts/pmConceptsRead.c

@@ -15 +15 @@
 #include "pmHDUUtils.h"
 #include "pmConcepts.h"
+#include "pmConceptsUpdate.h"
+
 #include "pmConceptsRead.h"
 
@@ -483 +485 @@
 }
 
+
+
+// Read all registered concepts for the specified level
+static bool conceptsRead(psMetadata **specs, // One of the concepts specifications
+                         pmFPA *fpa,    // The FPA
+                         pmChip *chip,  // The chip
+                         pmCell *cell, // The cell
+                         unsigned int *read,     // What's already been read
+                         pmConceptSource source, // The source of the concepts to read
+                         pmConfig *config, // Configuration
+                         psMetadata *target // Place into which to read the concepts
+                        )
+{
+    assert(specs);
+    assert(read);
+    assert(target);
+
+    pmConceptsInit();
+
+    // At least one HDU is required for the reading functions
+    pmHDU *hduLow = pmHDUGetLowest(fpa, chip, cell); // Lowest HDU.
+    if (!hduLow) {
+        // Can't do anything --- don't record any success, but don't return an error either
+        return true;
+    }
+    pmHDU *hduHigh = pmHDUGetHighest(fpa, chip, cell); // Highest HDU
+
+    if (cell && (cell->conceptsRead == PM_CONCEPT_SOURCE_NONE)) {
+        pmConceptsBlankCell(cell);
+        cell->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
+    }
+    if (chip && (chip->conceptsRead == PM_CONCEPT_SOURCE_NONE)) {
+        pmConceptsBlankChip(chip);
+        chip->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
+    }
+    if (fpa && (fpa->conceptsRead == PM_CONCEPT_SOURCE_NONE)) {
+        pmConceptsBlankFPA(fpa);
+        fpa->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
+    }
+
+    bool success = true;                // Success in reading concepts?
+    if (source & PM_CONCEPT_SOURCE_CELLS && !(*read & PM_CONCEPT_SOURCE_CELLS) && cell) {
+        if (p_pmConceptsReadFromCells(target, *specs, cell)) {
+            *read |= PM_CONCEPT_SOURCE_CELLS;
+        } else {
+            psError(PS_ERR_UNKNOWN, false, "Error reading concepts from camera configuration.\n");
+            success = false;
+        }
+    }
+
+    if (source & PM_CONCEPT_SOURCE_DEFAULTS && !(*read & PM_CONCEPT_SOURCE_DEFAULTS)) {
+        if (p_pmConceptsReadFromDefaults(target, *specs, fpa, chip, cell)) {
+            *read |= PM_CONCEPT_SOURCE_DEFAULTS;
+        } else {
+            psError(PS_ERR_UNKNOWN, false, "Error reading concepts from defaults.\n");
+            success = false;
+        }
+    }
+
+    if (source & PM_CONCEPT_SOURCE_PHU && !(*read & PM_CONCEPT_SOURCE_PHU) && hduHigh->header) {
+        if (p_pmConceptsReadFromHeader(target, *specs, fpa, chip, cell)) {
+            *read |= PM_CONCEPT_SOURCE_PHU;
+        } else {
+            psError(PS_ERR_UNKNOWN, false, "Error reading concepts from PHU.\n");
+            success = false;
+        }
+    }
+
+    // If there are multiple HDUs, then it may be that one of them hasn't been read yet (hdu->header not set)
+    if (source & PM_CONCEPT_SOURCE_HEADER && !(*read & PM_CONCEPT_SOURCE_HEADER) &&
+        hduLow != hduHigh && hduLow->header) {
+        if (p_pmConceptsReadFromHeader(target, *specs, fpa, chip, cell)) {
+            *read |= PM_CONCEPT_SOURCE_HEADER;
+        } else {
+            psError(PS_ERR_UNKNOWN, false, "Error reading concepts from header.\n");
+            success = false;
+        }
+    }
+
+#ifdef HAVE_PSDB
+    if (source & PM_CONCEPT_SOURCE_DATABASE && !(*read & PM_CONCEPT_SOURCE_DATABASE)) {
+        if (p_pmConceptsReadFromDatabase(target, *specs, fpa, chip, cell, config)) {
+            *read |= PM_CONCEPT_SOURCE_DATABASE;
+        } else {
+            psError(PS_ERR_UNKNOWN, false, "Error reading concepts from database.\n");
+            success = false;
+        }
+    }
+#endif
+
+    pmConceptsUpdate(fpa, chip, cell);
+
+    return success;
+}
+
+
+
+
+bool pmConceptsRead(pmFPA *fpa, pmChip *chip, pmCell *cell, pmConceptSource source, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
+    psMetadata *conceptsFPA = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // Concept specifications
+    bool success = conceptsRead(&conceptsFPA, fpa, chip, cell, &fpa->conceptsRead, source,
+                                config, fpa->concepts);
+    if (chip) {
+        psMetadata *conceptsChip = pmConceptsSpecs(PM_FPA_LEVEL_CHIP); // Concept specifications
+        success &= conceptsRead(&conceptsChip, fpa, chip, cell, &chip->conceptsRead, source,
+                                config, chip->concepts);
+    }
+    if (cell) {
+        psMetadata *conceptsCell = pmConceptsSpecs(PM_FPA_LEVEL_CELL); // Concept specifications
+        success &= conceptsRead(&conceptsCell, fpa, chip, cell, &cell->conceptsRead, source,
+                                config, cell->concepts);
+    }
+
+    return success;
+}
+
+
+
+bool pmConceptsReadFPA(pmFPA *fpa, pmConceptSource source, bool propagateDown, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
+    psMetadata *conceptsFPA = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // Concept specifications
+    psTrace("psModules.concepts", 5, "Reading FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
+    bool success = conceptsRead(&conceptsFPA, fpa, NULL, NULL, &fpa->conceptsRead, source,
+                                config, fpa->concepts);
+    if (propagateDown) {
+        psArray *chips = fpa->chips;    // Array of chips
+        for (long i = 0; i < chips->n; i++) {
+            pmChip *chip = chips->data[i]; // Chip of interest
+            if (chip) {
+                success &= pmConceptsReadChip(chip, source, false, true, config);
+            }
+        }
+    }
+
+    return success;
+}
+
+
+
+bool pmConceptsReadChip(pmChip *chip, pmConceptSource source, bool propagateUp,
+                        bool propagateDown, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(chip, false);
+    psMetadata *conceptsChip = pmConceptsSpecs(PM_FPA_LEVEL_CHIP); // Concept specifications
+    psTrace("psModules.concepts", 5, "Reading chip concepts: %p %p\n", conceptsChip, chip->concepts);
+    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
+    bool success = conceptsRead(&conceptsChip, fpa, chip, NULL, &chip->conceptsRead, source, config,
+                                chip->concepts);
+    if (propagateUp) {
+        psMetadata *conceptsFPA = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // Concept specifications
+        success &= conceptsRead(&conceptsFPA, fpa, chip, NULL, &fpa->conceptsRead, source,
+                                config, fpa->concepts);
+    }
+    if (propagateDown) {
+        psArray *cells = chip->cells;        // Array of cells
+        for (long i = 0; i < cells->n; i++) {
+            pmCell *cell = cells->data[i];  // Cell of interest
+            if (cell) {
+                success &= pmConceptsReadCell(cell, source, false, config);
+            }
+        }
+    }
+    return success;
+}
+
+
+bool pmConceptsReadCell(pmCell *cell, pmConceptSource source, bool propagateUp, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(cell, false);
+    psMetadata *conceptsCell = pmConceptsSpecs(PM_FPA_LEVEL_CELL); // Concept specifications
+    psTrace("psModules.concepts", 5, "Reading cell concepts: %p %p\n", conceptsCell, cell->concepts);
+    pmChip *chip = cell->parent;        // Chip to which the cell belongs
+    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
+
+    bool success = conceptsRead(&conceptsCell, fpa, chip, cell, &cell->conceptsRead, source, config,
+                                cell->concepts);
+    if (propagateUp) {
+        psMetadata *conceptsChip = pmConceptsSpecs(PM_FPA_LEVEL_CHIP); // Concept specifications
+        success &= conceptsRead(&conceptsChip, fpa, chip, cell, &chip->conceptsRead, source, config,
+                                chip->concepts);
+        psMetadata *conceptsFPA = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // Concept specifications
+
+        success &= conceptsRead(&conceptsFPA, fpa, chip, cell, &fpa->conceptsRead, source, config,
+                                fpa->concepts);
+    }
+
+    return success;
+}

trunk/psModules/src/concepts/pmConceptsRead.h

@@ -11 +11 @@
 #ifndef PM_CONCEPTS_READ_H
 #define PM_CONCEPTS_READ_H
+
+#include <pslib.h>
+#include <pmFPA.h>
+#include <pmConfig.h>
+#include <pmConcepts.h>
 
 /// Read concepts from the camera format file's CELLS.
@@ -79 +84 @@
                                   pmConfig *config // Configuration
                                  );
+
+/// Read the concepts for the given set of fpa, chip, cell
+///
+/// Attempts to read as many concepts as possible from the specified source for the specified FPA, chip and
+/// cell.  That is, it will read chip- and cell-level concepts in addition to fpa-level concepts, if the chip
+/// and cell are provided.
+bool pmConceptsRead(pmFPA *fpa,         ///< FPA for which to read concepts
+                    pmChip *chip,       ///< Chip for which to read concepts, or NULL
+                    pmCell *cell,       ///< Cell for which to read concepts, or NULL
+                    pmConceptSource source, ///< The source of the concepts to read
+                    pmConfig *config    ///< Configuration
+                   );
+
+/// Read concepts for an FPA; optionally, read concepts at all lower levels.
+///
+/// Once concepts should be available for reading at the FPA-level, this function attempts to read the
+/// concepts from the specified source.  It also allows concepts to be read at lower levels by iterating over
+/// the components.
+bool pmConceptsReadFPA(pmFPA *fpa,      ///< FPA for which to read concepts
+                       pmConceptSource source, ///< Source for concepts
+                       bool propagateDown, ///< Propagate to lower levels?
+                       pmConfig *config         ///< Configuration
+                      );
+
+/// Read concepts for a chip; optionally, read concepts at the FPA and cell levels.
+///
+/// Once concepts should be available for reading at the FPA-level, this function attempts to read the
+/// concepts from the specified source.  It also allows concepts to be read at the fpa level (through the
+/// parent), and the cell level by iterating over the components.
+bool pmConceptsReadChip(pmChip *chip,   ///< Chip for which to read concepts
+                        pmConceptSource source, ///< Source for concepts
+                        bool propagateUp, ///< Propagate to higher levels?
+                        bool propagateDown, ///< Propagate to lower levels?
+                        pmConfig *config        ///< Configuration
+                       );
+
+/// Read concepts for a cell; optionally, read concepts for the parents.
+///
+/// Once concepts should be available for reading at the FPA-level, this function attempts to read the
+/// concepts from the specified source.  It also allows concepts to be read at upper levels through the
+/// parents (note, it would not read concepts for all chips, but only the parent of this cell).
+bool pmConceptsReadCell(pmCell *cell,   ///< Cell for which to read concepts
+                        pmConceptSource source, ///< Source for concepts
+                        bool propagateUp, ///< Propagate to higher levels?
+                        pmConfig *config        ///< Configuration
+                       );
+
 /// @}
 #endif

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -1350 +1350 @@
 
 
+psMetadataItem *p_pmConceptCopy_TIMESYS(const psMetadataItem *target,
+                                        const psMetadataItem *source,
+                                        const psMetadata *cameraFormat,
+                                        const pmFPA *fpa,
+                                        const pmChip *chip,
+                                        const pmCell *cell)
+{
+    if (!target || target->data.S32 == -1) {
+        // Replace
+        return psMetadataItemCopy(source);
+    }
+    // Keep what we've got --- it's been mandated by use of the DEFAULTS
+    return psMemIncrRefCounter((psMetadataItem*)target);
+}

trunk/psModules/src/concepts/pmConceptsStandard.h

@@ -20 +20 @@
 
 /// Parse the CELL.READNOISE concept to do ADU->e correction if required
-psMetadataItem *p_pmConceptParse_CELL_READNOISE(const psMetadataItem *concept,
-                                                const psMetadataItem *pattern,
-                                                pmConceptSource source,
-                                                const psMetadata *cameraFormat,
-                                                const pmFPA *fpa,
-                                                const pmChip *chip,
-                                                const pmCell *cell);
+psMetadataItem *p_pmConceptParse_CELL_READNOISE(
+    const psMetadataItem *concept,
+    const psMetadataItem *pattern,
+    pmConceptSource source,
+    const psMetadata *cameraFormat,
+    const pmFPA *fpa,
+    const pmChip *chip,
+    const pmCell *cell
+);
 
 /// Format the CELL.READNOISE concept to do e->ADU correction if required
-psMetadataItem *p_pmConceptFormat_CELL_READNOISE(const psMetadataItem *concept,
-                                                 pmConceptSource source,
-                                                 const psMetadata *cameraFormat,
-                                                 const pmFPA *fpa,
-                                                 const pmChip *chip,
-                                                 const pmCell *cell);
+psMetadataItem *p_pmConceptFormat_CELL_READNOISE(
+    const psMetadataItem *concept,
+    pmConceptSource source,
+    const psMetadata *cameraFormat,
+    const pmFPA *fpa,
+    const pmChip *chip,
+    const pmCell *cell
+    );
 
 // Parse the TELTEMPS concept : parse a list of the form 'X1 X2 X3 X4 X5 ...' : for now use median
-psMetadataItem *p_pmConceptParse_TELTEMPS(const psMetadataItem *concept,
-                                          const psMetadataItem *pattern,
-                                          pmConceptSource source,
-                                          const psMetadata *cameraFormat,
-                                          const pmFPA *fpa,
-                                          const pmChip *chip,
-                                          const pmCell *cell);
+psMetadataItem *p_pmConceptParse_TELTEMPS(
+    const psMetadataItem *concept,
+    const psMetadataItem *pattern,
+    pmConceptSource source,
+    const psMetadata *cameraFormat,
+    const pmFPA *fpa,
+    const pmChip *chip,
+    const pmCell *cell
+    );
 
 /// Parse the FPA.FILTER concept to apply a lookup table
-psMetadataItem *p_pmConceptParse_FPA_FILTER(const psMetadataItem *concept, ///< Concept to parse
-        const psMetadataItem *pattern, ///< Pattern to use in parsing
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                           );
+psMetadataItem *p_pmConceptParse_FPA_FILTER(
+    const psMetadataItem *concept, ///< Concept to parse
+    const psMetadataItem *pattern, ///< Pattern to use in parsing
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Format the FPA.FILTER concept to (reverse-)apply a lookup table
-psMetadataItem *p_pmConceptFormat_FPA_FILTER(const psMetadataItem *concept, ///< Concept to format
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                            );
+psMetadataItem *p_pmConceptFormat_FPA_FILTER(
+    const psMetadataItem *concept, ///< Concept to format
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Parse the coordinates concepts: FPA.RA and FPA.DEC
-psMetadataItem *p_pmConceptParse_FPA_Coords(const psMetadataItem *concept, ///< Concept to parse
-        const psMetadataItem *pattern, ///< Pattern to use in parsing
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                           );
+psMetadataItem *p_pmConceptParse_FPA_Coords(
+    const psMetadataItem *concept, ///< Concept to parse
+    const psMetadataItem *pattern, ///< Pattern to use in parsing
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Format the coordinates concepts: FPA.RA and FPA.DEC
-psMetadataItem *p_pmConceptFormat_FPA_Coords(const psMetadataItem *concept, ///< Concept to format
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                            );
+psMetadataItem *p_pmConceptFormat_FPA_Coords(
+    const psMetadataItem *concept, ///< Concept to format
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Parse the CELL.TRIMSEC concept
-psMetadataItem *p_pmConceptParse_CELL_TRIMSEC(const psMetadataItem *concept, ///< Concept to parse
-        const psMetadataItem *pattern, ///< Pattern to use in parsing
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                             );
+psMetadataItem *p_pmConceptParse_CELL_TRIMSEC(
+    const psMetadataItem *concept, ///< Concept to parse
+    const psMetadataItem *pattern, ///< Pattern to use in parsing
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Parse the CELL.BIASSEC concept
-psMetadataItem *p_pmConceptParse_CELL_BIASSEC(const psMetadataItem *concept, ///< Concept to parse
-        const psMetadataItem *pattern, ///< Pattern to use in parsing
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                             );
+psMetadataItem *p_pmConceptParse_CELL_BIASSEC(
+    const psMetadataItem *concept, ///< Concept to parse
+    const psMetadataItem *pattern, ///< Pattern to use in parsing
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Parse the cell binning concepts: CELL.XBIN, CELL.YBIN
-psMetadataItem *p_pmConceptParse_CELL_Binning(const psMetadataItem *concept, ///< Concept to parse
-        const psMetadataItem *pattern, ///< Pattern to use in parsing
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                             );
+psMetadataItem *p_pmConceptParse_CELL_Binning(
+    const psMetadataItem *concept, ///< Concept to parse
+    const psMetadataItem *pattern, ///< Pattern to use in parsing
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Parse the time system concepts: FPA.TIMESYS and CELL.TIMESYS
-psMetadataItem *p_pmConceptParse_TIMESYS(const psMetadataItem *concept, ///< Concept to parse
-        const psMetadataItem *pattern, ///< Pattern to use in parsing
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                        );
+psMetadataItem *p_pmConceptParse_TIMESYS(
+    const psMetadataItem *concept, ///< Concept to parse
+    const psMetadataItem *pattern, ///< Pattern to use in parsing
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Parse the time concepts: FPA.TIME and CELL.TIME
-psMetadataItem *p_pmConceptParse_TIME(const psMetadataItem *concept, ///< Concept to parse
-                                      const psMetadataItem *pattern, ///< Pattern to use in parsing
-                                            pmConceptSource source, ///< Source for concept
-                                      const psMetadata *cameraFormat, ///< Camera format definition
-                                      const pmFPA *fpa, ///< FPA for concept, or NULL
-                                      const pmChip *chip, ///< Chip for concept, or NULL
-                                      const pmCell *cell ///< Cell for concept, or NULL
-                                     );
+psMetadataItem *p_pmConceptParse_TIME(
+    const psMetadataItem *concept, ///< Concept to parse
+    const psMetadataItem *pattern, ///< Pattern to use in parsing
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Parse a cell position concept, e.g., CELL.X0
-psMetadataItem *p_pmConceptParse_Positions(const psMetadataItem *concept, ///< Concept to parse
-        const psMetadataItem *pattern, ///< Pattern to use in parsing
-                                            pmConceptSource source, ///< Source for concept
-       const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                          );
+psMetadataItem *p_pmConceptParse_Positions(
+    const psMetadataItem *concept, ///< Concept to parse
+    const psMetadataItem *pattern, ///< Pattern to use in parsing
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Format the CELL.TRIMSEC concept
-psMetadataItem *p_pmConceptFormat_CELL_TRIMSEC(const psMetadataItem *concept, ///< Concept to format
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                              );
+psMetadataItem *p_pmConceptFormat_CELL_TRIMSEC(
+    const psMetadataItem *concept, ///< Concept to format
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Format the CELL.BIASSEC concept
-psMetadataItem *p_pmConceptFormat_CELL_BIASSEC(const psMetadataItem *concept, ///< Concept to format
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                              );
+psMetadataItem *p_pmConceptFormat_CELL_BIASSEC(
+    const psMetadataItem *concept, ///< Concept to format
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Format the CELL.XBIN concept
-psMetadataItem *p_pmConceptFormat_CELL_XBIN(const psMetadataItem *concept, ///< Concept to format
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                           );
+psMetadataItem *p_pmConceptFormat_CELL_XBIN(
+    const psMetadataItem *concept, ///< Concept to format
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Format the CELL.YBIN concept
-psMetadataItem *p_pmConceptFormat_CELL_YBIN(const psMetadataItem *concept, ///< Concept to format
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                           );
+psMetadataItem *p_pmConceptFormat_CELL_YBIN(
+    const psMetadataItem *concept, ///< Concept to format
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Format the time system concepts: FPA.TIMESYS and CELL.TIMESYS
-psMetadataItem *p_pmConceptFormat_TIMESYS(const psMetadataItem *concept, ///< Concept to format
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                         );
+psMetadataItem *p_pmConceptFormat_TIMESYS(
+    const psMetadataItem *concept, ///< Concept to format
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Format the time concepts: FPA.TIME and CELL.TIME
-psMetadataItem *p_pmConceptFormat_TIME(const psMetadataItem *concept, ///< Concept to format
-                                            pmConceptSource source, ///< Source for concept
-                                       const psMetadata *cameraFormat, ///< Camera format definition
-                                       const pmFPA *fpa, ///< FPA for concept, or NULL
-                                       const pmChip *chip, ///< Chip for concept, or NULL
-                                       const pmCell *cell ///< Cell for concept, or NULL
-                                      );
+psMetadataItem *p_pmConceptFormat_TIME(
+    const psMetadataItem *concept, ///< Concept to format
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
 
 /// Format a cell position concept, e.g., CELL.X0
-psMetadataItem *p_pmConceptFormat_Positions(const psMetadataItem *concept, ///< Concept to format
-                                            pmConceptSource source, ///< Source for concept
-        const psMetadata *cameraFormat, ///< Camera format definition
-        const pmFPA *fpa, ///< FPA for concept, or NULL
-        const pmChip *chip, ///< Chip for concept, or NULL
-        const pmCell *cell ///< Cell for concept, or NULL
-                                           );
+psMetadataItem *p_pmConceptFormat_Positions(
+    const psMetadataItem *concept, ///< Concept to format
+    pmConceptSource source, ///< Source for concept
+    const psMetadata *cameraFormat, ///< Camera format definition
+    const pmFPA *fpa, ///< FPA for concept, or NULL
+    const pmChip *chip, ///< Chip for concept, or NULL
+    const pmCell *cell ///< Cell for concept, or NULL
+    );
+
+/// Copy the time system only if not already set
+psMetadataItem *p_pmConceptCopy_TIMESYS(
+    const psMetadataItem *target,
+    const psMetadataItem *source,
+    const psMetadata *cameraFormat,
+    const pmFPA *fpa,
+    const pmChip *chip,
+    const pmCell *cell
+    );
+
 /// @}
 #endif

trunk/psModules/src/concepts/pmConceptsWrite.c

@@ -16 +16 @@
 #include "pmConcepts.h"
 #include "pmConceptsRead.h"
+
+#include "pmConceptsWrite.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -320 +322 @@
 
 bool p_pmConceptsWriteToDefaults(const psMetadata *specs, const pmFPA *fpa, const pmChip *chip,
-                                 const pmCell *cell, psMetadata *concepts)
+                                 const pmCell *cell, const psMetadata *concepts)
 {
     PS_ASSERT_PTR_NON_NULL(specs, false);
@@ -486 +488 @@
     #endif
 }
+
+
+
+
+
+// Write all registered concepts for the specified level
+static bool conceptsWrite(psMetadata **specs, // One of the concepts specifications
+                          const pmFPA *fpa,   // The FPA
+                          const pmChip *chip, // The chip
+                          const pmCell *cell, // The cell
+                          pmConceptSource source, // The source of the concepts to write
+                          pmConfig *config, // Configuration
+                          psMetadata *concepts // The concepts to write out
+                         )
+{
+    assert(specs);
+    assert(concepts);
+
+    pmConceptsInit();
+
+    psTrace("psModules.concepts", 3, "Writing concepts (%p %p %p): %d\n", fpa, chip, cell, source);
+
+    if (source & PM_CONCEPT_SOURCE_CELLS) {
+        p_pmConceptsWriteToCells(*specs, cell, concepts);
+    }
+    if (source & PM_CONCEPT_SOURCE_DEFAULTS) {
+        p_pmConceptsWriteToDefaults(*specs, fpa, chip, cell, concepts);
+    }
+    if (source & (PM_CONCEPT_SOURCE_PHU | PM_CONCEPT_SOURCE_HEADER)) {
+        p_pmConceptsWriteToHeader(*specs, fpa, chip, cell, concepts);
+    }
+    if (source & PM_CONCEPT_SOURCE_DATABASE) {
+        p_pmConceptsWriteToDatabase(*specs, fpa, chip, cell, config, concepts);
+    }
+
+    return true;
+}
+
+
+bool pmConceptsWriteFPA(const pmFPA *fpa, pmConceptSource source, bool propagateDown, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
+    psMetadata *conceptsFPA = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // Concept specifications
+    psTrace("psModules.concepts", 5, "Writing FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
+    bool success = conceptsWrite(&conceptsFPA, fpa, NULL, NULL, source, config, fpa->concepts);
+    if (propagateDown) {
+        psArray *chips = fpa->chips;        // Array of chips
+        for (long i = 0; i < chips->n; i++) {
+            pmChip *chip = chips->data[i];  // Chip of interest
+            if (chip && !chip->hdu) {
+                success &= pmConceptsWriteChip(chip, source, false, true, config);
+            }
+        }
+    }
+    return success;
+}
+
+
+bool pmConceptsWriteChip(const pmChip *chip, pmConceptSource source, bool propagateUp,
+                         bool propagateDown, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(chip, false);
+    psMetadata *conceptsChip = pmConceptsSpecs(PM_FPA_LEVEL_CHIP); // Concept specifications
+    psTrace("psModules.concepts", 5, "Writing chip concepts: %p %p\n", conceptsChip, chip->concepts);
+    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
+    bool success = conceptsWrite(&conceptsChip, fpa, chip, NULL, source, config, chip->concepts);
+    if (propagateUp && !fpa->hdu) {
+        psMetadata *conceptsFPA = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // Concept specifications
+        success &= conceptsWrite(&conceptsFPA, fpa, chip, NULL, source, config, fpa->concepts);
+    }
+    if (propagateDown) {
+        psArray *cells = chip->cells;        // Array of cells
+        for (long i = 0; i < cells->n; i++) {
+            pmCell *cell = cells->data[i];  // Cell of interest
+            if (cell && !cell->hdu) {
+                success &= pmConceptsWriteCell(cell, source, false, config);
+            }
+        }
+    }
+    return success;
+}
+
+
+bool pmConceptsWriteCell(const pmCell *cell, pmConceptSource source, bool propagateUp, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(cell, false);
+    psMetadata *conceptsCell = pmConceptsSpecs(PM_FPA_LEVEL_CELL); // Concept specifications
+    psTrace("psModules.concepts", 5, "Writing cell concepts: %p %p\n", conceptsCell, cell->concepts);
+    pmChip *chip = cell->parent;        // Chip to which the cell belongs
+    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
+
+    bool success = conceptsWrite(&conceptsCell, fpa, chip, cell, source, config, cell->concepts);
+    if (propagateUp) {
+        if (!chip->hdu) {
+            psMetadata *conceptsChip = pmConceptsSpecs(PM_FPA_LEVEL_CHIP); // Concept specifications
+            success &= conceptsWrite(&conceptsChip, fpa, chip, cell, source, config, chip->concepts);
+            if (!fpa->hdu) {
+                psMetadata *conceptsFPA = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // Concept specifications
+                success &= conceptsWrite(&conceptsFPA, fpa, chip, cell, source, config, fpa->concepts);
+            }
+        }
+    }
+
+    return success;
+}

trunk/psModules/src/concepts/pmConceptsWrite.h

@@ -11 +11 @@
 #ifndef PM_CONCEPTS_WRITE_H
 #define PM_CONCEPTS_WRITE_H
+
+#include <pslib.h>
+#include <pmFPA.h>
+#include <pmConfig.h>
+#include <pmConcepts.h>
 
 /// @addtogroup Concepts Data Abstraction Concepts
@@ -58 +63 @@
                                  const psMetadata *concepts ///< The concepts
                                 );
+
+
+/// Write concepts for an FPA; optionally, write concepts at all lower levels.
+///
+/// This function writes all concepts for the FPA to the specified "source".  It also allows concepts to be
+/// written for all lower levels by iterating over the components.
+bool pmConceptsWriteFPA(const pmFPA *fpa,     ///< FPA for which to write concepts
+                        pmConceptSource source, ///< Source for concepts
+                        bool propagateDown, ///< Propagate to lower levels?
+                        pmConfig *config        ///< Configuration
+                       );
+
+/// Write concepts for a chip; optionally, write concepts at the FPA and cell levels.
+///
+/// This function writes all concepts for the chip to the specified "source".  It also allows concepts to be
+/// written for the FPA, and the cell level by iterating over the components.
+bool pmConceptsWriteChip(const pmChip *chip,  ///< Chip for which to write concepts
+                         pmConceptSource source, ///< Source for concepts
+                         bool propagateUp,///< Propagate to higher levels?
+                         bool propagateDown, ///< Propagate to lower levels?
+                         pmConfig *config       ///< Configuration
+                        );
+
+/// Write concepts for a cell; optionally, write concepts for the parents.
+///
+/// This function writes all concepts for the chip to the specified "source".  It also allows concepts to be
+/// written for the upper levels through the parents (note, it would not write concepts for all chips, but
+/// only the parent of this cell).
+bool pmConceptsWriteCell(const pmCell *cell,  ///< FPA for which to write concepts
+                         pmConceptSource source, ///< Source for concepts
+                         bool propagateUp, ///< Propagate to higher levels?
+                         pmConfig *config ///< Configuration
+                        );
+
 /// @}
 #endif

trunk/psModules/src/config/pmConfigCamera.c

@@ -280 +280 @@
         psMetadata *translation = psMetadataAlloc(); // The TRANSLATION --- how to read the FITS headers
 
-        psList *concepts;               // List of concepts for each level
-        psListIterator *iter;           // Iterator for concepts
-        psString name;                  // Concept name, from iteration
-
-        concepts = pmConceptsList(PM_FPA_LEVEL_FPA); // FPA-level concepts
-        iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
-        while ((name = psListGetAndIncrement(iter))) {
-            const char *new = skycellConceptName(name, skycellConceptsFPA, system); // Name for skycell
+        psMetadata *concepts;           // List of concepts for each level
+        psMetadataIterator *iter;       // Iterator for concepts
+        psMetadataItem *item;           // Concept specification item, from iteration
+
+        concepts = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // FPA-level concepts
+        iter = psMetadataIteratorAlloc(concepts, PS_LIST_HEAD, NULL);
+        while ((item = psMetadataGetAndIncrement(iter))) {
+            const char *new = skycellConceptName(item->name, skycellConceptsFPA, system); // Name for skycell
             if (new) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
+                psMetadataAddStr(translation, PS_LIST_TAIL, item->name, 0, NULL, new);
             }
         }
@@ -295 +295 @@
         psFree(concepts);
 
-        concepts = pmConceptsList(PM_FPA_LEVEL_CHIP);
-        iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
-        while ((name = psListGetAndIncrement(iter))) {
-            const char *new = skycellConceptName(name, skycellConceptsChip, system); // Name for skycell
+        concepts = pmConceptsSpecs(PM_FPA_LEVEL_CHIP);
+        iter = psMetadataIteratorAlloc(concepts, PS_LIST_HEAD, NULL);
+        while ((item = psMetadataGetAndIncrement(iter))) {
+            const char *new = skycellConceptName(item->name, skycellConceptsChip, system); // Name for skycell
             if (new) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
+                psMetadataAddStr(translation, PS_LIST_TAIL, item->name, 0, NULL, new);
             }
         }
@@ -306 +306 @@
         psFree(concepts);
 
-        concepts = pmConceptsList(PM_FPA_LEVEL_CELL);
-        iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
-        while ((name = psListGetAndIncrement(iter))) {
-            const char *new = skycellConceptName(name, skycellConceptsCell, system); // Name for skycell
+        concepts = pmConceptsSpecs(PM_FPA_LEVEL_CELL);
+        iter = psMetadataIteratorAlloc(concepts, PS_LIST_HEAD, false);
+        while ((item = psMetadataGetAndIncrement(iter))) {
+            const char *new = skycellConceptName(item->name, skycellConceptsCell, system); // Name for skycell
             if (new) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
+                psMetadataAddStr(translation, PS_LIST_TAIL, item->name, 0, NULL, new);
             }
         }

trunk/psModules/src/imcombine/pmSubtractionIO.c

@@ -8 +8 @@
 #include "pmFPAfile.h"
 #include "pmFPAfileFitsIO.h"
-#include "pmConcepts.h"
+#include "pmConceptsRead.h"
 
 #include "pmSubtraction.h"

trunk/psModules/src/objects/pmSourceIO.c

@@ -29 +29 @@
 #include "pmFPAfile.h"
 #include "pmFPAfileFitsIO.h"
-#include "pmConcepts.h"
+#include "pmConceptsRead.h"
 
 #include "pmSpan.h"
@@ -503 +503 @@
                   status = pmSourcesWrite_PS1_CAL_0_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
               }
-              if (!strcmp (exttype, "PS1_V1")) {
-                  status = pmSourcesWrite_CMF_PS1_V1_XSRC (file->fits, sources, xsrcname, recipe);
-              }
+              if (!strcmp (exttype, "PS1_V1")) {
+                  status = pmSourcesWrite_CMF_PS1_V1_XSRC (file->fits, sources, xsrcname, recipe);
+              }
             }
             if (xfitname) {

trunk/psModules/src/psmodules.h

@@ -32 +32 @@
 // the following headers are from psModule:concepts
 #include <pmConcepts.h>
+#include <pmConceptsStandard.h>
 #include <pmConceptsRead.h>
-#include <pmConceptsStandard.h>
 #include <pmConceptsWrite.h>
+#include <pmConceptsCopy.h>
 #include <pmConceptsPhotcode.h>
 #include <pmConceptsAverage.h>