Changeset 5371 for trunk/archive/scripts/src/phase2/pmFPAConceptsGet.c

Timestamp:

Oct 18, 2005, 4:19:41 PM (21 years ago)

Author:

Paul Price

Message:

Current state before I go on holiday. Not sure if it works or not. Not current for pslib8.

File:

• trunk/archive/scripts/src/phase2/pmFPAConceptsGet.c (modified) (8 diffs)

trunk/archive/scripts/src/phase2/pmFPAConceptsGet.c

@@ -46 +46 @@
     if (mdStatus && strlen(keyword) > 0) {
         // We have a FITS header to look up --- search each level
-        if (cell && cell->private) {
-            psMetadataItem *cellItem = psMetadataLookup(cell->private->header, keyword);
+        if (cell && cell->data) {
+            psMetadataItem *cellItem = psMetadataLookup(cell->data->header, keyword);
             if (cellItem) {
                 // XXX: Need to clean up before returning
@@ -54 +54 @@
         }
 
-        if (chip && chip->private) {
-            psMetadataItem *chipItem = psMetadataLookup(chip->private->header, keyword);
+        if (chip && chip->data) {
+            psMetadataItem *chipItem = psMetadataLookup(chip->data->header, keyword);
             if (chipItem) {
                 // XXX: Need to clean up before returning
@@ -62 +62 @@
         }
 
-        if (fpa->private) {
-            psMetadataItem *fpaItem = psMetadataLookup(fpa->private->header, keyword);
+        if (fpa->data) {
+            psMetadataItem *fpaItem = psMetadataLookup(fpa->data->header, keyword);
             if (fpaItem) {
                 // XXX: Need to clean up before returning
@@ -653 +653 @@
                 } else if (strcasecmp(source, "HEADER") == 0) {
                     psMetadata *header = NULL; // The FITS header
-                    if (cell->private) {
-                        header = cell->private->header;
-                    } else if (chip->private) {
-                        header = chip->private->header;
-                    } else if (fpa->private) {
-                            header = fpa->private->header;
+                    if (cell->data) {
+                        header = cell->data->header;
+                    } else if (chip->data) {
+                        header = chip->data->header;
+                    } else if (fpa->data) {
+                            header = fpa->data->header;
                     }
                     if (! header) {
@@ -718 +718 @@
                     } else if (strcasecmp(source, "HEADER") == 0) {
                         psMetadata *header = NULL; // The FITS header
-                        if (cell->private) {
-                            header = cell->private->header;
-                        } else if (chip->private) {
-                            header = chip->private->header;
-                        } else if (fpa->private) {
-                            header = fpa->private->header;
+                        if (cell->data) {
+                            header = cell->data->header;
+                        } else if (chip->data) {
+                            header = chip->data->header;
+                        } else if (fpa->data) {
+                            header = fpa->data->header;
                         }
                         if (! header) {
@@ -753 +753 @@
 
         psMetadataAdd(cell->concepts, PS_LIST_TAIL, "CELL.BIASSEC", PS_META_LIST, "Bias sections", biassecs);
+        psFree(biassecs);
     }
 
@@ -847 +848 @@
                                 // timeString contains headers for the date and time
                                 psMetadata *header = NULL; // The FITS header
-                                if (cell->private) {
-                                    header = cell->private->header;
-                                } else if (chip->private) {
-                                    header = chip->private->header;
-                                } else if (fpa->private) {
-                                    header = fpa->private->header;
+                                if (cell->data) {
+                                    header = cell->data->header;
+                                } else if (chip->data) {
+                                    header = chip->data->header;
+                                } else if (fpa->data) {
+                                    header = fpa->data->header;
                                 }
                                 if (! header) {
@@ -966 +967 @@
         psMetadataAdd(cell->concepts, PS_LIST_TAIL, "CELL.TIME", PS_META_UNKNOWN, "Time of exposure", time);
         psFree(time);
-
     }