Changeset 11801 for trunk/psModules/src/camera/pmFPAfileFitsIO.c

Timestamp:

Feb 14, 2007, 2:51:20 PM (19 years ago)

Author:

Paul Price

Message:

Fixing issues with file formats: some formats weren't getting the PHU where required (because the create was following the open, and the open was attempting to write the blank PHU). Added pmFPAfileBlank to write a blank where required. Cleaned up the pmFPAfile stuff a little.

File:

• trunk/psModules/src/camera/pmFPAfileFitsIO.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -23 +23 @@
     PS_ASSERT_PTR_NON_NULL(view, NULL);
 
-    if (file->camera == config->camera || // Need to mosaic, not copy
+    if (//file->camera == config->camera || // Need to mosaic, not copy
             !file->format) {                // Working with the same output format as input format
         return psMemIncrRefCounter(file->fpa);
@@ -50 +50 @@
     }
 
-    if (!pmFPAAddSourceFromView(fpa, phuView, file->format)) {
+    pmFPA *nameSource = file->src; // Source of FPA.NAME
+    if (!nameSource) {
+        nameSource = file->fpa;
+    }
+    bool mdok;                  // Status of MD lookup
+    const char *fpaname = psMetadataLookupStr(&mdok, nameSource->concepts, "FPA.NAME"); // Name of FPA
+
+    if (!pmFPAAddSourceFromView(fpa, fpaname, phuView, file->format)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to insert HDU into FPA for writing.\n");
         psFree(fpa);