Index: trunk/psModules/src/camera/pmFPAfileIO.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileIO.c	(revision 12300)
+++ 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;