Changeset 23623 for trunk/psModules/src/concepts/pmConceptsWrite.c

Timestamp:

Mar 30, 2009, 9:46:55 PM (17 years ago)

Author:

Paul Price

Message:

Propagation of concept writing should be independent of whether there's an HDU at the particular level. Why on earth did I put that in there in the first place???

File:

• trunk/psModules/src/concepts/pmConceptsWrite.c (modified) (5 diffs)

trunk/psModules/src/concepts/pmConceptsWrite.c

@@ -62 +62 @@
         while ((cItem = psListGetAndIncrement(cIter))) {
             if (cItem->type != PS_DATA_STRING) {
-                psWarning("psMetadataItem from list is of type %x instead of %x (PS_DATA_STRING) --- can't interpret.\n", cItem->type, PS_DATA_STRING);
+                psWarning("psMetadataItem from list is of type %x instead of %x (PS_DATA_STRING) --- can't interpret.\n", cItem->type, PS_DATA_STRING);
                 psFree(cIter);
                 psFree(sIter);
@@ -606 +606 @@
         for (long i = 0; i < chips->n; i++) {
             pmChip *chip = chips->data[i];  // Chip of interest
-            if (chip && !chip->hdu) {
+            if (chip) {
                 success &= pmConceptsWriteChip(chip, false, true, config);
             }
@@ -622 +622 @@
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
     bool success = conceptsWrite(&conceptsChip, fpa, chip, NULL, config, chip->concepts);
-    if (propagateUp && !fpa->hdu) {
+    if (propagateUp) {
         psMetadata *conceptsFPA = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // Concept specifications
         success &= conceptsWrite(&conceptsFPA, fpa, chip, NULL, config, fpa->concepts);
@@ -630 +630 @@
         for (long i = 0; i < cells->n; i++) {
             pmCell *cell = cells->data[i];  // Cell of interest
-            if (cell && !cell->hdu) {
+            if (cell) {
                 success &= pmConceptsWriteCell(cell, false, config);
             }
@@ -649 +649 @@
     bool success = conceptsWrite(&conceptsCell, fpa, chip, cell, config, cell->concepts);
     if (propagateUp) {
-        if (!chip->hdu) {
-            psMetadata *conceptsChip = pmConceptsSpecs(PM_FPA_LEVEL_CHIP); // Concept specifications
-            success &= conceptsWrite(&conceptsChip, fpa, chip, cell, config, chip->concepts);
-            if (!fpa->hdu) {
-                psMetadata *conceptsFPA = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // Concept specifications
-                success &= conceptsWrite(&conceptsFPA, fpa, chip, cell, config, fpa->concepts);
-            }
-        }
+        psMetadata *conceptsChip = pmConceptsSpecs(PM_FPA_LEVEL_CHIP); // Concept specifications
+        success &= conceptsWrite(&conceptsChip, fpa, chip, cell, config, chip->concepts);
+        psMetadata *conceptsFPA = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // Concept specifications
+        success &= conceptsWrite(&conceptsFPA, fpa, chip, cell, config, fpa->concepts);
     }