Index: trunk/ppImage/src/ppImage.h
===================================================================
--- trunk/ppImage/src/ppImage.h	(revision 6260)
+++ trunk/ppImage/src/ppImage.h	(revision 6747)
@@ -3,42 +3,23 @@
 
 #include "pslib.h"
-#include "pmFPA.h"
-#include "ppConfig.h"
-#include "ppFile.h"
+#include "psmodules.h"
+
 #include "ppImageData.h"
 #include "ppImageOptions.h"
 
-
-#if 0
-#include <strings.h>
-#include "psAdditionals.h"
-#include "pmFPA.h"
-#include "pmFPAConstruct.h"
-#include "pmFPARead.h"
-#include "pmFPAWrite.h"
-#include "pmReadout.h"
-#include "pmConfig.h"
-#include "pmFlatField.h"
-#include "pmMaskBadPixels.h"
-#include "pmNonLinear.h"
-#include "pmChipMosaic.h"
-#include "pmSubtractBias.h"
-#endif
-
-
-#define RECIPE "PHASE2"                 // Name of the recipe to use
+#define RECIPE_NAME "PHASE2"            // Name of the recipe to use
 #define TIMERNAME "ppImage"             // Name of timer
 
 // Get the configuration
-bool ppImageConfig(ppConfig *config, int argc, char **argv);
+pmConfig *ppImageConfig(int argc, char **argv);
 
 // Determine what type of camera, and initialise
 bool ppImageParseCamera(ppImageData *data,   // The data to be processed
-                        ppConfig *config // Configuration
+                        pmConfig *config // Configuration
                         );
 
 
 // Loop over the input
-bool ppImageLoop(ppImageData *data, ppImageOptions *options, ppConfig *config);
+bool ppImageLoop(ppImageData *data, ppImageOptions *options, pmConfig *config);
 
 // Load the pixels for the given file
@@ -49,5 +30,5 @@
                        );
 
-bool ppImageParseDetrend(ppImageData *data, ppImageOptions *options, ppConfig *config);
+bool ppImageParseDetrend(ppImageData *data, ppImageOptions *options, pmConfig *config);
 
 bool ppReadoutWeights(pmReadout *readout);
@@ -56,7 +37,7 @@
 // These functions are not implemented, or not needed
 pmReadout* ppDetrendPedestal(pmReadout *pedestal, pmCell *input, pmReadout *bias, pmReadout *dark, float darkTime, ppImageOptions *options);
-bool ppImageOutput(ppImageData *data, ppConfig *config);
-bool ppImagePhot(ppImageData *data, ppImageOptions *options, ppConfig *config);
-bool ppFileOpen(ppFile *fpa, psMetadata *camera, char *name, bool doThis);
+bool ppImageOutput(ppImageData *data, pmConfig *config);
+bool ppImagePhot(ppImageData *data, ppImageOptions *options, pmConfig *config);
+bool ppFileOpen(ppFile *fpa, char *name, bool doThis);
 #endif