Changeset 12716 for trunk/psModules/src/camera

Timestamp:

Apr 3, 2007, 10:28:26 AM (19 years ago)

Author:

magnier

Message:

adding option to pmConfigCameraFormatFromHeader to load recipe or not

Location:

trunk/psModules/src/camera

Files:

• pmFPAfileDefine.c (modified) (2 diffs)
• pmFPAfileIO.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -288 +288 @@
     // determine the current format from the header
     // determine camera if not specified already
-    format = pmConfigCameraFormatFromHeader (config, phu);
+    format = pmConfigCameraFormatFromHeader (config, phu, true);
     if (!format) {
         psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", realName);
@@ -565 +565 @@
     // on first call to this function, config->camera is not set.
     // later calls will give an error if the cameras do not match
-    format = pmConfigCameraFormatFromHeader (config, phu);
+    format = pmConfigCameraFormatFromHeader (config, phu, true);
     if (!format) {
         psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", (char *)infiles->data[0]);

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -719 +719 @@
     psMetadata *phu = psFitsReadHeader (NULL, file->fits);
     if (!file->format) {
-        file->format = pmConfigCameraFormatFromHeader (config, phu);
+        // XXX do we need to read the recipe here?  these files are supplemental, and probably 
+        // do not need to re-load the recipes
+        file->format = pmConfigCameraFormatFromHeader (config, phu, false);
         if (!file->format) {
             psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", file->filename);