Changeset 20639

Timestamp:

Nov 10, 2008, 2:04:47 PM (17 years ago)

Author:

eugene

Message:

pmConfigCameraFrmatFromHeader returns camera name as well as format name

Location:

trunk/psModules/src

Files:

• camera/pmFPAfileIO.c (modified) (3 diffs)
• config/pmConfig.c (modified) (7 diffs)
• config/pmConfig.h (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -783 +783 @@
           psMetadata *camera = NULL;
           psString formatName = NULL;
-          file->format = pmConfigCameraFormatFromHeader (&camera, &formatName, config, phu, true);
+          psString cameraName = NULL;
+          file->format = pmConfigCameraFormatFromHeader (&camera, &cameraName, &formatName, config, phu, true);
           if (!file->format) {
             psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", file->filename);
@@ -800 +801 @@
           psFree(camera);
           psFree(formatName);
+          psFree(cameraName);
 
           // XXX this is really dangerous...
@@ -894 +896 @@
     if (!file->format) {
         // determine the format (camera is already known); do not load the recipe
-        file->format = pmConfigCameraFormatFromHeader (NULL, &file->formatName, config, phu, false);
+        file->format = pmConfigCameraFormatFromHeader (NULL, NULL, &file->formatName, 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

@@ -1081 +1081 @@
 // camera.  If we are discovering the camera (config->camera == NULL), then we also load the
 // recipe files for the camera.
-psMetadata *pmConfigCameraFormatFromHeader(psMetadata **camera, psString *formatName, pmConfig *config,
-                                           const psMetadata *header, bool readRecipes)
+psMetadata *pmConfigCameraFormatFromHeader(psMetadata **camera, psString *cameraName, psString *formatName, 
+                                           pmConfig *config, const psMetadata *header, bool readRecipes)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
@@ -1089 +1089 @@
     bool status = false;                // error status
     psMetadata *format = NULL;          // The winning format
-    psString name = NULL;               // Name of the winning format
+    psString testFormatName = NULL;         // Name of the winning format
 
     // If we don't know what sort of camera we have, we try all that we know
@@ -1118 +1118 @@
             assert(camerasItem->type == PS_DATA_METADATA); // It should be because we've read it in or deleted
             psMetadata *testCamera = camerasItem->data.md; // Camera to test against what we've got:
-            if (formatFromHeader(&status, &format, &name, testCamera, header, camerasItem->name)) {
+            if (formatFromHeader(&status, &format, &testFormatName, testCamera, header, camerasItem->name)) {
                 config->camera = psMemIncrRefCounter(testCamera);
                 config->cameraName = psStringCopy(camerasItem->name);
-                config->formatName = name;
+                config->formatName = testFormatName;
                 config->format = format;
                 if (camera) {
@@ -1127 +1127 @@
                 }
                 if (formatName) {
-                    *formatName = psMemIncrRefCounter(name);    // view on value saved on config
+                    *formatName = psMemIncrRefCounter(testFormatName);    // view on value saved on config
+                }
+                if (cameraName) {
+                    *cameraName = psMemIncrRefCounter(config->cameraName);    // view on value saved on config
                 }
             } else {
@@ -1166 +1169 @@
 
     psMetadata *testCamera = NULL;
-    char *testName = NULL;
+    char *testCameraName = NULL;
 
     psMetadata *cameras = psMetadataLookupMetadata (NULL, config->system, "CAMERAS");
@@ -1173 +1176 @@
     // try the FPA metaCamera
     if (!found) {
-        testName = NULL;
-        psStringAppend (&testName, "_%s-FPA", baseName);
-
-        testCamera = psMetadataLookupMetadata (NULL, cameras, testName);
-        psAssert (testCamera, "missing %s in CAMERAS in complete metadata", testName);
+        testCameraName = NULL;
+        psStringAppend (&testCameraName, "_%s-FPA", baseName);
+
+        testCamera = psMetadataLookupMetadata (NULL, cameras, testCameraName);
+        psAssert (testCamera, "missing %s in CAMERAS in complete metadata", testCameraName);
 
         bool status;
-        found = formatFromHeader(&status, &format, &name, testCamera, header, testName);
-        if (!found) psFree (testName);
+        found = formatFromHeader(&status, &format, &testFormatName, testCamera, header, testCameraName);
+        if (!found) psFree (testCameraName);
     }
 
     // try the CHIP metaCamera
     if (!found) {
-        testName = NULL;
-        psStringAppend (&testName, "_%s-CHIP", baseName);
-
-        testCamera = psMetadataLookupMetadata (NULL, cameras, testName);
-        psAssert (testCamera, "missing %s in CAMERAS in complete metadata", testName);
+        testCameraName = NULL;
+        psStringAppend (&testCameraName, "_%s-CHIP", baseName);
+
+        testCamera = psMetadataLookupMetadata (NULL, cameras, testCameraName);
+        psAssert (testCamera, "missing %s in CAMERAS in complete metadata", testCameraName);
 
         bool status;
-        found = formatFromHeader(&status, &format, &name, testCamera, header, testName);
-        if (!found) psFree (testName);
+        found = formatFromHeader(&status, &format, &testFormatName, testCamera, header, testCameraName);
+        if (!found) psFree (testCameraName);
     }
 
     // try the SKYCELL metaCamera
     if (!found) {
-        testName = NULL;
-        psStringAppend (&testName, "_%s-SKYCELL", baseName);
-
-        testCamera = psMetadataLookupMetadata (NULL, cameras, testName);
-        psAssert (testCamera, "missing %s in CAMERAS in complete metadata", testName);
+        testCameraName = NULL;
+        psStringAppend (&testCameraName, "_%s-SKYCELL", baseName);
+
+        testCamera = psMetadataLookupMetadata (NULL, cameras, testCameraName);
+        psAssert (testCamera, "missing %s in CAMERAS in complete metadata", testCameraName);
 
         bool status;
-        found = formatFromHeader(&status, &format, &name, testCamera, header, testName);
-        if (!found) psFree (testName);
+        found = formatFromHeader(&status, &format, &testFormatName, testCamera, header, testCameraName);
+        if (!found) psFree (testCameraName);
     }
 
     // try the base name
     if (!found) {
-        testName = psMemIncrRefCounter (baseName);
-
-        testCamera = psMetadataLookupMetadata (NULL, cameras, testName);
-        psAssert (testCamera, "missing %s in CAMERAS in complete metadata", testName);
+        testCameraName = psMemIncrRefCounter (baseName);
+
+        testCamera = psMetadataLookupMetadata (NULL, cameras, testCameraName);
+        psAssert (testCamera, "missing %s in CAMERAS in complete metadata", testCameraName);
 
         bool status;
-        found = formatFromHeader(&status, &format, &name, testCamera, header, testName);
+        found = formatFromHeader(&status, &format, &testFormatName, testCamera, header, testCameraName);
     }
 
@@ -1228 +1231 @@
     }
 
-    psFree (name); // winning format name (for metaCamera) returned by formatFromHeader
-
     psFree (baseName);
     if (formatName) {
-        *formatName = testName;
+        *formatName = testFormatName;
     } else {
-        psFree (testName);
-    }
+        psFree (testFormatName);
+    }
+    if (cameraName) {
+        *cameraName = testCameraName;
+    } else {
+        psFree (testCameraName);
+    }
+
     if (camera) {
         *camera = psMemIncrRefCounter(testCamera);

trunk/psModules/src/config/pmConfig.h

@@ -5 +5 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-06 01:13:14 $
+ *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-11-11 00:04:47 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -117 +117 @@
 psMetadata *pmConfigCameraFormatFromHeader(psMetadata **camera, // selected camera (or meta-camera)
                                            psString *formatName, // selected format name
+                                           psString *cameraName, // selected camera name
                                            pmConfig *config, ///< The configuration
                                            const psMetadata *header, ///< The FITS header