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

Timestamp:

Mar 10, 2006, 5:20:10 PM (20 years ago)

Author:

Paul Price

Message:

Changing concepts to only get stuff as the source becomes available; nearly done

File:

• branches/rel10_ifa/psModules/src/astrom/pmConcepts.c (modified) (29 diffs)

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

@@ -23 +23 @@
 
 pmConceptSpec *pmConceptSpecAlloc(psMetadataItem *blank, // Blank value; contains the name
-                                  pmConceptReadFunc read, // Function to call to read the concept
-                                  pmConceptWriteFunc write // Function to call to write the concept
+                                  pmConceptParseFunc parse, // Function to call to parse the concept
+                                  pmConceptFormatFunc format // Function to call to format the concept
                                  )
 {
@@ -31 +31 @@
 
     spec->blank = psMemIncrRefCounter(blank);
-    spec->read = read;
-    spec->write = write;
+    spec->parse = parse;
+    spec->format = format;
 
     return spec;
@@ -39 +39 @@
 
 bool pmConceptRegister(psMetadataItem *blank, // Blank value; contains the name
-                       pmConceptReadFunc read, // Function to call to read the concept
-                       pmConceptWriteFunc write, // Function to call to write the concept
+                       pmConceptParseFunc parse, // Function to call to parse the concept
+                       pmConceptFormatFunc format, // Function to call to format the concept
                        pmConceptLevel level // Level at which to store concept in the FPA hierarchy
                       )
@@ -49 +49 @@
     }
 
-    pmConceptSpec *spec = pmConceptSpecAlloc(blank, read, write); // The concept specification
+    pmConceptSpec *spec = pmConceptSpecAlloc(blank, parse, format); // The concept specification
     psMetadata **target = NULL;         // The metadata of known concepts to write to
     switch (level) {
@@ -74 +74 @@
 }
 
-// This function gets called for the really boring concepts --- where all you have to do is read from a header
-// or database and you don't need to muck around with conversions.
-// There is no similar "writePlain", since the type is already known.
-static psMetadataItem *readPlain(psMetadataItem *blank, // The blank value with name, comment, type
-                                 pmFPA *fpa, // The FPA of interest
-                                 pmChip *chip, // The Chip of interest
-                                 pmCell *cell, // The cell of interest
-                                 psDB *db // Database handle
-                                )
-{
-    switch (blank->type) {
-    case PS_DATA_STRING: {
-            psString string = pmConceptReadString(fpa, chip, cell, db, blank->name);
-            psMetadataItem *item = psMetadataItemAllocStr(blank->name, blank->comment, string);
-            psFree(string);
-            return item;
-        }
-    case PS_DATA_S32:
-        return psMetadataItemAllocS32(blank->name, blank->comment,
-                                      pmConceptReadS32(fpa, chip, cell, db, blank->name));
-    case PS_DATA_F32:
-        return psMetadataItemAllocF32(blank->name, blank->comment,
-                                      pmConceptReadF32(fpa, chip, cell, db, blank->name));
-    case PS_DATA_F64:
-        return psMetadataItemAllocF64(blank->name, blank->comment,
-                                      pmConceptReadF64(fpa, chip, cell, db, blank->name));
-    default:
-        psLogMsg(__func__, PS_LOG_WARN, "Concept %s (%s) is not of a standard type (%x)\n",
-                 blank->name, blank->comment, blank->type);
-    }
-    return NULL;
-}
 
 // Set all registered concepts to blank value for the specified level
-static bool conceptsBlank(psMetadata **specs,  // One of the concepts specifications
+static bool conceptsBlank(psMetadata *specs,  // One of the concepts specifications
                           psMetadata *target // Place to install the concepts
                          )
@@ -128 +96 @@
 }
 
+
+
 // Read all registered concepts for the specified level
