Index: /branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoop.c
===================================================================
--- /branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoop.c	(revision 35512)
+++ /branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoop.c	(revision 35513)
@@ -89,7 +89,4 @@
 
     pmFPAview *view = pmFPAviewAlloc(0);
-
-    // XXX : need to generate a list of input cells for each output cell
-    // XXX : psList *cells = psListAlloc(NULL);  // List of cells, for concepts averaging
 
     // files associated with the science image
Index: /branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c
===================================================================
--- /branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c	(revision 35512)
+++ /branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c	(revision 35513)
@@ -67,6 +67,5 @@
     }
 
-    // XXX I should allow the astrometry input to be either WCS or CMF
-    // Define the input astrometry file(s)
+    // Define the input astrometry file(s) (may be either WCS or CMF)
     bool status = false;
     pmFPAfile *astrom = pmFPAfileDefineFromArgs(&status, config, "PSWARP.ASTROM", "ASTROM");
@@ -140,7 +139,6 @@
     output->save = true;
 
-    // XXX for a test, skip these
-# if (0)
-    pmFPAfile *outMask = pmFPAfileDefineSkycell(config, output->fpa, "PSWARP.OUTPUT.MASK");
+    // pmFPAfile *outMask = pmFPAfileDefineSkycell(config, output->fpa, "PSWARP.OUTPUT.MASK");
+    pmFPAfile *outMask = pmFPAfileDefineOutputForFormat(config, output->fpa, "PSWARP.OUTPUT.MASK", skycell->cameraName, skycell->formatName);
     if (!outMask) {
         psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.OUTPUT.MASK");
@@ -150,5 +148,6 @@
 
     if (inVariance) {
-        pmFPAfile *outVariance = pmFPAfileDefineSkycell(config, output->fpa, "PSWARP.OUTPUT.VARIANCE");
+        // pmFPAfile *outVariance = pmFPAfileDefineSkycell(config, output->fpa, "PSWARP.OUTPUT.VARIANCE");
+	pmFPAfile *outVariance = pmFPAfileDefineOutputForFormat(config, output->fpa, "PSWARP.OUTPUT.VARIANCE", skycell->cameraName, skycell->formatName);
         if (!outVariance) {
             psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.OUTPUT.VARIANCE");
@@ -158,4 +157,6 @@
     }
 
+# if (0)
+    // XXX wait on sources
     if (astrom && psMetadataLookupBool(&mdok, recipe, "SOURCES")) {
         pmFPAfile *outSources = pmFPAfileDefineSkycell(config, output->fpa, "PSWARP.OUTPUT.SOURCES");
@@ -180,5 +181,5 @@
     }
     
-    /// XXX TEST 
+    /// XXX re-enable after sources work
     if (false && psMetadataLookupBool(&mdok, recipe, "PSF")) {
         // This file, PSPHOT.INPUT, is just used as a carrier; output files (eg, PSPHOT.RESID) are defined by