Changeset 5974 for branches/eam_rel9_p0/psModules/src/astrom/pmFPAWrite.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/pmFPAWrite.c (modified) (7 diffs)

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

@@ -4 +4 @@
 
 #include "pmAstrometry.h"
-#include "pmFPAConceptsSet.h"
 #include "pmFPARead.h"
+#include "pmConcepts.h"
 
 static bool writeHDU(psFits *fits,      // FITS file to which to write
@@ -29 +29 @@
 
     psTrace(__func__, 7, "Outgesting FPA concepts...\n");
-    pmFPAOutgestConcepts(fpa, db);
+    pmConceptsWriteFPA(fpa, db);
 
     // Write the primary header
@@ -40 +40 @@
     for (int i = 0; i < chips->n; i++) {
         pmChip *chip = chips->data[i];  // The component chip
-        if (chip->valid) {
+        if (chip->exists && chip->process) {
             psTrace(__func__, 1, "Writing out chip %d...\n", i);
 
-            pmChipOutgestConcepts(chip, db);
+            pmConceptsWriteChip(chip, db);
 
             psArray *cells = chip->cells;       // Array of component cells
             for (int j = 0; j < cells->n; j++) {
                 pmCell *cell = cells->data[j]; // The component cell
-                if (cell->valid) {
+                if (cell->exists && cell->process) {
                     psTrace(__func__, 2, "Writing out cell, %d...\n", j);
 
-                    pmCellOutgestConcepts(cell, db);
+                    pmConceptsWriteCell(cell, db);
 
                     if (cell->hdu && strlen(cell->hdu->extname) > 0) {
@@ -107 +107 @@
     for (int chipNum = 0; chipNum < chips->n; chipNum++) {
         pmChip *chip = chips->data[chipNum]; // The current chip of interest
-        if (chip->valid) {
+        if (chip->exists && chip->process) {
             if (chip->hdu) {
                 hdu = chip->hdu;
@@ -114 +114 @@
             for (int cellNum = 0; cellNum < cells->n; cellNum++) {
                 pmCell *cell = cells->data[cellNum]; // The current cell of interest
-                if (cell->valid) {
+                if (cell->exists && cell->process) {
                     if (cell->hdu) {
                         hdu = cell->hdu;
@@ -198 +198 @@
     for (int chipNum = 0; chipNum < chips->n; chipNum++) {
         pmChip *chip = chips->data[chipNum]; // The current chip of interest
-        if (chip->valid) {
+        if (chip->exists && chip->process) {
             if (chip->hdu) {
                 hdu = chip->hdu;
@@ -205 +205 @@
             for (int cellNum = 0; cellNum < cells->n; cellNum++) {
                 pmCell *cell = cells->data[cellNum]; // The current cell of interest
-                if (cell->valid) {
+                if (cell->exists && cell->process) {
                     if (cell->hdu) {
                         hdu = cell->hdu;