Index: trunk/psModules/src/camera/pmFPAfile.h
===================================================================
--- trunk/psModules/src/camera/pmFPAfile.h	(revision 12299)
+++ 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