Index: /branches/eam_branches/ipp-20130307/pswarp/src/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-20130307/pswarp/src/Makefile.am	(revision 35381)
+++ /branches/eam_branches/ipp-20130307/pswarp/src/Makefile.am	(revision 35382)
@@ -35,5 +35,4 @@
 	pswarpDefine.c			\
 	pswarpDefineBackground.c	\
-	pswarpDefineSkycell.c		\
 	pswarpErrorCodes.c		\
 	pswarpMapGrid.c			\
Index: /branches/eam_branches/ipp-20130307/pswarp/src/pswarpParseCamera.c
===================================================================
--- /branches/eam_branches/ipp-20130307/pswarp/src/pswarpParseCamera.c	(revision 35381)
+++ /branches/eam_branches/ipp-20130307/pswarp/src/pswarpParseCamera.c	(revision 35382)
@@ -91,12 +91,12 @@
     
     // The input skycell is a required argument: it defines the output image
-    // XXX we may need a different skycell structure here
-    pmFPAfile *skycell = NULL;
+    bool status = false;
     pmConfig *skyConfig = NULL;
-    bool status = pswarpDefineSkycell(&skycell, &skyConfig, config, "PSWARP.SKYCELL", "SKYCELL");
-    if (!status) {
-        psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.SKYCELL");
-        return false;
-    }
+    pmFPAfile *skycell = pmFPAfileDefineNewConfig(&status, &skyConfig, config, "PSWARP.SKYCELL", "SKYCELL");
+    if (!status || !skycell) {
+      psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.SKYCELL");
+      return false;
+      }
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "SKYCELL.CAMERA", 0, "Name of camera for skycell", skyConfig->cameraName);
     psFree(skyConfig);
 
@@ -142,8 +142,4 @@
     if (inBackground && psMetadataLookupBool(&mdok, recipe, "BACKGROUND.MODEL")) {
       pmFPAfile *outBackground = pmFPAfileDefineSkycell(config, NULL, "PSWARP.OUTPUT.BKGMODEL");
-/*       pmFPAfile *outBackground = pmFPAfileDefineFromFPA(config,output->fpa, */
-/* 							psMetadataLookupS32(&mdok,recipe,"BKG.XGRID"), */
-/* 							psMetadataLookupS32(&mdok,recipe,"BKG.YGRID"), */
-/* 							"PSWARP.OUTPUT.BKGMODEL"); */
       outBackground->xBin = psMetadataLookupS32(&mdok, recipe, "BKG.XGRID");
       outBackground->yBin = psMetadataLookupS32(&mdok, recipe, "BKG.YGRID");