Changeset 18260

Timestamp:

Jun 20, 2008, 7:40:25 PM (18 years ago)

Author:

eugene

Message:

call pmConceptsBlank... if needed (conceptsRead is SOURCE_NONE); added PM_CONCEPT_SOURCE_BLANK

Location:

branches/eam_branch_20080620/psModules/src/concepts

Files:

• pmConcepts.c (modified) (2 diffs)
• pmConcepts.h (modified) (2 diffs)

branches/eam_branch_20080620/psModules/src/concepts/pmConcepts.c

@@ -191 +191 @@
 // Read all registered concepts for the specified level
 static bool conceptsRead(psMetadata **specs, // One of the concepts specifications
-                         const pmFPA *fpa,    // The FPA
-                         const pmChip *chip,  // The chip
-                         const pmCell *cell, // The cell
+                         pmFPA *fpa,    // The FPA
+                         pmChip *chip,  // The chip
+                         pmCell *cell, // The cell
                          unsigned int *read,     // What's already been read
                          pmConceptSource source, // The source of the concepts to read
@@ -215 +215 @@
     }
     pmHDU *hduHigh = pmHDUGetHighest(fpa, chip, cell); // Highest HDU
+
+    if (cell && (cell->conceptsRead == PM_CONCEPT_SOURCE_NONE)) {
+        pmConceptsBlankCell(cell);
+        cell->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
+    }
+    if (chip && (chip->conceptsRead == PM_CONCEPT_SOURCE_NONE)) {
+        pmConceptsBlankChip(chip);
+        chip->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
+    }
+    if (fpa && (fpa->conceptsRead == PM_CONCEPT_SOURCE_NONE)) {
+        pmConceptsBlankFPA(fpa);
+        fpa->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
+    }
 
     bool success = true;                // Success in reading concepts?

branches/eam_branch_20080620/psModules/src/concepts/pmConcepts.h

@@ -4 +4 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-06-17 22:16:38 $
+ * @version $Revision: 1.18.4.1 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-06-21 05:40:25 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -24 +24 @@
 typedef enum {
     PM_CONCEPT_SOURCE_NONE     = 0x00,  ///< No concepts
-    PM_CONCEPT_SOURCE_CELLS    = 0x01,  ///< Concept comes from the camera information
-    PM_CONCEPT_SOURCE_DEFAULTS = 0x02,  ///< Concept comes from defaults
-    PM_CONCEPT_SOURCE_PHU      = 0x04,  ///< Concept comes from PHU
-    PM_CONCEPT_SOURCE_HEADER   = 0x08,  ///< Concept comes from FITS header
-    PM_CONCEPT_SOURCE_DATABASE = 0x10,  ///< Concept comes from database
-    PM_CONCEPT_SOURCE_ALL      = 0xff   ///< All concepts
+    PM_CONCEPT_SOURCE_BLANK    = 0x01,  ///< Blank concepts defined, but not read
+    PM_CONCEPT_SOURCE_CELLS    = 0x02,  ///< Concept comes from the camera information
+    PM_CONCEPT_SOURCE_DEFAULTS = 0x04,  ///< Concept comes from defaults
+    PM_CONCEPT_SOURCE_PHU      = 0x08,  ///< Concept comes from PHU
+    PM_CONCEPT_SOURCE_HEADER   = 0x10,  ///< Concept comes from FITS header
+    PM_CONCEPT_SOURCE_DATABASE = 0x20,  ///< Concept comes from database
+    PM_CONCEPT_SOURCE_ALL      = 0xfe   ///< All concepts (exclude BLANK)
 } pmConceptSource;