Index: trunk/psModules/src/camera/pmFPAfile.h
===================================================================
--- trunk/psModules/src/camera/pmFPAfile.h	(revision 13523)
+++ trunk/psModules/src/camera/pmFPAfile.h	(revision 13810)
@@ -4,6 +4,6 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-05-26 02:50:36 $
+ * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-06-14 02:03:29 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -53,29 +53,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?
 
-    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 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 *filesrc;	                // rule to find file in pmFPAfile->names list
+    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
@@ -110,4 +110,7 @@
 
 // convert the rule to a name based on the current view
+psString pmFPANameFromRule(const char *rule, const pmFPA *fpa, const pmFPAview *view);
+
+// convert the rule to a name based on the current view
 psString pmFPAfileNameFromRule(const char *rule, const pmFPAfile *file, const pmFPAview *view);