Changeset 14954

Timestamp:

Sep 20, 2007, 3:31:51 PM (19 years ago)

Author:

Paul Price

Message:

Don't store formatName in the pmFPA --- this was a testing step that I forgot to remove later when I solved the problem a different way.

Location:

trunk/psModules/src/camera

Files:

• pmFPA.h (modified) (2 diffs)
• pmFPAfileDefine.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPA.h

@@ -6 +6 @@
  * @author Eugene Magnier, IfA
  *
- * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-09-19 21:37:58 $
+ * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-09-21 01:31:51 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -55 +55 @@
     psMetadata *analysis;               ///< FPA-level analysis metadata
     const psMetadata *camera;           ///< Camera configuration
-    const char *formatName;             ///< Name of camera format
     psArray *chips;                     ///< The component chips
     pmHDU *hdu;                         ///< FITS header data unit of interest, or NULL

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -190 +190 @@
     // Use the format we were told to, the format specified in the file rule, or default to the default format
     if (!formatName || strlen(formatName) == 0) {
-        if (fpa && fpa->formatName && strlen(fpa->formatName) > 0) {
-            formatName = (psString)fpa->formatName; // Casting away "const" --- it will be copied, so no prob.
-        } else {
-            // select the format list from the selected camera
-            formatName = psMetadataLookupStr(&status, data, "FILE.FORMAT");
-            if (!formatName || strcmp(formatName, "NONE") == 0) {
-                // Try to get by with the default
-                formatName = config->formatName;
-            }
+        // select the format list from the selected camera
+        formatName = psMetadataLookupStr(&status, data, "FILE.FORMAT");
+        if (!formatName || strcmp(formatName, "NONE") == 0) {
+            // Try to get by with the default
+            formatName = config->formatName;
         }
     }
@@ -250 +246 @@
         }
     } else {
-        // if we do not have extensions in the file, we are forced to write out at the file level
-        file->dataLevel = file->fileLevel;
-        file->freeLevel = file->fileLevel;
+        // if we do not have extensions in the file, we are forced to write out at the file level
+        file->dataLevel = file->fileLevel;
+        file->freeLevel = file->fileLevel;
     }
 
     psTrace ("psModules.camera", 5, "file: %s, format: %s, fileLevel: %s, extLevel: %s, dataLevel: %s, freeLevel: %s\n",
-             file->name, file->formatName, pmFPALevelToName (file->fileLevel), pmFPALevelToName(extLevel), pmFPALevelToName (file->dataLevel), pmFPALevelToName (file->freeLevel));
+             file->name, file->formatName, pmFPALevelToName (file->fileLevel), pmFPALevelToName(extLevel), pmFPALevelToName (file->dataLevel), pmFPALevelToName (file->freeLevel));
 
     // add argument-supplied OUTPUT name to this file