-static bool conceptsRead(psMetadata **specs, // One of the concepts specifications
+static bool conceptsRead(psMetadata *specs, // One of the concepts specifications
                          pmFPA *fpa,    // The FPA
                          pmChip *chip,  // The chip
                          pmCell *cell,  // The cell
+                         pmConceptSource source, // The source of the concepts to read
                          psDB *db,      // Database handle
                          psMetadata *target // Place into which to read the concepts
@@ -140 +111 @@
         pmConceptsInit();
     }
-    psMetadataIterator *specsIter = psMetadataIteratorAlloc(*specs, PS_LIST_HEAD, NULL); // Iterator on specs
-    psMetadataItem *specItem = NULL;    // Item from the specs metadata
-    while ((specItem = psMetadataGetAndIncrement(specsIter))) {
-        pmConceptSpec *spec = specItem->data.V; // The specification
-        psMetadataItem *conceptItem = NULL; // The item to add to the concepts
-        if (spec->read) {
-            conceptItem = spec->read(fpa, chip, cell, db);
-        } else {
-            conceptItem = readPlain(spec->blank, fpa, chip, cell, db);
-            if (conceptItem->type != spec->blank->type) {
-                psLogMsg(__func__, PS_LOG_ERROR, "Type of concept %s following read (%x) does not match "
-                         "blank type (%x).\n", spec->blank->name, conceptItem->type, spec->blank->type);
-            }
-        }
-        if (conceptItem) {
-            psMetadataAddItem(target, conceptItem, PS_LIST_TAIL, PS_META_REPLACE);
-            psFree(conceptItem);        // Drop reference
-        }
-        // No error if conceptItem is NULL, since that may only mean that the required information isn't
-        // present yet.
-    }
-    psFree(specsIter);
+
+    if (source & PM_CONCEPT_SOURCE_CAMERA || source == PM_CONCEPT_SOURCE_ALL) {
+        pmConceptsReadFromCamera(specs, cell, target);
+    }
+    if (source & PM_CONCEPT_SOURCE_DEFAULTS || source == PM_CONCEPT_SOURCE_ALL) {
+        pmConceptsReadFromDefaults(specs, fpa, chip, cell, target);
+    }
+    if (source & PM_CONCEPT_SOURCE_HEADER || source == PM_CONCEPT_SOURCE_ALL) {
+        pmConceptsReadFromHeader(specs, fpa, chip, cell, target);
+    }
+    if (source & PM_CONCEPT_SOURCE_DATABASE || source == PM_CONCEPT_SOURCE_ALL) {
+        pmConceptsReadFromHeader(specs, fpa, chip, cell, db, target);
+    }
+
     return true;
 }
 
 // Write all registered concepts for the specified level
-static bool conceptsWrite(psMetadata **specs, // One of the concepts specifications
+static bool conceptsWrite(psMetadata *specs, // One of the concepts specifications
                           pmFPA *fpa,   // The FPA
                           pmChip *chip, // The chip
                           pmCell *cell, // The cell
+                          pmConceptSource source, // The source of the concepts to write
                           psDB *db,      // Database handle
-                          psMetadata *source // The concepts to write out
+                          psMetadata *concepts // The concepts to write out
                          )
 {
@@ -177 +141 @@
         pmConceptsInit();
     }
-    if (! fpa->camera) {
-        return false;
-    }
-    psMetadataIterator *iter = psMetadataIteratorAlloc(source, PS_LIST_HEAD, NULL); // Iterator on concepts
-    psMetadataItem *item = NULL;    // Item from the concepts
-    while ((item = psMetadataGetAndIncrement(iter))) {
-        const char *name = item->name;  // Name of the concept
-        if (!strcmp(name, "CELL.NAME") || !strcmp(name, "CHIP.NAME")) {
-            // These concepts are not written out; they are set from things like the FITS extname
-            continue;
-        }
-        psMetadataItem *specItem = psMetadataLookup(*specs, name); // Specification for the concept
-        if (specItem) {
-            pmConceptSpec *spec = specItem->data.V; // The specification
-            if (spec->write) {
-                spec->write(fpa, chip, cell, db); // The concept
-            } else {
-                pmConceptWrite(fpa, chip, cell, db, source, spec->blank->name);
-            }
-        } else {
-            psLogMsg(__func__, PS_LOG_WARN, "Unable to find specification to write concept %s in FPA\n",
-                     name);
-        }
-    }
-    psFree(iter);
+
+    if (source & PM_CONCEPT_SOURCE_CAMERA || source == PM_CONCEPT_SOURCE_ALL) {
+        pmConceptsWriteToCamera(specs, cell, concepts);
+    }
+    if (source & PM_CONCEPT_SOURCE_DEFAULTS || source == PM_CONCEPT_SOURCE_ALL) {
+        pmConceptsWriteToDefaults(specs, fpa, chip, cell, concepts);
+    }
+    if (source & PM_CONCEPT_SOURCE_HEADER || source == PM_CONCEPT_SOURCE_ALL) {
+        pmConceptsWriteToHeader(specs, fpa, chip, cell, concepts);
+    }
+    if (source & PM_CONCEPT_SOURCE_DATABASE || source == PM_CONCEPT_SOURCE_ALL) {
+        pmConceptsWriteToHeader(specs, fpa, chip, cell, db, concepts);
+    }
 
     return true;
 }
