Changeset 5974 for branches/eam_rel9_p0/psModules/src/astrom/pmFPARead.c

Timestamp:

Jan 13, 2006, 5:10:19 PM (21 years ago)

Author:

Paul Price

Message:

Reworked the \'concepts\'; altered FPA hierarchy slightly

File:

• branches/eam_rel9_p0/psModules/src/astrom/pmFPARead.c (modified) (10 diffs)

branches/eam_rel9_p0/psModules/src/astrom/pmFPARead.c

@@ -4 +4 @@
 
 #include "pmAstrometry.h"
-#include "pmFPAConceptsGet.h"
 #include "pmFPARead.h"
+#include "pmConcepts.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -157 +157 @@
         }
     }
-    pmFPAIngestConcepts(fpa, db);
+    pmConceptsReadFPA(fpa, db);
 
     psArray *chips = fpa->chips;        // Array of chips
@@ -164 +164 @@
         pmChip *chip = chips->data[i]; // The chip
 
-        // Only read chips marked "valid"
-        if (! chip->valid) {
+        // Only read chips marked to "process"
+        if (! chip->process) {
             psTrace(__func__, 2, "Ignoring chip %d...\n", i);
             continue;
@@ -179 +179 @@
             }
         }
-        pmChipIngestConcepts(chip, db);
+
+        pmConceptsReadChip(chip, db);
 
         // Iterate over the chip
@@ -186 +187 @@
             pmCell *cell = cells->data[j]; // The cell
 
-            // Only read cells marked "valid"
-            if (! cell->valid) {
+            // Only read cells marked to "process"
+            if (! cell->process) {
                 psTrace(__func__, 3, "Ignoring chip %d...\n", i);
                 continue;
@@ -203 +204 @@
                 }
             }
-            pmCellIngestConcepts(cell, db);
+            pmConceptsReadCell(cell, db);
 
             psTrace(__func__, 5, "Allocating readouts for chip %d cell %d...\n",
                     i, j);
             generateReadouts(cell, hdu);
-        }
+
+            cell->exists = true;
+        }
+        chip->exists = true;
     }
 
@@ -396 +400 @@
     for (int chipNum = 0; chipNum < chips->n; chipNum++) {
         pmChip *chip = chips->data[chipNum]; // The current chip of interest
-        if (chip->valid) {
+        if (chip->process) {
             if (chip->hdu) {
                 hdu = chip->hdu;
@@ -403 +407 @@
             for (int cellNum = 0; cellNum < cells->n; cellNum++) {
                 pmCell *cell = cells->data[cellNum]; // The current cell of interest
-                if (cell->valid) {
+                if (cell->process) {
                     if (cell->hdu) {
                         hdu = cell->hdu;
@@ -534 +538 @@
     for (int chipNum = 0; chipNum < chips->n; chipNum++) {
         pmChip *chip = chips->data[chipNum]; // The current chip of interest
-        if (chip->valid) {
+        if (chip->process) {
             if (chip->hdu) {
                 hdu = chip->hdu;
@@ -541 +545 @@
             for (int cellNum = 0; cellNum < cells->n; cellNum++) {
                 pmCell *cell = cells->data[cellNum]; // The current cell of interest
-                if (cell->valid) {
+                if (cell->process) {
                     if (cell->hdu) {
                         hdu = cell->hdu;