Changeset 18364 for trunk/psModules/src/camera

Timestamp:

Jun 29, 2008, 2:53:45 PM (18 years ago)

Author:

eugene

Message:

defer construction of blank of concepts until element is used

Location:

trunk/psModules/src/camera

Files:

• pmFPA.c (modified) (4 diffs)
• pmFPAfileFitsIO.h (modified) (1 diff)
• pmFPAfileIO.h (modified) (1 diff)

trunk/psModules/src/camera/pmFPA.c

@@ -303 +303 @@
 
     tmpCell->concepts = psMetadataAlloc();
-    tmpCell->conceptsRead = PM_CONCEPT_SOURCE_NONE;
     if (!psMetadataAddStr(tmpCell->concepts, PS_LIST_HEAD, "CELL.NAME", 0, NULL, name)) {
         psErrorClear();
         psWarning("Could not add CELL.NAME to metadata.");
     }
-    pmConceptsBlankCell(tmpCell);
+    tmpCell->conceptsRead = PM_CONCEPT_SOURCE_NONE;
+    // XXX does this work?  moved to conceptsRead... pmConceptsBlankCell(tmpCell);
 
     return tmpCell;
@@ -342 +342 @@
 
     tmpChip->concepts = psMetadataAlloc();
-    tmpChip->conceptsRead = PM_CONCEPT_SOURCE_NONE;
     if (!psMetadataAddStr(tmpChip->concepts, PS_LIST_HEAD, "CHIP.NAME", 0, NULL, name)) {
         psErrorClear();
         psWarning("Could not add CHIP.NAME %s to concepts.", name);
     }
-    pmConceptsBlankChip(tmpChip);
+    tmpChip->conceptsRead = PM_CONCEPT_SOURCE_NONE;
+    // XXX does this work?  moved to conceptsRead... pmConceptsBlankChip(tmpChip);
     return tmpChip;
 }
@@ -372 +372 @@
 
     tmpFPA->concepts = psMetadataAlloc();
-    tmpFPA->conceptsRead = PM_CONCEPT_SOURCE_NONE;
-    pmConceptsBlankFPA(tmpFPA);
-
     if (!psMetadataAddStr(tmpFPA->concepts, PS_LIST_TAIL, "FPA.CAMERA", PS_META_REPLACE,
                           "Camera name (according to configuration)", cameraName)) {
@@ -380 +377 @@
         psWarning("Could not add FPA.CAMERA %s to concepts.", cameraName);
     }
+    tmpFPA->conceptsRead = PM_CONCEPT_SOURCE_NONE;
+    // XXX does this work?  moved to conceptsRead... pmConceptsBlankFPA(tmpFPA);
 
     // this may be somewhat pedantic, but it makes these things consistent

trunk/psModules/src/camera/pmFPAfileFitsIO.h

@@ -5 +5 @@
  * @author PAP, IfA
  *
- * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-06-26 21:11:56 $
+ * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-06-30 00:53:45 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */

trunk/psModules/src/camera/pmFPAfileIO.h

@@ -5 +5 @@
  * @author PAP, IfA
  *
- * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-06-26 21:11:56 $
+ * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-06-30 00:53:45 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */