Changeset 6618 for branches/rel10_ifa/psModules/src/astrom/pmConcepts.c

Timestamp:

Mar 16, 2006, 3:47:44 PM (20 years ago)

Author:

Paul Price

Message:

PHU=NONE (i.e., megacam split) now working, with concept ingest; changed definition of pmFPAAddSource to return a pmFPAview

File:

• branches/rel10_ifa/psModules/src/astrom/pmConcepts.c (modified) (1 diff)

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

@@ -158 +158 @@
 }
 
-
-// Set the concepts for a given FPA to blanks
-bool pmConceptsBlankFPA(pmFPA *fpa    // FPA for which to set blank concepts
-                       )
-{
-    psTrace("psModule.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
-    return conceptsBlank(&conceptsFPA, fpa->concepts);
-}
-
-// Read the concepts for a given FPA
-bool pmConceptsReadFPA(pmFPA *fpa,      // FPA for which to read concepts
-                       pmConceptSource source, // The source of the concepts to read
-                       psDB *db         // Database handle
-                      )
-{
-    psTrace("psModule.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
-    return conceptsRead(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
-}
-
-// Read the concepts for a given FPA
-bool pmConceptsWriteFPA(pmFPA *fpa,     // FPA for which to write concepts
-                        pmConceptSource source, // The source of the concepts to read
-                        psDB *db        // Database handle
-                       )
-{
-    psTrace("psModule.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
-    return conceptsWrite(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
-}
-
-// Set the concepts for a given chip to blanks
-bool pmConceptsBlankChip(pmChip *chip // FPA for which to set blank concepts
-                        )
-{
-    psTrace("psModule.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
-    return conceptsBlank(&conceptsChip, chip->concepts);
-}
-
-// Read the concepts for a given FPA
-bool pmConceptsReadChip(pmChip *chip,   // Chip for which to read concepts
-                        pmConceptSource source, // The source of the concepts to read
-                        psDB *db        // Database handle
-                       )
-{
-    psTrace("psModule.concepts", 5, "Reading chip concepts: %x %x\n", conceptsChip, chip->concepts);
-    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    return conceptsRead(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
-}
-
-// Read the concepts for a given FPA
-bool pmConceptsWriteChip(pmChip *chip,  // Chip for which to write concepts
-                         pmConceptSource source, // The source of the concepts to read
-                         psDB *db        // Database handle
-                        )
-{
-    psTrace("psModule.concepts", 5, "Writing chip concepts: %x %x\n", conceptsChip, chip->concepts);
-    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    return conceptsWrite(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
-}
-
-// Set the concepts for a given chip to blanks
-bool pmConceptsBlankCell(pmCell *cell // Cell for which to set blank concepts
-                        )
-{
-    psTrace("psModule.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
-    return conceptsBlank(&conceptsCell, cell->concepts);
-}
-
-// Read the concepts for a given FPA
-bool pmConceptsReadCell(pmCell *cell,   // Cell for which to read concepts
-                        pmConceptSource source, // The source of the concepts to read
-                        psDB *db        // Database handle
-                       )
-{
-    psTrace("psModule.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
-    pmChip *chip = cell->parent;        // Chip to which the cell belongs
-    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    return conceptsRead(&conceptsCell, fpa, chip, cell, source, db, cell->concepts);
-}
-
-// Read the concepts for a given FPA
-bool pmConceptsWriteCell(pmCell *cell,  // FPA for which to write concepts
-                         pmConceptSource source, // The source of the concepts to read
-                         psDB *db       // Database handle
-                        )
-{
-    psTrace("psModule.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
-    pmChip *chip = cell->parent;        // Chip to which the cell belongs
-    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    return conceptsWrite(&conceptsCell, fpa, chip, cell, source, db, cell->concepts);
-}
-
-
-bool pmConceptsInit(void)
-{
-    bool init = false;                  // Did we initialise anything?
-    if (! conceptsFPA) {
-        conceptsFPA = psMetadataAlloc();
-        init = true;
-
-        // Install the standard concepts
-
-        #if 0
-        // FPA.NAME
-        {
-            psMetadataItem *fpaName = psMetadataItemAllocStr("FPA.NAME", "Name of FPA", "");
-            pmConceptRegister(fpaName, NULL, NULL, PM_CONCEPT_LEVEL_FPA);
-            psFree(fpaName);
+#if 0
+bool pmConceptsRead(pmFPAview *view,
+                    pmFPAlevel levels,
+                    pmConceptSource source,
+                    psDB *db
+                   )
+{
+    pmFPA *fpa = view->fpa;             // The FPA
+
+    #endif
+
+    // Set the concepts for a given FPA to blanks
+    bool pmConceptsBlankFPA(pmFPA *fpa    // FPA for which to set blank concepts
+                           ) {
+        psTrace("psModule.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+        return conceptsBlank(&conceptsFPA, fpa->concepts);
+    }
+
+    // Read the concepts for a given FPA
+    bool pmConceptsReadFPA(pmFPA *fpa,      // FPA for which to read concepts
+                           pmConceptSource source, // The source of the concepts to read
+                           psDB *db         // Database handle
+                          ) {
+        psTrace("psModule.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+        return conceptsRead(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
+    }
+
+    // Read the concepts for a given FPA
+    bool pmConceptsWriteFPA(pmFPA *fpa,     // FPA for which to write concepts
+                            pmConceptSource source, // The source of the concepts to read
+                            psDB *db        // Database handle
+                           ) {
+        psTrace("psModule.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+        return conceptsWrite(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
+    }
+
+    // Set the concepts for a given chip to blanks
+    bool pmConceptsBlankChip(pmChip *chip // FPA for which to set blank concepts
+                            ) {
+        psTrace("psModule.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
+        return conceptsBlank(&conceptsChip, chip->concepts);
+    }
+
+    // Read the concepts for a given FPA
+    bool pmConceptsReadChip(pmChip *chip,   // Chip for which to read concepts
+                            pmConceptSource source, // The source of the concepts to read
+                            bool propagate, // Propagate to higher levels as well?
+                            psDB *db        // Database handle
+                           ) {
+        psTrace("psModule.concepts", 5, "Reading chip concepts: %x %x\n", conceptsChip, chip->concepts);
+        pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
+        return conceptsRead(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts) &&
+               ((propagate && conceptsRead(&conceptsFPA, fpa, chip, NULL, source, db, fpa->concepts)) ||
+                !propagate);
+    }
+
+    // Read the concepts for a given FPA
+    bool pmConceptsWriteChip(pmChip *chip,  // Chip for which to write concepts
+                             pmConceptSource source, // The source of the concepts to read
+                             bool propagate,// Propagate to higher levels as well?
+                             psDB *db        // Database handle
+                            ) {
+        psTrace("psModule.concepts", 5, "Writing chip concepts: %x %x\n", conceptsChip, chip->concepts);
+        pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
+        return conceptsWrite(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts) &&
+               ((propagate && conceptsWrite(&conceptsFPA, fpa, chip, NULL, source, db, fpa->concepts)) ||
+                !propagate);
+    }
+
+    // Set the concepts for a given chip to blanks
+    bool pmConceptsBlankCell(pmCell *cell // Cell for which to set blank concepts
+                            ) {
+        psTrace("psModule.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
+        return conceptsBlank(&conceptsCell, cell->concepts);
+    }
+
+    // Read the concepts for a given FPA
+    bool pmConceptsReadCell(pmCell *cell,   // Cell for which to read concepts
+                            pmConceptSource source, // The source of the concepts to read
+                            bool propagate,// Propagate to higher levels as well?
+                            psDB *db        // Database handle
+                           ) {
+        psTrace("psModule.concepts", 5, "Reading cell concepts: %x %x\n", conceptsCell, cell->concepts);
+        pmChip *chip = cell->parent;        // Chip to which the cell belongs
+        pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
+        return conceptsRead(&conceptsCell, fpa, chip, cell, source, db, cell->concepts) &&
+               ((propagate && conceptsRead(&conceptsChip, fpa, chip, cell, source, db, chip->concepts) &&
+                 conceptsRead(&conceptsFPA, fpa, chip, cell, source, db, fpa->concepts)) || !propagate);
+    }
+
+    // Read the concepts for a given FPA
+    bool pmConceptsWriteCell(pmCell *cell,  // FPA for which to write concepts
+                             pmConceptSource source, // The source of the concepts to read
+                             bool propagate,// Propagate to higher levels as well?
+                             psDB *db       // Database handle
+                            ) {
+        psTrace("psModule.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
+        pmChip *chip = cell->parent;        // Chip to which the cell belongs
+        pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
+        return conceptsWrite(&conceptsCell, fpa, chip, cell, source, db, cell->concepts) &&
+               ((propagate && conceptsWrite(&conceptsChip, fpa, chip, cell, source, db, chip->concepts) &&
+                 conceptsWrite(&conceptsFPA, fpa, chip, cell, source, db, fpa->concepts)) || !propagate);
+    }
+
+
+    bool pmConceptsInit(void) {
+        bool init = false;                  // Did we initialise anything?
+        if (! conceptsFPA) {
+            conceptsFPA = psMetadataAlloc();
+            init = true;
+
+            // Install the standard concepts
+
+            #if 0
+            // FPA.NAME
+            {
+                psMetadataItem *fpaName = psMetadataItemAllocStr("FPA.NAME", "Name of FPA", "");
+                pmConceptRegister(fpaName, NULL, NULL, PM_CONCEPT_LEVEL_FPA);
+                psFree(fpaName);
+            }
+            #endif
+
+            // FPA.AIRMASS
+            {
+                psMetadataItem *fpaAirmass = psMetadataItemAllocF32("FPA.AIRMASS", "Airmass at boresight", 0.0);
+                pmConceptRegister(fpaAirmass, NULL, NULL, PM_CONCEPT_LEVEL_FPA);
+                psFree(fpaAirmass);
+            }
+
+            // FPA.FILTER
+            {
+                psMetadataItem *fpaFilter = psMetadataItemAllocStr("FPA.FILTER", "Filter used", "");
+                pmConceptRegister(fpaFilter, NULL, NULL, PM_CONCEPT_LEVEL_FPA);
+                psFree(fpaFilter);
+            }
+
+            // FPA.POSANGLE
+            {
+                psMetadataItem *fpaPosangle = psMetadataItemAllocF32("FPA.POSANGLE",
+                                              "Position angle of instrument", 0.0);
+                pmConceptRegister(fpaPosangle, NULL, NULL, PM_CONCEPT_LEVEL_FPA);
+                psFree(fpaPosangle);
+            }
+
+            // FPA.RADECSYS
+            {
+                psMetadataItem *fpaRadecsys = psMetadataItemAllocStr("FPA.RADECSYS",
+                                              "Celestial coordinate system", "");
+                pmConceptRegister(fpaRadecsys, NULL, NULL, PM_CONCEPT_LEVEL_FPA);
+                psFree(fpaRadecsys);
+            }
+
+            // FPA.RA
+            {
+                psMetadataItem *fpaRa = psMetadataItemAllocF64("FPA.RA", "Right Ascension of boresight", NAN);
+                pmConceptRegister(fpaRa, (pmConceptParseFunc)pmConceptParse_FPA_Coords,
+                                  (pmConceptFormatFunc)pmConceptFormat_FPA_Coords, PM_CONCEPT_LEVEL_FPA);
+                psFree(fpaRa);
+            }
+
+            // FPA.DEC
+            {
+                psMetadataItem *fpaDec = psMetadataItemAllocF64("FPA.DEC", "Declination of boresight", NAN);
+                pmConceptRegister(fpaDec, (pmConceptParseFunc)pmConceptParse_FPA_Coords,
+                                  (pmConceptFormatFunc)pmConceptFormat_FPA_Coords, PM_CONCEPT_LEVEL_FPA);
+                psFree(fpaDec);
+            }
+
+            // Done with FPA level concepts
         }
-        #endif
-
-        // FPA.AIRMASS
-        {
-            psMetadataItem *fpaAirmass = psMetadataItemAllocF32("FPA.AIRMASS", "Airmass at boresight", 0.0);
-            pmConceptRegister(fpaAirmass, NULL, NULL, PM_CONCEPT_LEVEL_FPA);
-            psFree(fpaAirmass);
+        if (! conceptsChip) {
+            conceptsChip = psMetadataAlloc();
+            init = true;
+            // There are no standard concepts at the chip level to be installed
         }
-
-        // FPA.FILTER
-        {
-            psMetadataItem *fpaFilter = psMetadataItemAllocStr("FPA.FILTER", "Filter used", "");
-            pmConceptRegister(fpaFilter, NULL, NULL, PM_CONCEPT_LEVEL_FPA);
-            psFree(fpaFilter);
+        if (! conceptsCell) {
+            conceptsCell = psMetadataAlloc();
+            init = true;
+
+            // Install the standard concepts
+
+            // CELL.GAIN
+            {
+                psMetadataItem *cellGain = psMetadataItemAllocF32("CELL.GAIN", "CCD gain (e/count)", NAN);
+                pmConceptRegister(cellGain, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellGain);
+            }
+
+            // CELL.READNOISE
+            {
+                psMetadataItem *cellReadnoise = psMetadataItemAllocF32("CELL.READNOISE",
+                                                "CCD read noise (e)", NAN);
+                pmConceptRegister(cellReadnoise, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellReadnoise);
+            }
+
+            // CELL.SATURATION
+            {
+                psMetadataItem *cellSaturation = psMetadataItemAllocF32("CELL.SATURATION",
+                                                 "Saturation level (counts)", NAN);
+                pmConceptRegister(cellSaturation, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellSaturation);
+            }
+
+            // CELL.BAD
+            {
+                psMetadataItem *cellBad = psMetadataItemAllocF32("CELL.BAD", "Bad level (counts)", NAN);
+                pmConceptRegister(cellBad, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellBad);
+            }
+
+            // CELL.XPARITY
+            {
+                psMetadataItem *cellXparity = psMetadataItemAllocS32("CELL.XPARITY",
+                                              "Orientation in x compared to the rest of the FPA", 0);
+                pmConceptRegister(cellXparity, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellXparity);
+            }
+
+            // CELL.YPARITY
+            {
+                psMetadataItem *cellYparity = psMetadataItemAllocS32("CELL.YPARITY",
+                                              "Orientation in x compared to the rest of the FPA", 0);
+                pmConceptRegister(cellYparity, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellYparity);
+            }
+
+            // CELL.READDIR
+            {
+                psMetadataItem *cellReaddir = psMetadataItemAllocS32("CELL.READDIR",
+                                              "Read direction, rows=1, cols=2", 1);
+                pmConceptRegister(cellReaddir, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellReaddir);
+            }
+
+
+            // These (CELL.EXPOSURE and CELL.DARKTIME) used to be READOUT.EXPOSURE and READOUT.DARKTIME, but that
+            // doesn't really make sense at the moment.  Maybe we need to add a "parent" link to the readouts.
+            // But then how are the exposure times REALLY derived?  They're not in the FITS headers, because a
+            // readout is a plane in a 3D image.  We'll have to dream up some additional suffix to specify these,
+            // but for now....
+
+            // CELL.EXPOSURE
+            {
+                psMetadataItem *cellExposure = psMetadataItemAllocF32("CELL.EXPOSURE",
+                                               "Exposure time (sec)", NAN);
+                pmConceptRegister(cellExposure, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellExposure);
+            }
+
+            // CELL.DARKTIME
+            {
+                psMetadataItem *cellDarktime = psMetadataItemAllocF32("CELL.DARKTIME",
+                                               "Time since flush (sec)", NAN);
+                pmConceptRegister(cellDarktime, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellDarktime);
+            }
+
+            // CELL.TRIMSEC
+            {
+                psRegion *trimsec = psAlloc(sizeof(psRegion)); // Blank trimsec
+                trimsec->x0 = trimsec->y0 = trimsec->x1 = trimsec->y1 = NAN;
+                psMetadataItem *cellTrimsec = psMetadataItemAllocPtr("CELL.TRIMSEC", PS_DATA_UNKNOWN,
+                                              "Trim section", trimsec);
+                psFree(trimsec);
+                pmConceptRegister(cellTrimsec, (pmConceptParseFunc)pmConceptParse_CELL_TRIMSEC,
+                                  (pmConceptFormatFunc)pmConceptFormat_CELL_TRIMSEC, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellTrimsec);
+            }
+
+            // CELL.BIASSEC
+            {
+                psList *biassecs = psListAlloc(NULL); // Blank biassecs
+                psMetadataItem *cellBiassec = psMetadataItemAllocPtr("CELL.BIASSEC", PS_DATA_LIST,
+                                              "Bias sections", biassecs);
+                psFree(biassecs);
+                pmConceptRegister(cellBiassec, (pmConceptParseFunc)pmConceptParse_CELL_BIASSEC,
+                                  (pmConceptFormatFunc)pmConceptFormat_CELL_BIASSEC, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellBiassec);
+            }
+
+            // CELL.XBIN
+            {
+                psMetadataItem *cellXbin = psMetadataItemAllocS32("CELL.XBIN", "Binning in x", 0);
+                pmConceptRegister(cellXbin, (pmConceptParseFunc)pmConceptParse_CELL_Binning,
+                                  (pmConceptFormatFunc)pmConceptFormat_CELL_XBIN, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellXbin);
+            }
+
+            // CELL.YBIN
+            {
+                psMetadataItem *cellYbin = psMetadataItemAllocS32("CELL.YBIN", "Binning in y", 0);
+                pmConceptRegister(cellYbin, (pmConceptParseFunc)pmConceptParse_CELL_Binning,
+                                  (pmConceptFormatFunc)pmConceptFormat_CELL_YBIN, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellYbin);
+            }
+
+            // CELL.TIMESYS
+            {
+                psMetadataItem *cellTimesys = psMetadataItemAllocS32("CELL.TIMESYS", "Time system", -1);
+                pmConceptRegister(cellTimesys, (pmConceptParseFunc)pmConceptParse_CELL_TIMESYS,
+                                  (pmConceptFormatFunc)pmConceptFormat_CELL_TIMESYS, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellTimesys);
+            }
+
+            // CELL.TIME
+            {
+                psTime *time = psTimeAlloc(PS_TIME_TAI); // Blank time
+                // Not particularly distinguishing, but should be good enough
+                time->sec = 0;
+                time->nsec = 0;
+                psMetadataItem *cellTime = psMetadataItemAlloc("CELL.TIME", PS_DATA_TIME,
+                                           "Time of exposure", time);
+                psFree(time);
+                pmConceptRegister(cellTime, (pmConceptParseFunc)pmConceptParse_CELL_TIME,
+                                  (pmConceptFormatFunc)pmConceptFormat_CELL_TIME, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellTime);
+            }
+
+            // CELL.X0
+            {
+                psMetadataItem *cellX0 = psMetadataItemAllocS32("CELL.X0", "Position of (0,0) on the chip", 0);
+                pmConceptRegister(cellX0, (pmConceptParseFunc)pmConceptParse_CELL_Positions,
+                                  (pmConceptFormatFunc)pmConceptFormat_CELL_Positions, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellX0);
+            }
+
+            // CELL.Y0
+            {
+                psMetadataItem *cellY0 = psMetadataItemAllocS32("CELL.Y0", "Position of (0,0) on the chip", 0);
+                pmConceptRegister(cellY0, (pmConceptParseFunc)pmConceptParse_CELL_Positions,
+                                  (pmConceptFormatFunc)pmConceptFormat_CELL_Positions, PM_CONCEPT_LEVEL_CELL);
+                psFree(cellY0);
+            }
+
         }
 
-        // FPA.POSANGLE
-        {
-            psMetadataItem *fpaPosangle = psMetadataItemAllocF32("FPA.POSANGLE",
-                                          "Position angle of instrument", 0.0);
-            pmConceptRegister(fpaPosangle, NULL, NULL, PM_CONCEPT_LEVEL_FPA);
-            psFree(fpaPosangle);
-        }
-
-        // FPA.RADECSYS
-        {
-            psMetadataItem *fpaRadecsys = psMetadataItemAllocStr("FPA.RADECSYS",
-                                          "Celestial coordinate system", "");
-            pmConceptRegister(fpaRadecsys, NULL, NULL, PM_CONCEPT_LEVEL_FPA);
-            psFree(fpaRadecsys);
-        }
-
-        // FPA.RA
-        {
-            psMetadataItem *fpaRa = psMetadataItemAllocF64("FPA.RA", "Right Ascension of boresight", NAN);
-            pmConceptRegister(fpaRa, (pmConceptParseFunc)pmConceptParse_FPA_Coords,
-                              (pmConceptFormatFunc)pmConceptFormat_FPA_Coords, PM_CONCEPT_LEVEL_FPA);
-            psFree(fpaRa);
-        }
-
-        // FPA.DEC
-        {
-            psMetadataItem *fpaDec = psMetadataItemAllocF64("FPA.DEC", "Declination of boresight", NAN);
-            pmConceptRegister(fpaDec, (pmConceptParseFunc)pmConceptParse_FPA_Coords,
-                              (pmConceptFormatFunc)pmConceptFormat_FPA_Coords, PM_CONCEPT_LEVEL_FPA);
-            psFree(fpaDec);
-        }
-
-        // Done with FPA level concepts
-    }
-    if (! conceptsChip) {
-        conceptsChip = psMetadataAlloc();
-        init = true;
-        // There are no standard concepts at the chip level to be installed
-    }
-    if (! conceptsCell) {
-        conceptsCell = psMetadataAlloc();
-        init = true;
-
-        // Install the standard concepts
-
-        // CELL.GAIN
-        {
-            psMetadataItem *cellGain = psMetadataItemAllocF32("CELL.GAIN", "CCD gain (e/count)", NAN);
-            pmConceptRegister(cellGain, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellGain);
-        }
-
-        // CELL.READNOISE
-        {
-            psMetadataItem *cellReadnoise = psMetadataItemAllocF32("CELL.READNOISE",
-                                            "CCD read noise (e)", NAN);
-            pmConceptRegister(cellReadnoise, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellReadnoise);
-        }
-
-        // CELL.SATURATION
-        {
-            psMetadataItem *cellSaturation = psMetadataItemAllocF32("CELL.SATURATION",
-                                             "Saturation level (counts)", NAN);
-            pmConceptRegister(cellSaturation, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellSaturation);
-        }
-
-        // CELL.BAD
-        {
-            psMetadataItem *cellBad = psMetadataItemAllocF32("CELL.BAD", "Bad level (counts)", NAN);
-            pmConceptRegister(cellBad, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellBad);
-        }
-
-        // CELL.XPARITY
-        {
-            psMetadataItem *cellXparity = psMetadataItemAllocS32("CELL.XPARITY",
-                                          "Orientation in x compared to the rest of the FPA", 0);
-            pmConceptRegister(cellXparity, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellXparity);
-        }
-
-        // CELL.YPARITY
-        {
-            psMetadataItem *cellYparity = psMetadataItemAllocS32("CELL.YPARITY",
-                                          "Orientation in x compared to the rest of the FPA", 0);
-            pmConceptRegister(cellYparity, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellYparity);
-        }
-
-        // CELL.READDIR
-        {
-            psMetadataItem *cellReaddir = psMetadataItemAllocS32("CELL.READDIR",
-                                          "Read direction, rows=1, cols=2", 1);
-            pmConceptRegister(cellReaddir, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellReaddir);
-        }
-
-
-        // These (CELL.EXPOSURE and CELL.DARKTIME) used to be READOUT.EXPOSURE and READOUT.DARKTIME, but that
-        // doesn't really make sense at the moment.  Maybe we need to add a "parent" link to the readouts.
-        // But then how are the exposure times REALLY derived?  They're not in the FITS headers, because a
-        // readout is a plane in a 3D image.  We'll have to dream up some additional suffix to specify these,
-        // but for now....
-
-        // CELL.EXPOSURE
-        {
-            psMetadataItem *cellExposure = psMetadataItemAllocF32("CELL.EXPOSURE",
-                                           "Exposure time (sec)", NAN);
-            pmConceptRegister(cellExposure, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellExposure);
-        }
-
-        // CELL.DARKTIME
-        {
-            psMetadataItem *cellDarktime = psMetadataItemAllocF32("CELL.DARKTIME",
-                                           "Time since flush (sec)", NAN);
-            pmConceptRegister(cellDarktime, NULL, NULL, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellDarktime);
-        }
-
-        // CELL.TRIMSEC
-        {
-            psRegion *trimsec = psAlloc(sizeof(psRegion)); // Blank trimsec
-            trimsec->x0 = trimsec->y0 = trimsec->x1 = trimsec->y1 = NAN;
-            psMetadataItem *cellTrimsec = psMetadataItemAllocPtr("CELL.TRIMSEC", PS_DATA_UNKNOWN,
-                                          "Trim section", trimsec);
-            psFree(trimsec);
-            pmConceptRegister(cellTrimsec, (pmConceptParseFunc)pmConceptParse_CELL_TRIMSEC,
-                              (pmConceptFormatFunc)pmConceptFormat_CELL_TRIMSEC, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellTrimsec);
-        }
-
-        // CELL.BIASSEC
-        {
-            psList *biassecs = psListAlloc(NULL); // Blank biassecs
-            psMetadataItem *cellBiassec = psMetadataItemAllocPtr("CELL.BIASSEC", PS_DATA_LIST,
-                                          "Bias sections", biassecs);
-            psFree(biassecs);
-            pmConceptRegister(cellBiassec, (pmConceptParseFunc)pmConceptParse_CELL_BIASSEC,
-                              (pmConceptFormatFunc)pmConceptFormat_CELL_BIASSEC, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellBiassec);
-        }
-
-        // CELL.XBIN
-        {
-            psMetadataItem *cellXbin = psMetadataItemAllocS32("CELL.XBIN", "Binning in x", 0);
-            pmConceptRegister(cellXbin, (pmConceptParseFunc)pmConceptParse_CELL_Binning,
-                              (pmConceptFormatFunc)pmConceptFormat_CELL_XBIN, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellXbin);
-        }
-
-        // CELL.YBIN
-        {
-            psMetadataItem *cellYbin = psMetadataItemAllocS32("CELL.YBIN", "Binning in y", 0);
-            pmConceptRegister(cellYbin, (pmConceptParseFunc)pmConceptParse_CELL_Binning,
-                              (pmConceptFormatFunc)pmConceptFormat_CELL_YBIN, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellYbin);
-        }
-
-        // CELL.TIMESYS
-        {
-            psMetadataItem *cellTimesys = psMetadataItemAllocS32("CELL.TIMESYS", "Time system", -1);
-            pmConceptRegister(cellTimesys, (pmConceptParseFunc)pmConceptParse_CELL_TIMESYS,
-                              (pmConceptFormatFunc)pmConceptFormat_CELL_TIMESYS, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellTimesys);
-        }
-
-        // CELL.TIME
-        {
-            psTime *time = psTimeAlloc(PS_TIME_TAI); // Blank time
-            // Not particularly distinguishing, but should be good enough
-            time->sec = 0;
-            time->nsec = 0;
-            psMetadataItem *cellTime = psMetadataItemAlloc("CELL.TIME", PS_DATA_TIME,
-                                       "Time of exposure", time);
-            psFree(time);
-            pmConceptRegister(cellTime, (pmConceptParseFunc)pmConceptParse_CELL_TIME,
-                              (pmConceptFormatFunc)pmConceptFormat_CELL_TIME, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellTime);
-        }
-
-        // CELL.X0
-        {
-            psMetadataItem *cellX0 = psMetadataItemAllocS32("CELL.X0", "Position of (0,0) on the chip", 0);
-            pmConceptRegister(cellX0, (pmConceptParseFunc)pmConceptParse_CELL_Positions,
-                              (pmConceptFormatFunc)pmConceptFormat_CELL_Positions, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellX0);
-        }
-
-        // CELL.Y0
-        {
-            psMetadataItem *cellY0 = psMetadataItemAllocS32("CELL.Y0", "Position of (0,0) on the chip", 0);
-            pmConceptRegister(cellY0, (pmConceptParseFunc)pmConceptParse_CELL_Positions,
-                              (pmConceptFormatFunc)pmConceptFormat_CELL_Positions, PM_CONCEPT_LEVEL_CELL);
-            psFree(cellY0);
-        }
-
-    }
-
-    conceptsInitialised = true;
-
-    return init;
-}
-
-void pmConceptsDone(void)
-{
-    psFree(conceptsFPA);
-    psFree(conceptsChip);
-    psFree(conceptsCell);
-}
-
-
-// Copy concepts from one FPA to another
-bool pmFPACopyConcepts(pmFPA *target,   // The target FPA
-                       pmFPA *source    // The target FPA
-                      )
-{
-    // Copy FPA concepts
-    target->concepts = psMetadataCopy(target->concepts, source->concepts);
-
-    // 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 (%d) and source (%d) 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;
-        }
-        targetChip->concepts = psMetadataCopy(targetChip->concepts, sourceChip->concepts);
-
-        // 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 (%d) and source (%d) differ for chip %d ---"
-                    " unable to copy concepts.\n", targetCells->n, sourceCells->n, i);
+        conceptsInitialised = true;
+
+        return init;
+    }
+
+    void pmConceptsDone(void) {
+        psFree(conceptsFPA);
+        psFree(conceptsChip);
+        psFree(conceptsCell);
+    }
+
+
+    // Copy concepts from one FPA to another
+    bool pmFPACopyConcepts(pmFPA *target,   // The target FPA
+                           pmFPA *source    // The target FPA
+                          ) {
+        // Copy FPA concepts
+        target->concepts = psMetadataCopy(target->concepts, source->concepts);
+
+        // 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 (%d) and source (%d) differ --- unable to copy "
+                    "concepts.\n", targetChips->n, sourceChips->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) {
+        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;
             }
-            targetCell->concepts = psMetadataCopy(targetCell->concepts, sourceCell->concepts);
+            targetChip->concepts = psMetadataCopy(targetChip->concepts, sourceChip->concepts);
+
+            // 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 (%d) and source (%d) 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;
+                }
+                targetCell->concepts = psMetadataCopy(targetCell->concepts, sourceCell->concepts);
+            }
         }
-    }
-
-    return true;
-}
+
+        return true;
+    }