Index: branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoop.c
===================================================================
--- branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoop.c	(revision 35513)
+++ branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoop.c	(revision 35514)
@@ -86,5 +86,9 @@
     pswarpFileActivation(config, detectorFiles, true);
 
+    // need to read in these (but only if CMF, right?)
+    pmFPAfileActivate(config->files, true, "PSWARP.ASTROM");
+
     // pswarpFileActivation(config, independentFiles, true);
+
 
     pmFPAview *view = pmFPAviewAlloc(0);
Index: branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c
===================================================================
--- branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c	(revision 35513)
+++ branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c	(revision 35514)
@@ -157,8 +157,7 @@
     }
 
-# if (0)
-    // XXX wait on sources
     if (astrom && psMetadataLookupBool(&mdok, recipe, "SOURCES")) {
-        pmFPAfile *outSources = pmFPAfileDefineSkycell(config, output->fpa, "PSWARP.OUTPUT.SOURCES");
+        // pmFPAfile *outSources = pmFPAfileDefineSkycell(config, output->fpa, "PSWARP.OUTPUT.SOURCES");
+	pmFPAfile *outSources = pmFPAfileDefineOutputForFormat(config, output->fpa, "PSWARP.OUTPUT.SOURCES", skycell->cameraName, skycell->formatName);
         if (!outSources) {
             psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.OUTPUT.SOURCES");
@@ -167,5 +166,4 @@
         outSources->save = true;
     }
-# endif
 
     if (inBackground && psMetadataLookupBool(&mdok, recipe, "BACKGROUND.MODEL")) {