Changeset 6930

Timestamp:

Apr 20, 2006, 12:30:33 PM (20 years ago)

Author:

Paul Price

Message:

Adding conceptsRead to FPA hierarchy components so that the user can tell what has been read (defaults, camera, database, header).

Location:

trunk/psModules/src/astrom

Files:

• pmFPA.c (modified) (4 diffs)
• pmFPA.h (modified) (4 diffs)

trunk/psModules/src/astrom/pmFPA.c

@@ -12 +12 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-04-19 03:24:09 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-04-20 22:30:33 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -267 +267 @@
 
     tmpCell->concepts = psMetadataAlloc();
+    tmpCell->conceptsRead = PM_CONCEPT_SOURCE_NONE;
     psBool rc = psMetadataAddStr(tmpCell->concepts, PS_LIST_HEAD, "CELL.NAME", 0, NULL, name);
     if (rc == false) {
@@ -313 +314 @@
 
     tmpChip->concepts = psMetadataAlloc();
+    tmpChip->conceptsRead = PM_CONCEPT_SOURCE_NONE;
     psBool rc = psMetadataAddStr(tmpChip->concepts, PS_LIST_HEAD, "CHIP.NAME", 0, NULL, name);
     if (rc == false) {
@@ -353 +355 @@
 
     tmpFPA->concepts = psMetadataAlloc();
+    tmpFPA->conceptsRead = PM_CONCEPT_SOURCE_NONE;
     tmpFPA->analysis = NULL;
     tmpFPA->camera = psMemIncrRefCounter((psPtr)camera);

trunk/psModules/src/astrom/pmFPA.h

@@ -7 +7 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-04-19 03:24:09 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-04-20 22:30:33 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -51 +51 @@
     // Information
     psMetadata *concepts;               ///< Cache for PS concepts
+    unsigned int conceptsRead;          ///< Which concepts have been read
     psMetadata *analysis;               ///< FPA-level analysis metadata
     const psMetadata *camera;           ///< Camera configuration
@@ -84 +85 @@
     // Information
     psMetadata *concepts;               ///< Cache for PS concepts
+    unsigned int conceptsRead;          ///< Which concepts have been read
     psMetadata *analysis;               ///< Chip-level analysis metadata
     psArray *cells;                     ///< The cells (referred to by name)
@@ -106 +108 @@
 {
     psMetadata *concepts;               ///< Cache for PS concepts
+    unsigned int conceptsRead;          ///< Which concepts have been read
     psMetadata *config;                 ///< Cell configuration info
     psMetadata *analysis;               ///< Cell-level analysis metadata