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

Timestamp:

Mar 13, 2006, 4:23:40 PM (20 years ago)

Author:

Paul Price

Message:

Getting code to compile; adding concept read to fpa construction and reading

File:

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

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

@@ -83 +83 @@
         pmConceptsInit();
     }
-    psMetadataIterator *specsIter = psMetadataIteratorAlloc(*specs, PS_LIST_HEAD, NULL); // Iterator on specs
+    psMetadataIterator *specsIter = psMetadataIteratorAlloc(specs, PS_LIST_HEAD, NULL); // Iterator on specs
     psMetadataItem *specItem = NULL;    // Item from the specs metadata
     while ((specItem = psMetadataGetAndIncrement(specsIter))) {
@@ -122 +122 @@
     }
     if (source & PM_CONCEPT_SOURCE_DATABASE || source == PM_CONCEPT_SOURCE_ALL) {
-        pmConceptsReadFromHeader(specs, fpa, chip, cell, db, target);
+        pmConceptsReadFromDatabase(specs, fpa, chip, cell, db, target);
     }
 
@@ -152 +152 @@
     }
     if (source & PM_CONCEPT_SOURCE_DATABASE || source == PM_CONCEPT_SOURCE_ALL) {
-        pmConceptsWriteToHeader(specs, fpa, chip, cell, db, concepts);
+        pmConceptsWriteToDatabase(specs, fpa, chip, cell, db, concepts);
     }
 
@@ -179 +179 @@
 // 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, db, fpa->concepts);
+    return conceptsWrite(conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
 }
 
@@ -207 +208 @@
 // 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
                         )
@@ -212 +214 @@
     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, source, db, chip->concepts);
 }
 
@@ -237 +239 @@
 // 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
                         )
@@ -243 +246 @@
     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, source, db, cell->concepts);
 }
 
@@ -394 +397 @@
 
         // CELL.DARKTIME
-        {Read
+        {
             psMetadataItem *cellDarktime = psMetadataItemAllocF32("CELL.DARKTIME",
                                            "Time since flush (sec)", NAN);
@@ -428 +431 @@
             psMetadataItem *cellXbin = psMetadataItemAllocS32("CELL.XBIN", "Binning in x", 0);
             pmConceptRegister(cellXbin, (pmConceptParseFunc)pmConceptParse_CELL_Binning,
-                              (pmConceptFormatFunc)pmConceptFormat_CELL_Binning, PM_CONCEPT_LEVEL_CELL);
+                              (pmConceptFormatFunc)pmConceptFormat_CELL_XBIN, PM_CONCEPT_LEVEL_CELL);
             psFree(cellXbin);
         }
@@ -436 +439 @@
             psMetadataItem *cellYbin = psMetadataItemAllocS32("CELL.YBIN", "Binning in y", 0);
             pmConceptRegister(cellYbin, (pmConceptParseFunc)pmConceptParse_CELL_Binning,
-                              (pmConceptFormatFunc)pmConceptFormat_CELL_Binning, PM_CONCEPT_LEVEL_CELL);
+                              (pmConceptFormatFunc)pmConceptFormat_CELL_YBIN, PM_CONCEPT_LEVEL_CELL);
             psFree(cellYbin);
         }