Changeset 12716

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

Files:

• camera/pmFPAfileDefine.c (modified) (2 diffs)
• camera/pmFPAfileIO.c (modified) (1 diff)
• config/pmConfig.c (modified) (3 diffs)
• config/pmConfig.h (modified) (2 diffs)

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);

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-31 03:01:08 $
+ *  @version $Revision: 1.84 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-03 20:28:26 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -786 +786 @@
 }
 
-
-psMetadata *pmConfigCameraFormatFromHeader(pmConfig *config, const psMetadata *header)
+// we only need to read the recipe for the main camera images.  for additional images (eg, sky
+// cells) do not need to re-read the recipe files!
+psMetadata *pmConfigCameraFormatFromHeader(pmConfig *config, const psMetadata *header, bool readRecipes)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
@@ -840 +841 @@
 
         // Now we have the camera, we can read the recipes
-        if (!pmConfigReadRecipes(config, PM_RECIPE_SOURCE_CAMERA | PM_RECIPE_SOURCE_CL)) {
+        if (readRecipes && !pmConfigReadRecipes(config, PM_RECIPE_SOURCE_CAMERA | PM_RECIPE_SOURCE_CL)) {
             psError(PS_ERR_IO, false, "Error reading recipes from camera config for %s", config->cameraName);
             return NULL;

trunk/psModules/src/config/pmConfig.h

@@ -5 +5 @@
  *  @author Eugene Magnier, IfA
  * 
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-26 00:05:18 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-03 20:28:26 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -108 +108 @@
 /// configuration.  The accepted format is returned.
 psMetadata *pmConfigCameraFormatFromHeader(pmConfig *config, ///< The configuration
-        const psMetadata *header ///< The FITS header
-                                          );
+                                           const psMetadata *header, ///< The FITS header
+                                           bool readRecipes ///< optionally read the recipes as well as the format
+    );
 
 /// Return the camera configuration specified by name