Changeset 6124 for branches/eam_rel9_p0/psModules/src/astrom/pmConceptsStandard.c

Timestamp:

Jan 21, 2006, 12:23:58 AM (21 years ago)

Author:

Paul Price

Message:

Working, but leaks memory something chronic

File:

• branches/eam_rel9_p0/psModules/src/astrom/pmConceptsStandard.c (modified) (2 diffs)

branches/eam_rel9_p0/psModules/src/astrom/pmConceptsStandard.c

@@ -321 +321 @@
 {
     psList *biassecs = psListAlloc(NULL); // List of bias sections
+    psMetadataItem *item = psMetadataItemAlloc("CELL.BIASSEC", PS_DATA_LIST, "Bias sections", biassecs);
+    psFree(biassecs);               // Drop reference
 
     psMetadataItem *secItem = pmConceptRead(fpa, chip, cell, db, "CELL.BIASSEC");
     if (! secItem) {
         psError(PS_ERR_IO, false, "Couldn't find CELL.BIASSEC.\n");
-    } else if (secItem->type != PS_DATA_STRING) {
+        return item;
+    }
+    if (secItem->type != PS_DATA_STRING) {
         psError(PS_ERR_IO, true, "CELL.BIASSEC is not of type STR (%x)\n", secItem->type);
-    } else {
-        psString sections = secItem->data.V; // The section string
-
-        psMetadataItem *sourceItem = pmConceptRead(fpa, chip, cell, db, "CELL.BIASSEC.SOURCE");
-        if (! sourceItem) {
-            psError(PS_ERR_IO, false, "Couldn't find CELL.BIASSEC.SOURCE.\n");
-        } else if (sourceItem->type != PS_DATA_STRING) {
-            psError(PS_ERR_IO, true, "CELL.BIASSEC.SOURCE is not of type STR (%x)\n", sourceItem->type);
+        return item;
+    }
+
+    psString sections = secItem->data.V; // The section string
+
+    psMetadataItem *sourceItem = pmConceptRead(fpa, chip, cell, db, "CELL.BIASSEC.SOURCE");
+    if (! sourceItem) {
+        psError(PS_ERR_IO, false, "Couldn't find CELL.BIASSEC.SOURCE.\n");
+        return item;
+    } else if (sourceItem->type != PS_DATA_STRING) {
+        psError(PS_ERR_IO, true, "CELL.BIASSEC.SOURCE is not of type STR (%x)\n", sourceItem->type);
+        return item;
+    }
+
+    psString source = sourceItem->data.V; // The source string
+
+    if (! strcasecmp(source, "NONE")) {
+        return item;                // There is no biassec
+    }
+
+    psList *secList = psStringSplit(sections, " ;"); // List of sections
+    psListIterator *secIter = psListIteratorAlloc(secList, PS_LIST_HEAD, false); // Iterator over
+    // sections
+    psString aSection = NULL; // A section from the list
+    while ((aSection = psListGetAndIncrement(secIter))) {
+        psRegion *region = psAlloc(sizeof(psRegion)); // Make space for a psRegion (usually passed by
+        // value)
+
+        if (strcasecmp(source, "VALUE") == 0) {
+            *region = psRegionFromString(aSection);
+        } else if (strcasecmp(source, "HEADER") == 0) {
+            psMetadata *header = NULL; // The FITS header
+            if (cell->hdu) {
+                header = cell->hdu->header;
+            } else if (chip->hdu) {
+                header = chip->hdu->header;
+            } else if (fpa->hdu) {
+                header = fpa->hdu->header;
+            }
+            if (! header) {
+                psError(PS_ERR_IO, true, "Unable to find FITS header!\n");
+                *region = psRegionSet(0.0,0.0,0.0,0.0);
+            } else {
+                bool mdok = true;           // Status of MD lookup
+                psString secValue = psMetadataLookupStr(&mdok, header, aSection);
+                if (! mdok || ! secValue) {
+                    psError(PS_ERR_IO, false, "Unable to locate header %s\n", aSection);
+                    *region = psRegionSet(0.0,0.0,0.0,0.0);
+                } else {
+                    *region = psRegionFromString(secValue);
+                }
+            }
         } else {
-            psString source = sourceItem->data.V; // The source string
-
-            psList *secList = psStringSplit(sections, " ;"); // List of sections
-            psListIterator *secIter = psListIteratorAlloc(secList, PS_LIST_HEAD, false); // Iterator over
-            // sections
-            psString aSection = NULL; // A section from the list
-            while ((aSection = psListGetAndIncrement(secIter))) {
-                psRegion *region = psAlloc(sizeof(psRegion)); // Make space for a psRegion (usually passed
-                // by value)
-
-                if (strcasecmp(source, "VALUE") == 0) {
-                    *region = psRegionFromString(aSection);
-                } else if (strcasecmp(source, "HEADER") == 0) {
-                    psMetadata *header = NULL; // The FITS header
-                    if (cell->hdu) {
-                        header = cell->hdu->header;
-                    } else if (chip->hdu) {
-                        header = chip->hdu->header;
-                    } else if (fpa->hdu) {
-                        header = fpa->hdu->header;
-                    }
-                    if (! header) {
-                        psError(PS_ERR_IO, true, "Unable to find FITS header!\n");
-                        *region = psRegionSet(0.0,0.0,0.0,0.0);
-                    } else {
-                        bool mdok = true;           // Status of MD lookup
-                        psString secValue = psMetadataLookupStr(&mdok, header, aSection);
-                        if (! mdok || ! secValue) {
-                            psError(PS_ERR_IO, false, "Unable to locate header %s\n", aSection);
-                            *region = psRegionSet(0.0,0.0,0.0,0.0);
-                        } else {
-                            *region = psRegionFromString(secValue);
-                        }
-                    }
-                } else {
-                    psError(PS_ERR_IO, true, "CELL.BIASSEC.SOURCE (%s) is not HEADER or VALUE --- trying "
-                            "VALUE.\n", source);
-                    *region = psRegionFromString(aSection);
-                } // Value of CELL.BIASSEC.SOURCE
-
-                psListAdd(biassecs, PS_LIST_TAIL, region);
-                psFree(region);
-            } // Iterating over multiple sections
-            psFree(secIter);
-            psFree(secList);
-        } // Looking up CELL.BIASSEC.SOURCE
-    } // Looking up CELL.BIASSEC
-
-    psMetadataItem *item = psMetadataItemAlloc("CELL.BIASSEC", PS_DATA_LIST, "Bias sections", biassecs);
-    psFree(biassecs);
+            psError(PS_ERR_IO, true, "CELL.BIASSEC.SOURCE (%s) is not HEADER or VALUE --- trying "
+                    "VALUE.\n", source);
+            *region = psRegionFromString(aSection);
+        } // Value of CELL.BIASSEC.SOURCE
+
+        psListAdd(biassecs, PS_LIST_TAIL, region);
+        psFree(region);
+    } // Iterating over multiple sections
+    psFree(secIter);
+    psFree(secList);
+
     return item;
 }
@@ -689 +698 @@
     psMetadataItem *biassecItem = psMetadataLookup(cell->concepts, "CELL.BIASSEC");
     psList *biassecs = biassecItem->data.V; // The biassecs region list
+
+    if (biassecs->n == 0) {
+        psMetadataItem *noneItem = psMetadataItemAllocStr("CELL.BIASSEC", "Bias section", "NONE");
+        pmConceptWriteItem(fpa, chip, cell, db, noneItem);
+        return true;
+    }
+
     psString source = pmConceptReadString(fpa, chip, cell, db, "CELL.TRIMSEC.SOURCE"); // The source string