Changeset 14889 for trunk/psModules/src/camera/pmFPAfile.c

Timestamp:

Sep 19, 2007, 11:37:58 AM (19 years ago)

Author:

Paul Price

Message:

Had trouble with defining files for psphot from pswarp --- didn't know what format to use, and so ended up using the default one, which was wrong (because wanted to run psphot on the warped image, not the input image). So added format and format name to the pmFPAfile, and new functions to define a file from one already existing, using its camera and format.

File:

• trunk/psModules/src/camera/pmFPAfile.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -27 +27 @@
     psTrace ("pmFPAfileFree", 5, "freeing %s\n", file->name);
     psFree (file->fpa);
+    psFree (file->src);
     psFree (file->readout);
     psFree (file->names);
 
     psFree (file->camera);
+    psFree (file->cameraName);
     psFree (file->format);
     psFree (file->formatName);
@@ -73 +75 @@
 
     file->camera = NULL;
+    file->cameraName = NULL;
     file->format = NULL;
     file->formatName = NULL;
@@ -175 +178 @@
 
     if (strstr (newName, "{FPA.NAME}") != NULL) {
-        char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.NAME");
-        if (name != NULL) {
-            psStringSubstitute(&newName, "fpa", "{FPA.NAME}");
-        }
+        char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.NAME");
+        if (name != NULL) {
+            psStringSubstitute(&newName, "fpa", "{FPA.NAME}");
+        }
     }
     if (strstr (newName, "{CHIP.NAME}") != NULL) {