Changeset 8879

Timestamp:

Sep 21, 2006, 5:20:08 PM (20 years ago)

Author:

Paul Price

Message:

Fixing pmFPAfileDefineFromConf to allow interpolation on filenames. Most of the code wasn't required, since it is in pmFPAfileOpen (I think Gene said pmFPAfileDefineFromConf was coded early on, before everything got settled) --- just had to set found to true, and return a pmFPAfile. To get this change to work, added a check in pmFPAfileRead to see if the file is open (it doesn't know the file level a-priori).

Location:

trunk/psModules/src/camera

Files:

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

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -531 +531 @@
 pmFPAfile *pmFPAfileDefineFromConf (bool *found, pmConfig *config, char *filename)
 {
-    bool status;
-
     PS_ASSERT_PTR_NON_NULL(config, false);
     PS_ASSERT_PTR_NON_NULL(filename, false);
@@ -563 +561 @@
     }
 
+
     // image names may not come from file->names
     if (!strcasecmp (file->filerule, "@FILES")) {
@@ -581 +580 @@
     }
 
-    // use the supplied filename
-    char *infile = psStringCopy (file->filerule);
-
-    // load the header of the first image
-    psFits *fits = psFitsOpen (infile, "r");
-    psMetadata *phu = psFitsReadHeader (NULL, fits);
-    psFitsClose (fits);
-
-    // determine the current format from the header
-    // determine camera if not specified already
-    file->format = pmConfigCameraFormatFromHeader (config, phu);
-    if (!file->format) {
-        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", infile);
-        psFree(phu);
-        psFree(fpa);
-        psFree(file);
-        psFree(infile);
-        return NULL;
-    }
-
-    // set the view to the corresponding entry for this phu
-    pmFPAview *view = pmFPAAddSourceFromHeader (fpa, phu, file->format);
-    if (!view) {
-        psError(PS_ERR_IO, false, "Unable to determine source for %s (%s)", file->name, infile);
-        psFree(phu);
-        psFree(fpa);
-        psFree(file);
-        psFree(infile);
-        return NULL;
-    }
-
-    // adjust the rules to identify these files in the file->names data
-    psFree (file->filerule);
-    psFree (file->filextra);
-    file->filerule = psStringCopy ("@FILES");
-    file->filextra = psStringCopy ("{CHIP.NAME}.{CELL.NAME}");
-
-    // find the matching fileLevel
-    psMetadata *filemenu = psMetadataLookupPtr (&status, file->format, "FILE");
-    if (!filemenu) {
-        psError (PS_ERR_IO, true, "missing FILE in FORMAT");
-        psFree(phu);
-        psFree(fpa);
-        psFree(file);
-        psFree(view);
-        psFree(infile);
-        return NULL;
-    }
-    char *levelName = psMetadataLookupStr (&status, filemenu, "PHU");
-    if (!levelName) {
-        psError (PS_ERR_IO, true, "missing PHU in FILE in FORMAT");
-        return NULL;
-    }
-    file->fileLevel = pmFPALevelFromName (levelName);
-    if (file->fileLevel == PM_FPA_LEVEL_NONE) {
-        psError (PS_ERR_IO, true, "unknown level");
-        return NULL;
-    }
-
-    // associate the filename with the FPA element
-    char *name = pmFPAfileNameFromRule (file->filextra, file, view);
-
-    // save the name association in the pmFPAfile structure
-    psMetadataAddStr (file->names, PS_LIST_TAIL, name, 0, "", infile);
-
-    psFree (phu);
+    if (found) {
+        *found = true;
+    }
     psFree (fpa);
-    psFree (view);
-    psFree (name);
-    psFree (infile);
-
-    *found = true;
     return file;
 }

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -247 +247 @@
     }
 
+    // We need to read it --- double-check it's open!
+    if (file->state == PM_FPA_STATE_CLOSED) {
+        file->fileLevel = level;
+        if (!pmFPAfileOpen (file, view, config)) {
+            psError(PS_ERR_IO, false, "failed to open file %s when attempting to read", file->name);
+            return false;
+        }
+    }
+
     switch (file->type) {
     case PM_FPA_FILE_IMAGE: