Index: trunk/ppBackground/src/ppBackgroundStack.h
===================================================================
--- trunk/ppBackground/src/ppBackgroundStack.h	(revision 36579)
+++ trunk/ppBackground/src/ppBackgroundStack.h	(revision 36580)
@@ -7,5 +7,5 @@
 #include "ppBackgroundErrorCodes.h"
 
-#define PPBACKGROUND_RECIPE "PPBACKGROUND"      // Recipe name
+#define PPBACKGROUND_RECIPE "PPBACKGROUND_STACK"      // Recipe name
 
 // Data for processing
@@ -30,5 +30,5 @@
 
 /// Initialise data for processing
-ppBackgroundData *ppBackgroundDataInit(int *argc, char *argv[] // Command-line arguments
+ppBackgroundStackData *ppBackgroundStackDataInit(int *argc, char *argv[] // Command-line arguments
     );
 
@@ -39,29 +39,16 @@
 
 /// Parse camera configurations
-bool ppBackgroundStackCamera(ppBackgroundData *data // Data for processing
+bool ppBackgroundStackCamera(ppBackgroundStackData *data // Data for processing
     );
 
 /// Loop over input data, processing
-bool ppBackgroundStackLoop(ppBackgroundData *data // Data for processing
+bool ppBackgroundStackLoop(ppBackgroundStackData *data // Data for processing
     );
 
-/// Determine the binning from the recipe if available.
-psImageBinning *ppBackgroundStackBinningByRecipe(const psImage *image, // Image for which to generate a bg model
-						 const pmConfig *config, // Configuration
-						 psString recipe_name,
-						 psString Xbin_name,
-						 psString Ybin_name
-						 );
+bool ppBackgroundStackModelFitOTASolution(ppBackgroundStackData *data);
+bool ppBackgroundStackDataModelFit(ppBackgroundStackData *data);
+bool ppBackgroundStackCalibApply(ppBackgroundStackData *data);
+bool ppBackgroundStackModelFit(ppBackgroundStackData *data);
 
-
-/// Restore the background to an image
-bool ppBackgroundStackRestore(
-    pmChip *chip,                       // Chip to correct
-    const pmChip *background,           // Chip with background model
-    const pmChip *pattern,              // Chip with pattern
-    const pmFPAview *view,              // View to data
-    pmConfig *config,                   // Configuration
-    psImageMaskType maskBad             // value to use for bad pixels
-    );
 
 /// Determine exit code