+
 
 // Set the concepts for a given FPA to blanks
@@ -211 +164 @@
 {
     psTrace("psModule.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
-    return conceptsBlank(&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, db, fpa->concepts);
+    return conceptsRead(conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
 }
 
@@ -229 +183 @@
 {
     psTrace("psModule.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
-    return conceptsWrite(&conceptsFPA, fpa, NULL, NULL, db, fpa->concepts);
+    return conceptsWrite(conceptsFPA, fpa, NULL, NULL, db, fpa->concepts);
 }
 
@@ -237 +191 @@
 {
     psTrace("psModule.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
-    return conceptsBlank(&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
                        )
@@ -247 +202 @@
     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, db, chip->concepts);
+    return conceptsRead(conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
 }
 
@@ -257 +212 @@
     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, db, chip->concepts);
+    return conceptsWrite(conceptsChip, fpa, chip, NULL, db, chip->concepts);
 }
 
@@ -265 +220 @@
 {
     psTrace("psModule.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
-    return conceptsBlank(&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
                        )
@@ -276 +232 @@
     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, db, cell->concepts);
+    return conceptsRead(conceptsCell, fpa, chip, cell, source, db, cell->concepts);
 }
 
@@ -287 +243 @@
     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, db, cell->concepts);
+    return conceptsWrite(conceptsCell, fpa, chip, cell, db, cell->concepts);
 }
 
@@ -300 +256 @@
         // Install the standard concepts
 
+        #if 0
         // FPA.NAME
         {
@@ -306 +263 @@
             psFree(fpaName);
         }
+        #endif
 
         // FPA.AIRMASS
@@ -340 +298 @@
         {
             psMetadataItem *fpaRa = psMetadataItemAllocF64("FPA.RA", "Right Ascension of boresight", NAN);
-            pmConceptRegister(fpaRa, (pmConceptReadFunc)pmConceptRead_FPA_RA,
-                              (pmConceptWriteFunc)pmConceptWrite_FPA_RA, PM_CONCEPT_LEVEL_FPA);
+            pmConceptRegister(fpaRa, (pmConceptParseFunc)pmConceptParse_FPA_Coords,
+                              (pmConceptFormatFunc)pmConceptFormat_FPA_Coords, PM_CONCEPT_LEVEL_FPA);
             psFree(fpaRa);
         }
@@ -348 +306 @@
         {
             psMetadataItem *fpaDec = psMetadataItemAllocF64("FPA.DEC", "Declination of boresight", NAN);
-            pmConceptRegister(fpaDec, (pmConceptReadFunc)pmConceptRead_FPA_DEC,
-                              (pmConceptWriteFunc)pmConceptWrite_FPA_DEC, PM_CONCEPT_LEVEL_FPA);
+            pmConceptRegister(fpaDec, (pmConceptParseFunc)pmConceptParse_FPA_Coords,
+                              (pmConceptFormatFunc)pmConceptFormat_FPA_Coords, PM_CONCEPT_LEVEL_FPA);
             psFree(fpaDec);
         }
@@ -436 +394 @@
 
         // CELL.DARKTIME
-        {
+        {Read
             psMetadataItem *cellDarktime = psMetadataItemAllocF32("CELL.DARKTIME",
                                            "Time since flush (sec)", NAN);
@@ -450 +408 @@
                                           "Trim section", trimsec);
             psFree(trimsec);
-            pmConceptRegister(cellTrimsec, (pmConceptReadFunc)pmConceptRead_CELL_TRIMSEC,
-                              (pmConceptWriteFunc)pmConceptWrite_CELL_TRIMSEC, PM_CONCEPT_LEVEL_CELL);
+            pmConceptRegister(cellTrimsec, (pmConceptParseFunc)pmConceptParse_CELL_TRIMSEC,
+                              (pmConceptFormatFunc)pmConceptFormat_CELL_TRIMSEC, PM_CONCEPT_LEVEL_CELL);
             psFree(cellTrimsec);
         }
@@ -461 +419 @@
                                           "Bias sections", biassecs);
             psFree(biassecs);
