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

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

@@ -13 +13 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.11.2.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-12-17 03:18:38 $
+*  @version $Revision: 1.11.2.1.2.1 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-01-14 03:10:19 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25 +25 @@
 #include <math.h>
 #include "pslib.h"
+
 #include "pmAstrometry.h"
+#include "pmConcepts.h"
 
 /*****************************************************************************
@@ -201 +203 @@
         chip->cells = psArrayAdd(chip->cells, 1, (psPtr) tmpCell);
     }
-    tmpCell->valid = true;              // All cells are valid by default
+    tmpCell->process = true;            // All cells are processed by default
+    tmpCell->exists = false;            // Not yet read in
     tmpCell->hdu = NULL;
+
+    pmConceptsBlankCell(tmpCell);
 
     psMemSetDeallocator(tmpCell, (psFreeFunc) cellFree);
@@ -231 +236 @@
         fpa->chips = psArrayAdd(fpa->chips, 1, (psPtr) tmpChip);
     }
-    tmpChip->valid = true;              // Work on all chips, by default
+    tmpChip->process = true;            // Work on all chips, by default
+    tmpChip->exists = false;            // Not read in yet
     tmpChip->hdu = NULL;
+
+    pmConceptsBlankChip(tmpChip);
 
     psMemSetDeallocator(tmpChip, (psFreeFunc) chipFree);
@@ -251 +259 @@
     tmpFPA->hdu = NULL;
     tmpFPA->phu = NULL;
+
+    pmConceptsBlankFPA(tmpFPA);
 
     psMemSetDeallocator(tmpFPA, (psFreeFunc) FPAFree);
@@ -817 +827 @@
  *****************************************************************************/
 
-// Set cells within a chip to a specified validity
-static bool setCellsValid(const pmChip *chip, // Chip of interest
-                          bool valid    // Valid?
-                         )
+// Set cells within a chip to be processed or not
+static bool setCellsProcess(const pmChip *chip, // Chip of interest
+                            bool process  // Process this chip?
+                           )
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
@@ -831 +841 @@
         pmCell *tmpCell = cells->data[i]; // Cell of interest
         if (tmpCell) {
-            tmpCell->valid = valid;
+            tmpCell->process = process;
         }
     }
@@ -857 +867 @@
         }
         if (i == chipNum) {
-            tmpChip->valid = true;
-            setCellsValid(tmpChip, true);
+            tmpChip->process = true;
+            setCellsProcess(tmpChip, true);
         } else {
-            tmpChip->valid = false;
-            setCellsValid(tmpChip, false);
+            tmpChip->process = false;
+            setCellsProcess(tmpChip, false);
         }
 
@@ -872 +882 @@
 /*****************************************************************************
 XXX: The SDRS is ambiguous on a few things:
-    Whether or not the other chips should be set valid=true. [PAP: No]
-    Should we return the number of chip valid=true before or after they're set, [PAP: After]
+    Whether or not the other chips should be set process=true. [PAP: No]
+    Should we return the number of chip process=true before or after they're set, [PAP: After]
  *****************************************************************************/
 /**
  *
- * pmFPAExcludeChip shall set valid to false only for the specified chip
+ * pmFPAExcludeChip shall set process to false only for the specified chip
  * number (chipNum). In the event that the specified chip number does not exist
  * within the fpa, the function shall generate a warning, and perform no action.
- * The function shall return the number of chips within the fpa that have valid
+ * The function shall return the number of chips within the fpa that have process
  * set to true.
  *
@@ -900 +910 @@
     }
 
-    int numChips = 0;                   // Number of valid chips
+    int numChips = 0;                   // Number of chips to be processed
     for (int i = 0 ; i < chips->n ; i++) {
         pmChip *tmpChip = (pmChip *) chips->data[i]; // Chip of interest
         if (tmpChip != NULL) {
             if (i == chipNum) {
-                tmpChip->valid = false;
-                setCellsValid(tmpChip, false); // Wipe out the cell as well
-            } else if (tmpChip->valid) {
+                tmpChip->process = false;
+                setCellsProcess(tmpChip, false); // Wipe out the cell as well
+            } else if (tmpChip->process) {
                 numChips++;
             }