Index: trunk/ppStack/src/ppStackCombinePrepare.c
===================================================================
--- trunk/ppStack/src/ppStackCombinePrepare.c	(revision 27004)
+++ trunk/ppStack/src/ppStackCombinePrepare.c	(revision 27319)
@@ -10,5 +10,6 @@
 #include "ppStackLoop.h"
 
-bool ppStackCombinePrepare(ppStackThreadData *stack, ppStackOptions *options, pmConfig *config)
+bool ppStackCombinePrepare(pmReadout **ro, const char *name, ppStackFileList files, ppStackThreadData *stack,
+                           ppStackOptions *options, pmConfig *config)
 {
     psAssert(stack, "Require stack");
@@ -25,5 +26,5 @@
 
     pmFPAfileActivate(config->files, false, NULL);
-    ppStackFileActivation(config, PPSTACK_FILES_COMBINE, true);
+    ppStackFileActivation(config, files, true);
     pmFPAview *view = ppStackFilesIterateDown(config); // View to readout
     if (!view) {
@@ -31,9 +32,6 @@
     }
 
-    pmCell *outCell = pmFPAfileThisCell(config->files, view, "PPSTACK.OUTPUT"); // Output cell
-    options->outRO = pmReadoutAlloc(outCell); // Output readout
-
-    pmCell *unconvCell = pmFPAfileThisCell(config->files, view, "PPSTACK.UNCONV"); // Unconvolved cell
-    options->unconvRO = pmReadoutAlloc(unconvCell); // Unconvolved readout
+    pmCell *cell = pmFPAfileThisCell(config->files, view, name); // Output cell
+    *ro = pmReadoutAlloc(cell); // Output readout
 
     psFree(view);
@@ -44,16 +42,9 @@
     psImageMaskType maskBad = pmConfigMaskGet(maskBadStr, config); // Bits to mask for bad pixels
 
-    if (!pmReadoutStackDefineOutput(options->outRO, col0, row0, numCols, numRows, true, true, maskBad)) {
+    if (!pmReadoutStackDefineOutput(*ro, col0, row0, numCols, numRows, true, true, maskBad)) {
         psError(PPSTACK_ERR_ARGUMENTS, false, "Unable to prepare output.");
         return false;
     }
 
-    options->unconvRO->image = psImageCopy(NULL, options->outRO->image, PS_TYPE_F32);
-//    options->unconvRO->mask = psImageCopy(NULL, options->outRO->mask, PS_TYPE_IMAGE_MASK);
-    options->unconvRO->col0 = options->outRO->col0;
-    options->unconvRO->row0 = options->outRO->row0;
-
-
-
     return true;
 }