Changeset 18711 for trunk/psModules/src/concepts/pmConcepts.c

Timestamp:

Jul 24, 2008, 11:22:45 AM (18 years ago)

Author:

Paul Price

Message:

If we shouldn't have copied FPA.NAME, we shouldn't copy FPA.OBS either.

File:

• trunk/psModules/src/concepts/pmConcepts.c (modified) (2 diffs)

trunk/psModules/src/concepts/pmConcepts.c

@@ -217 +217 @@
 
     if (cell && (cell->conceptsRead == PM_CONCEPT_SOURCE_NONE)) {
-        pmConceptsBlankCell(cell);
-        cell->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
+        pmConceptsBlankCell(cell);
+        cell->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
     }
     if (chip && (chip->conceptsRead == PM_CONCEPT_SOURCE_NONE)) {
-        pmConceptsBlankChip(chip);
-        chip->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
+        pmConceptsBlankChip(chip);
+        chip->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
     }
     if (fpa && (fpa->conceptsRead == PM_CONCEPT_SOURCE_NONE)) {
-        pmConceptsBlankFPA(fpa);
-        fpa->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
+        pmConceptsBlankFPA(fpa);
+        fpa->conceptsRead = PM_CONCEPT_SOURCE_BLANK;
     }
 
@@ -665 +665 @@
 // List of concepts not to copy, for each level.
 // Must be NULL-terminated
-static const char *dontCopyConceptsFPA[] = { "FPA.NAME", "FPA.CAMERA", 0 };
+static const char *dontCopyConceptsFPA[] = { "FPA.OBS", "FPA.NAME", "FPA.CAMERA", 0 };
 static const char *dontCopyConceptsChip[] = { "CHIP.NAME", 0 };
 static const char *dontCopyConceptsCell[] = { "CELL.NAME", "CELL.TRIMSEC", "CELL.BIASSEC", 0 };