-            pmConceptRegister(cellBiassec, (pmConceptReadFunc)pmConceptRead_CELL_BIASSEC,
-                              (pmConceptWriteFunc)pmConceptWrite_CELL_BIASSEC, PM_CONCEPT_LEVEL_CELL);
+            pmConceptRegister(cellBiassec, (pmConceptParseFunc)pmConceptParse_CELL_BIASSEC,
+                              (pmConceptFormatFunc)pmConceptFormat_CELL_BIASSEC, PM_CONCEPT_LEVEL_CELL);
             psFree(cellBiassec);
         }
@@ -469 +427 @@
         {
             psMetadataItem *cellXbin = psMetadataItemAllocS32("CELL.XBIN", "Binning in x", 0);
-            pmConceptRegister(cellXbin, (pmConceptReadFunc)pmConceptRead_CELL_XBIN,
-                              (pmConceptWriteFunc)pmConceptWrite_CELL_XBIN, PM_CONCEPT_LEVEL_CELL);
+            pmConceptRegister(cellXbin, (pmConceptParseFunc)pmConceptParse_CELL_Binning,
+                              (pmConceptFormatFunc)pmConceptFormat_CELL_Binning, PM_CONCEPT_LEVEL_CELL);
             psFree(cellXbin);
         }
@@ -477 +435 @@
         {
             psMetadataItem *cellYbin = psMetadataItemAllocS32("CELL.YBIN", "Binning in y", 0);
-            pmConceptRegister(cellYbin, (pmConceptReadFunc)pmConceptRead_CELL_YBIN,
-                              (pmConceptWriteFunc)pmConceptWrite_CELL_YBIN, PM_CONCEPT_LEVEL_CELL);
+            pmConceptRegister(cellYbin, (pmConceptParseFunc)pmConceptParse_CELL_Binning,
+                              (pmConceptFormatFunc)pmConceptFormat_CELL_Binning, PM_CONCEPT_LEVEL_CELL);
             psFree(cellYbin);
         }
@@ -485 +443 @@
         {
             psMetadataItem *cellTimesys = psMetadataItemAllocS32("CELL.TIMESYS", "Time system", -1);
-            pmConceptRegister(cellTimesys, (pmConceptReadFunc)pmConceptRead_CELL_TIMESYS,
-                              (pmConceptWriteFunc)pmConceptWrite_CELL_TIMESYS, PM_CONCEPT_LEVEL_CELL);
+            pmConceptRegister(cellTimesys, (pmConceptParseFunc)pmConceptParse_CELL_TIMESYS,
+                              (pmConceptFormatFunc)pmConceptFormat_CELL_TIMESYS, PM_CONCEPT_LEVEL_CELL);
             psFree(cellTimesys);
         }
@@ -499 +457 @@
                                        "Time of exposure", time);
             psFree(time);
-            pmConceptRegister(cellTime, (pmConceptReadFunc)pmConceptRead_CELL_TIME,
-                              (pmConceptWriteFunc)pmConceptWrite_CELL_TIME, PM_CONCEPT_LEVEL_CELL);
+            pmConceptRegister(cellTime, (pmConceptParseFunc)pmConceptParse_CELL_TIME,
+                              (pmConceptFormatFunc)pmConceptFormat_CELL_TIME, PM_CONCEPT_LEVEL_CELL);
             psFree(cellTime);
         }
@@ -507 +465 @@
         {
             psMetadataItem *cellX0 = psMetadataItemAllocS32("CELL.X0", "Position of (0,0) on the chip", 0);
-            pmConceptRegister(cellX0, (pmConceptReadFunc)pmConceptRead_CELL_X0,
-                              (pmConceptWriteFunc)pmConceptWrite_CELL_X0, PM_CONCEPT_LEVEL_CELL);
+            pmConceptRegister(cellX0, (pmConceptParseFunc)pmConceptParse_CELL_Positions,
+                              (pmConceptFormatFunc)pmConceptFormat_CELL_Positions, PM_CONCEPT_LEVEL_CELL);
             psFree(cellX0);
         }
@@ -515 +473 @@
         {
             psMetadataItem *cellY0 = psMetadataItemAllocS32("CELL.Y0", "Position of (0,0) on the chip", 0);
-            pmConceptRegister(cellY0, (pmConceptReadFunc)pmConceptRead_CELL_Y0,
-                              (pmConceptWriteFunc)pmConceptWrite_CELL_Y0, PM_CONCEPT_LEVEL_CELL);
+            pmConceptRegister(cellY0, (pmConceptParseFunc)pmConceptParse_CELL_Positions,
+                              (pmConceptFormatFunc)pmConceptFormat_CELL_Positions, PM_CONCEPT_LEVEL_CELL);
             psFree(cellY0);
         }