Changeset 9410 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Oct 9, 2006, 10:18:58 AM (20 years ago)

Author:

Paul Price

Message:

Adding camera name to pmConfig.

File:

• trunk/psModules/src/config/pmConfig.c (modified) (6 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-15 09:49:01 $
+ *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-09 20:18:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35 +35 @@
     psFree(config->files);
     psFree(config->camera);
+    psFree(config->cameraName);
     psFree(config->recipes);
     psFree(config->recipesSource);
@@ -49 +50 @@
     config->site = NULL;
     config->camera = NULL;
+    config->cameraName = NULL;
     config->recipes = psMetadataAlloc();
     config->recipesRead = P_PM_RECIPE_SOURCE_NONE;
@@ -578 +580 @@
             if (formatFromHeader(&format, testCamera, header, camerasItem->name)) {
                 config->camera = psMemIncrRefCounter(testCamera);
+                config->cameraName = psStringCopy(camerasItem->name);
             }
             psFree(testCamera);
@@ -595 +598 @@
 
     // Otherwise, try the specific camera
-    if (!formatFromHeader(&format, config->camera, header, "specified camera")) {
-        psError(PS_ERR_IO, true, "Unable to find a format with the specified camera that matches the "
-                "given header.\n");
+    if (!formatFromHeader(&format, config->camera, header, config->cameraName)) {
+        psError(PS_ERR_IO, true, "Unable to find a format with the specified camera (%s) that matches the "
+                "given header.\n", config->cameraName);
         return NULL;
     }
@@ -603 +606 @@
 }
 
-// Work out what camera we have, based on the FITS header and a set of rules specified in the IPP
-// configuration; return the camera configuration and format
+// Return the requested camera configuration
 psMetadata *pmConfigCameraByName(
     pmConfig *config,                   // The configuration