Index: /trunk/psModules/src/camera/pmFPAfile.c =================================================================== --- /trunk/psModules/src/camera/pmFPAfile.c (revision 12454) +++ /trunk/psModules/src/camera/pmFPAfile.c (revision 12455) @@ -47,9 +47,7 @@ psFree (file->filerule); - psFree (file->filextra); - psFree (file->extrule); - psFree (file->extxtra); - - psFree(file->detrend); + + psFree (file->filesrc); + psFree (file->detrend); psFree (file->filename); @@ -73,4 +71,8 @@ file->mosaicLevel = PM_FPA_LEVEL_NONE; + file->type = PM_FPA_FILE_NONE; + file->mode = PM_FPA_MODE_NONE; + file->state = PM_FPA_STATE_CLOSED; + file->fpa = NULL; file->fits = NULL; @@ -82,15 +84,9 @@ file->filerule = NULL; - file->filextra = NULL; - file->extrule = NULL; - file->extxtra = NULL; file->filename = NULL; file->extname = NULL; - file->type = PM_FPA_FILE_NONE; - file->mode = PM_FPA_MODE_NONE; - file->state = PM_FPA_STATE_CLOSED; - + file->filesrc = NULL; file->detrend = NULL; Index: /trunk/psModules/src/camera/pmFPAfile.h =================================================================== --- /trunk/psModules/src/camera/pmFPAfile.h (revision 12454) +++ /trunk/psModules/src/camera/pmFPAfile.h (revision 12455) @@ -4,6 +4,6 @@ * @author EAM, IfA * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-08 00:41:32 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-16 00:29:17 $ * Copyright 2004-2005 Institute for Astronomy, University of Hawaii */ @@ -37,5 +37,4 @@ PM_FPA_FILE_JPEG, PM_FPA_FILE_KAPA, - PM_FPA_FILE_MANAPLOT, PM_FPA_FILE_MASK, PM_FPA_FILE_WEIGHT, @@ -60,32 +59,29 @@ typedef struct { - pmFPAfileMode mode; // is this file read, written, or only used internally? - pmFPAfileType type; // what type of data is read from / written to disk? - pmFPAfileState state; // have we opened the file, etc? + pmFPAfileMode mode; // is this file read, written, or only used internally? + pmFPAfileType type; // what type of data is read from / written to disk? + pmFPAfileState state; // have we opened the file, etc? - // Desired levels, set by the user - pmFPALevel fileLevel; // what level in the FPA hierarchy represents a unique file? - pmFPALevel dataLevel; // at what level do we read/write the data segment? - pmFPALevel freeLevel; // at what level do we free the data segment? + pmFPALevel fileLevel; // what level in the FPA hierarchy represents a unique file? + pmFPALevel dataLevel; // at what level do we read/write the data segment? (request by user) + pmFPALevel freeLevel; // at what level do we free the data segment? (set by program) pmFPALevel mosaicLevel; // at what level is the mosaic? - pmFPA *fpa; // for I/O files, we carry a pointer to the complete fpa - psFits *fits; // for I/O files of fits type (IMAGE, CMP, CMF), we carry a file handle + pmFPA *fpa; // for I/O files, we carry a pointer to the complete fpa + psFits *fits; // for I/O files of fits type (IMAGE, CMP, CMF), we carry a file handle - bool phu; // have we written a PHU for this file? - psMetadata *header; // pointer (view) to the current hdu header + bool phu; // have we written a PHU for this file? + psMetadata *header; // pointer (view) to the current hdu header - pmReadout *readout; // for internal files, we only carry a single readout + pmReadout *readout; // for internal files, we only carry a single readout - psMetadata *names; // filenames supplied by the cmdline or detdb are saved here + psMetadata *names; // filenames supplied by the cmdline or detdb are saved here - char *filerule; // rule for constructing a filename when needed - char *filextra; // additional information used to define filenames (context dependent) - char *extrule; // rule for constructing an extension name when needed - char *extxtra; // additional information used to define extension names (context dependent) + char *filerule; // rule for constructing a filename when needed + char *filesrc; // rule to find file in pmFPAfile->names list - char *name; // the name of the rule (useful for debugging / tracing) - char *filename; // the current name of an active file - char *extname; // the current name of an active file extension + char *name; // the name of the rule (useful for debugging / tracing) + char *filename; // the current name of an active file + char *extname; // the current name of an active file extension pmDetrendSelectResults *detrend; // Detrend information, from pmDetrendSelect @@ -95,7 +91,7 @@ // the following elements are used for WRITE-mode IMAGE-type pmFPAfiles to inform // the creation of a new image based on an existing image - pmFPA *src; // if an output FPA, inherit from this FPA - int xBin; // desired binning in x direction - int yBin; // desired binning in y direction + pmFPA *src; // if an output FPA, inherit from this FPA + int xBin; // desired binning in x direction + int yBin; // desired binning in y direction psMetadata *camera; // Camera configuration Index: /trunk/psModules/src/camera/pmFPAfileDefine.c =================================================================== --- /trunk/psModules/src/camera/pmFPAfileDefine.c (revision 12454) +++ /trunk/psModules/src/camera/pmFPAfileDefine.c (revision 12455) @@ -68,7 +68,4 @@ file->filerule = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "FILENAME.RULE")); - file->filextra = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "FILENAME.XTRA")); - file->extrule = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "EXTNAME.RULE")); - file->extxtra = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "EXTNAME.XTRA")); type = psMetadataLookupStr (&status, data, "FILE.TYPE"); @@ -155,7 +152,4 @@ file->filerule = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "FILENAME.RULE")); - file->filextra = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "FILENAME.XTRA")); - file->extrule = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "EXTNAME.RULE")); - file->extxtra = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "EXTNAME.XTRA")); const char *type = psMetadataLookupStr (&status, data, "FILE.TYPE"); @@ -338,22 +332,15 @@ // adjust the rules to identify these files in the file->names data psFree (file->filerule); - psFree (file->filextra); + // XXX DROP ME: psFree (file->filesrc); file->filerule = psStringCopy ("@FILES"); - file->filextra = psStringCopy ("{CHIP.NAME}.{CELL.NAME}"); - - // find the matching fileLevel - psMetadata *filemenu = psMetadataLookupPtr (&status, format, "FILE"); - if (!filemenu) { - psError (PS_ERR_IO, true, "missing FILE in FORMAT"); - 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); + file->filesrc = psStringCopy ("{CHIP.NAME}.{CELL.NAME}"); + + file->fileLevel = pmFPAPHULevel(format); if (file->fileLevel == PM_FPA_LEVEL_NONE) { - psError (PS_ERR_IO, true, "unknown level"); + psError(PS_ERR_IO, true, "Unable to determine file level for %s\n", file->name); + psFree(phu); + psFree(fpa); + psFree(format); + psFree(file); return NULL; } @@ -411,5 +398,5 @@ // associate the filename with the FPA element - char *name = pmFPAfileNameFromRule (file->filextra, file, view); + char *name = pmFPAfileNameFromRule (file->filesrc, file, view); // save the name association in the pmFPAfile structure @@ -482,7 +469,7 @@ // define the rule to identify these files in the file->names data psFree (file->filerule); - psFree (file->filextra); + psFree (file->filesrc); file->filerule = psStringCopy ("@FILES"); - file->filextra = psStringCopy ("{CHIP.NAME}.{CELL.NAME}"); + file->filesrc = psStringCopy ("{CHIP.NAME}.{CELL.NAME}"); // examine the list of input files and validate their cameras @@ -534,5 +521,5 @@ // associate the filename with the FPA element - char *name = pmFPAfileNameFromRule (file->filextra, file, view); + char *name = pmFPAfileNameFromRule (file->filesrc, file, view); // save the name association in the pmFPAfile structure @@ -602,4 +589,6 @@ if (!fpa) { psError(PS_ERR_IO, false, "Failed to construct FPA from %s", (char *)infiles->data[0]); + psFree(phu); + psFree(format); return NULL; } @@ -621,30 +610,14 @@ // adjust the rules to identify these files in the file->names data psFree (file->filerule); - psFree (file->filextra); + psFree (file->filesrc); file->filerule = psStringCopy ("@FILES"); - file->filextra = psStringCopy ("{CHIP.NAME}.{CELL.NAME}"); - - // find the matching fileLevel - psMetadata *filemenu = psMetadataLookupPtr (&status, format, "FILE"); - if (!filemenu) { - psError (PS_ERR_IO, true, "missing FILE in FORMAT"); + file->filesrc = psStringCopy ("{CHIP.NAME}.{CELL.NAME}"); + + file->fileLevel = pmFPAPHULevel(format); + if (file->fileLevel == PM_FPA_LEVEL_NONE) { + psError(PS_ERR_IO, true, "Unable to determine file level for %s\n", file->name); psFree(phu); psFree(fpa); - psFree(format); - return NULL; - } - char *levelName = psMetadataLookupStr (&status, filemenu, "PHU"); - if (!levelName) { - psError (PS_ERR_IO, true, "missing PHU in FILE in FORMAT"); - psFree(phu); - psFree(fpa); - psFree(format); - return NULL; - } - file->fileLevel = pmFPALevelFromName (levelName); - if (file->fileLevel == PM_FPA_LEVEL_NONE) { - psError (PS_ERR_IO, true, "unknown level"); - psFree(phu); - psFree(fpa); + psFree(file); psFree(format); return NULL; @@ -657,4 +630,5 @@ psFree(phu); psFree(fpa); + psFree(file); psFree(format); return NULL; @@ -662,13 +636,14 @@ // associate the filename with the FPA element - char *name = pmFPAfileNameFromRule (file->filextra, file, view); + char *name = pmFPAfileNameFromRule (file->filesrc, file, view); // save the name association in the pmFPAfile structure psMetadataAddStr (file->names, PS_LIST_TAIL, name, 0, "", infiles->data[entry]); - psFree (view); - psFree (name); - psFree (phu); - psFree (fpa); + psFree(phu); + psFree(fpa); + psFree(view); + psFree(name); + psFree(format); if (found) @@ -881,12 +856,4 @@ } file->detrend = results; - - // replace the existing value of filextra with the selected detID - psFree (file->filextra); - file->filextra = psStringCopy (results->detID); - - // set the fileLevel based on the detDB results - // XXX this is not supplied by the db. use the config value for now. - // file->fileLevel = results->level; psFree (options); Index: /trunk/psModules/src/camera/pmFPAfileIO.c =================================================================== --- /trunk/psModules/src/camera/pmFPAfileIO.c (revision 12454) +++ /trunk/psModules/src/camera/pmFPAfileIO.c (revision 12455) @@ -27,5 +27,4 @@ #include "pmPSF_IO.h" #include "pmFPA_JPEG.h" -#include "pmFPA_MANAPLOT.h" #include "pmSourcePlots.h" #include "pmDetrendDB.h" @@ -108,4 +107,5 @@ } #if 0 + // XXXX can we now drop this? (EAM 2007.03.15) // This should be done by pmFPAfileBlank if (file->mode == PM_FPA_MODE_WRITE) { @@ -190,9 +190,5 @@ } - // determine the file name - // free a name allocated earlier - // XXX for CMP files which defer opening, we have an inconsistent value - // for file->extra here and in the pmFPAfileDefine fucntions. - // + // determine the file name, free a name allocated earlier psFree (file->filename); file->filename = pmFPAfileNameFromRule (file->filerule, file, view); @@ -202,27 +198,26 @@ } - // indirect filenames + // indirect filenames: these come from a list on the command line or elsewhere if (!strcasecmp (file->filename, "@FILES")) { - char *extra = pmFPAfileNameFromRule (file->filextra, file, view); - if (extra == NULL) { - psError(PS_ERR_IO, false, "error converting extrule to name %s\n", file->extrule); + char *filesrc = pmFPAfileNameFromRule (file->filesrc, file, view); + if (filesrc == NULL) { + psError(PS_ERR_IO, false, "error converting filesrc to name %s\n", file->filesrc); return false; } psFree (file->filename); - file->filename = psMetadataLookupStr (&status, file->names, extra); + file->filename = psMetadataLookupStr (&status, file->names, filesrc); if (file->filename == NULL) { - psError(PS_ERR_IO, true, "filename lookup error (@FILES) for %s : %s\n", file->filextra, extra); - psFree (extra); + psError(PS_ERR_IO, true, "filename lookup error (@FILES) for %s : %s\n", file->filesrc, filesrc); + psFree (filesrc); return false; } // psMetadataLookupStr just returns a view, file->filename must be protected psMemIncrRefCounter (file->filename); - psFree (extra); + psFree (filesrc); } // get name from detrend database - // extrule expands to yield the class_id // file->detrend->detID contains the desired -det_id detID -iteration iter string if (!strcasecmp (file->filename, "@DETDB")) { @@ -245,10 +240,10 @@ classId = pmFPAfileNameFromRule(rule, file, view); if (!classId) { - psError(PS_ERR_IO, false, "error converting extrule to name: %s\n", rule); + psError(PS_ERR_IO, false, "error converting CLASSID rule to name: %s\n", rule); return false; } } } - psTrace ("pmFPAfile", 6, "looking for detrend (%s, %s)\n", file->detrend->detID, classId); + psTrace ("psModules.camera", 6, "looking for detrend (%s, %s)\n", file->detrend->detID, classId); psFree (file->filename); @@ -260,5 +255,5 @@ } - psTrace ("pmFPAfile", 6, "got detrend file %s\n", file->filename); + psTrace ("psModules.camera", 6, "got detrend file %s\n", file->filename); psFree (classId); } @@ -277,5 +272,5 @@ case PM_FPA_FILE_HEADER: case PM_FPA_FILE_FRINGE: - psTrace ("pmFPAfile", 5, "opening %s (type: %d)\n", file->filename, file->type); + psTrace ("psModules.camera", 5, "opening %s (type: %d)\n", file->filename, file->type); if (!openImage(file, view, mode, config)) { psError(PS_ERR_UNKNOWN, false, "Unable to open image %s (type %d)\n", file->filename, file->type); @@ -285,5 +280,5 @@ // open the FITS object files case PM_FPA_FILE_CMF: - psTrace ("pmFPAfile", 5, "opening %s (type: %d)\n", file->filename, file->type); + psTrace ("psModules.camera", 5, "opening %s (type: %d)\n", file->filename, file->type); file->fits = psFitsOpen (file->filename, mode); if (file->fits == NULL) { @@ -302,6 +297,5 @@ case PM_FPA_FILE_JPEG: case PM_FPA_FILE_KAPA: - case PM_FPA_FILE_MANAPLOT: - psTrace ("pmFPAfile", 5, "defer opening %s\n", file->filename); + psTrace ("psModules.camera", 5, "defer opening %s\n", file->filename); break; @@ -367,5 +361,5 @@ return false; } - psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type); + psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type); break; case PM_FPA_FILE_MASK: @@ -374,5 +368,5 @@ return false; } - psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type); + psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type); break; case PM_FPA_FILE_WEIGHT: @@ -381,5 +375,5 @@ return false; } - psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type); + psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type); break; case PM_FPA_FILE_HEADER: @@ -388,5 +382,5 @@ return false; } - psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type); + psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type); break; case PM_FPA_FILE_FRINGE: @@ -395,5 +389,5 @@ return false; } - psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type); + psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type); if (!pmFPAviewReadFitsTable(view, file, "FRINGE")) { @@ -410,15 +404,14 @@ case PM_FPA_FILE_CMF: pmFPAviewReadObjects (view, file, config); - psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type); + psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type); break; case PM_FPA_FILE_PSF: pmFPAviewReadPSFmodel (view, file, config); - psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type); + psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type); break; case PM_FPA_FILE_JPEG: case PM_FPA_FILE_KAPA: - case PM_FPA_FILE_MANAPLOT: break; @@ -463,7 +456,7 @@ case PM_FPA_FILE_FRINGE: if (pmFPAviewFreeData(view, file)) { - psTrace ("pmFPAfile", 5, "freed %s for %s (type: %d)\n", file->filename, file->name, file->type); + psTrace ("psModules.camera", 5, "freed %s for %s (type: %d)\n", file->filename, file->name, file->type); if (file->filename == NULL) { - psTrace ("pmFPAfile", 5, "filename is not defined for %s\n", file->name); + psTrace ("psModules.camera", 5, "filename is not defined for %s\n", file->name); } } else { @@ -478,5 +471,5 @@ case PM_FPA_FILE_CMF: // pmFPAviewFreeObjects (view, file); - psTrace ("pmFPAfile", 5, "NOT freeing %s (type: %d)\n", file->filename, file->type); + psTrace ("psModules.camera", 5, "NOT freeing %s (type: %d)\n", file->filename, file->type); break; @@ -485,5 +478,4 @@ case PM_FPA_FILE_JPEG: case PM_FPA_FILE_KAPA: - case PM_FPA_FILE_MANAPLOT: break; @@ -573,5 +565,4 @@ case PM_FPA_FILE_PSF: case PM_FPA_FILE_JPEG: - case PM_FPA_FILE_MANAPLOT: case PM_FPA_FILE_KAPA: break; @@ -634,24 +625,24 @@ case PM_FPA_FILE_IMAGE: pmFPAviewWriteFitsImage(view, file, config); - psTrace ("pmFPAfile", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa); + psTrace ("psModules.camera", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa); break; case PM_FPA_FILE_MASK: pmFPAviewWriteFitsMask(view, file, config); - psTrace ("pmFPAfile", 5, "wrote mask %s (fpa: %p)\n", file->filename, file->fpa); + psTrace ("psModules.camera", 5, "wrote mask %s (fpa: %p)\n", file->filename, file->fpa); break; case PM_FPA_FILE_WEIGHT: pmFPAviewWriteFitsWeight(view, file, config); - psTrace ("pmFPAfile", 5, "wrote weight %s (fpa: %p)\n", file->filename, file->fpa); + psTrace ("psModules.camera", 5, "wrote weight %s (fpa: %p)\n", file->filename, file->fpa); break; case PM_FPA_FILE_HEADER: // pmFPAviewWriteFitsWeight(view, file, config); - // psTrace ("pmFPAfile", 5, "wrote weight %s (fpa: %p)\n", file->filename, file->fpa); + // psTrace ("psModules.camera", 5, "wrote weight %s (fpa: %p)\n", file->filename, file->fpa); psAbort ("no HEADER write functions defined"); break; case PM_FPA_FILE_FRINGE: pmFPAviewWriteFitsImage (view, file, config); - psTrace ("pmFPAfile", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa); + psTrace ("psModules.camera", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa); pmFPAviewWriteFitsTable(view, file, "FRINGE"); - psTrace ("pmFPAfile", 5, "wrote fringe table %s (fpa: %p)\n", file->filename, file->fpa); + psTrace ("psModules.camera", 5, "wrote fringe table %s (fpa: %p)\n", file->filename, file->fpa); break; @@ -661,5 +652,5 @@ case PM_FPA_FILE_CMP: case PM_FPA_FILE_CMF: - psTrace ("pmFPAfile", 5, "writing object %s (fpa: %p)\n", file->filename, file->fpa); + psTrace ("psModules.camera", 5, "writing object %s (fpa: %p)\n", file->filename, file->fpa); if (!pmFPAviewWriteObjects (view, file, config)) { psError(PS_ERR_IO, false, "Failed to write object %s", file->filename); @@ -671,20 +662,15 @@ case PM_FPA_FILE_PSF: pmFPAviewWritePSFmodel (view, file, config); - psTrace ("pmFPAfile", 5, "wrote PSF %s (fpa: %p)\n", file->filename, file->fpa); + psTrace ("psModules.camera", 5, "wrote PSF %s (fpa: %p)\n", file->filename, file->fpa); break; case PM_FPA_FILE_JPEG: pmFPAviewWriteJPEG (view, file, config); - psTrace ("pmFPAfile", 5, "wrote JPEG %s (fpa: %p)\n", file->filename, file->fpa); - break; - - case PM_FPA_FILE_MANAPLOT: - pmFPAviewWriteMANAPLOT (view, file, config); - psTrace ("pmFPAfile", 5, "wrote MANAPLOT %s (fpa: %p)\n", file->filename, file->fpa); + psTrace ("psModules.camera", 5, "wrote JPEG %s (fpa: %p)\n", file->filename, file->fpa); break; case PM_FPA_FILE_KAPA: pmFPAviewWriteSourcePlot (view, file, config); - psTrace ("pmFPAfile", 5, "wrote KAPA %s (fpa: %p)\n", file->filename, file->fpa); + psTrace ("psModules.camera", 5, "wrote KAPA %s (fpa: %p)\n", file->filename, file->fpa); break; @@ -753,5 +739,5 @@ pmFPAAddSourceFromView(file->fpa, fpaname, view, format); - psTrace ("pmFPAfile", 5, "created fpa data elements for %s (fpa: %p)\n", file->name, file->fpa); + psTrace ("psModules.camera", 5, "created fpa data elements for %s (fpa: %p)\n", file->name, file->fpa); break; } @@ -767,5 +753,4 @@ case PM_FPA_FILE_JPEG: case PM_FPA_FILE_KAPA: - case PM_FPA_FILE_MANAPLOT: break; @@ -814,5 +799,5 @@ case PM_FPA_FILE_CMF: psFitsClose (file->fits); - psTrace ("pmFPAfile", 5, "closing %s (type: %d)\n", file->filename, file->type); + psTrace ("psModules.camera", 5, "closing %s (type: %d)\n", file->filename, file->type); file->fits = NULL; file->phu = NULL; @@ -829,5 +814,4 @@ case PM_FPA_FILE_JPEG: case PM_FPA_FILE_KAPA: - case PM_FPA_FILE_MANAPLOT: break;