Changeset 6575 for branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.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/pmFPAConstruct.c (modified) (5 diffs)

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

@@ -4 +4 @@
 
 #include "pmFPA.h"
+#include "pmConcepts.h"
 #include "pmFPAConstruct.h"
-#include "psAdditionals.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -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;
@@ -241 +244 @@
             }
             cell->config = psMemIncrRefCounter(cellData);
+            pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_CAMERA, NULL);
         }
     }
@@ -291 +295 @@
                 }
                 cell->config = psMemIncrRefCounter(cellData);
+                pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_CAMERA, NULL);
             }
 
@@ -332 +337 @@
                 }
                 cell->config = psMemIncrRefCounter(cellData);
+                pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_CAMERA, NULL);
             }