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

Timestamp:

Nov 21, 2005, 5:00:14 PM (21 years ago)

Author:

Paul Price

Message:

Mask and weight input and output

File:

• trunk/archive/scripts/src/phase2/pmFPAConceptsGet.c (modified) (12 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->data) {
-            psMetadataItem *cellItem = psMetadataLookup(cell->data->header, keyword);
+        if (cell && cell->hdu) {
+            psMetadataItem *cellItem = psMetadataLookup(cell->hdu->header, keyword);
             if (cellItem) {
                 // XXX: Need to clean up before returning
@@ -54 +54 @@
         }
 
-        if (chip && chip->data) {
-            psMetadataItem *chipItem = psMetadataLookup(chip->data->header, keyword);
+        if (chip && chip->hdu) {
+            psMetadataItem *chipItem = psMetadataLookup(chip->hdu->header, keyword);
             if (chipItem) {
                 // XXX: Need to clean up before returning
@@ -62 +62 @@
         }
 
-        if (fpa->data) {
-            psMetadataItem *fpaItem = psMetadataLookup(fpa->data->header, keyword);
+        if (fpa->hdu) {
+            psMetadataItem *fpaItem = psMetadataLookup(fpa->hdu->header, keyword);
             if (fpaItem) {
                 // XXX: Need to clean up before returning
@@ -371 +371 @@
         switch (item->type) {
           case PS_DATA_STRING:
-            value = item->data.V;
+            value = psMemIncrRefCounter(item->data.V);
+            break;
+          case PS_DATA_F32:
+            psStringAppend(&value, "%f", item->data.F32);
+            break;
+          case PS_DATA_S32:
+            psStringAppend(&value, "%d", item->data.S32);
             break;
           default:
@@ -384 +390 @@
 
     psMetadataAdd(concepts, PS_LIST_TAIL, name, PS_DATA_STRING, comment, value);
+    psFree(value);
 }
 
@@ -400 +407 @@
     }
 
-    // FPA.NAME --- added by pmFPAConstruct
+    // FPA.NAME
+    p_pmFPAConceptGetString(fpa, NULL, NULL, db, fpa->concepts, "FPA.NAME", "Name of FPA");
 
     // FPA.AIRMASS
@@ -450 +458 @@
             
             // How to interpret the RA
-            psMetadata *camera = fpa->camera; // Camera configuration data
+            const psMetadata *camera = fpa->camera; // Camera configuration data
             bool mdok = true;           // Status of MD lookup
             psMetadata *formats = psMetadataLookupMD(&mdok, camera, "FORMATS");
@@ -519 +527 @@
             
             // How to interpret the DEC
-            psMetadata *camera = fpa->camera; // Camera configuration data
+            const psMetadata *camera = fpa->camera; // Camera configuration data
             bool mdok = true;           // Status of MD lookup
             psMetadata *formats = psMetadataLookupMD(&mdok, camera, "FORMATS");
@@ -653 +661 @@
                 } else if (strcasecmp(source, "HEADER") == 0) {
                     psMetadata *header = NULL; // The FITS 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 (cell->hdu) {
+                        header = cell->hdu->header;
+                    } else if (chip->hdu) {
+                        header = chip->hdu->header;
+                    } else if (fpa->hdu) {
+                            header = fpa->hdu->header;
                     }
                     if (! header) {
@@ -718 +726 @@
                     } else if (strcasecmp(source, "HEADER") == 0) {
                         psMetadata *header = NULL; // The FITS 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 (cell->hdu) {
+                            header = cell->hdu->header;
+                        } else if (chip->hdu) {
+                            header = chip->hdu->header;
+                        } else if (fpa->hdu) {
+                            header = fpa->hdu->header;
                         }
                         if (! header) {
@@ -832 +840 @@
         } else {
             // Get format
-            psMetadata *camera = fpa->camera; // The camera configuration data
+            const psMetadata *camera = fpa->camera; // The camera configuration data
             bool mdok = true;           // Status of MD lookup
             psMetadata *formats = psMetadataLookupMD(&mdok, camera, "FORMATS");
@@ -848 +856 @@
                                 // timeString contains headers for the date and time
                                 psMetadata *header = NULL; // The FITS 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 (cell->hdu) {
+                                    header = cell->hdu->header;
+                                } else if (chip->hdu) {
+                                    header = chip->hdu->header;
+                                } else if (fpa->hdu) {
+                                    header = fpa->hdu->header;
                                 }
                                 if (! header) {