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

Timestamp:

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

Author:

Paul Price

Message:

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

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c (modified) (7 diffs)

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

@@ -147 +147 @@
         while ((cellName = psListGetAndIncrement(cellNamesIter))) {
             pmCell *cell = pmCellAlloc(chip, cellName); // New cell
-            pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_DEFAULTS, NULL);
             psFree(cell);               // Drop reference
         }
-        pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_DEFAULTS, NULL);
         psFree(chip);                   // Drop reference
         psFree(cellNamesIter);
     }
     psFree(componentsIter);
-    pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS, NULL);
 
     return fpa;
@@ -166 +163 @@
                     pmCell *cell,       // Cell to which to add, or NULL
                     psMetadata *phu,    // Primary header of file
-                    const psMetadata *format // Format of file
+                    psMetadata *format // Format of file
                    )
 {
@@ -192 +189 @@
     pmHDU *phdu = pmHDUAlloc("PHU");    // The primary header data unit
     phdu->header = psMemIncrRefCounter(phu);
+    phdu->format = psMemIncrRefCounter(format);
     if (fpa && !fpa->hdu && strcasecmp(phuType, "FPA") == 0) {
         fpa->hdu = phdu;
+        pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, NULL);
     } else if (chip && !chip->hdu && strcasecmp(phuType, "CHIP") == 0) {
         chip->hdu = phdu;
+        pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, NULL);
     } else if (cell && !cell->hdu && strcasecmp(phuType, "CELL") == 0) {
         // cell->hdu = phdu;
@@ -244 +244 @@
             }
             cell->config = psMemIncrRefCounter(cellData);
-            pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_CAMERA, NULL);
+            pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_CAMERA | PM_CONCEPT_SOURCE_DEFAULTS, NULL);
         }
     }
@@ -295 +295 @@
                 }
                 cell->config = psMemIncrRefCounter(cellData);
-                pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_CAMERA, NULL);
+                pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_CAMERA | PM_CONCEPT_SOURCE_DEFAULTS, NULL);
             }
 
@@ -337 +337 @@
                 }
                 cell->config = psMemIncrRefCounter(cellData);
-                pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_CAMERA, NULL);
+                pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_CAMERA | PM_CONCEPT_SOURCE_DEFAULTS, NULL);
             }
 
@@ -346 +346 @@
     }
     psFree(contentsIter);
+
+    pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS, NULL);
 
     return true;