Index: trunk/ppImage/src/ppImage.h
===================================================================
--- trunk/ppImage/src/ppImage.h	(revision 5976)
+++ trunk/ppImage/src/ppImage.h	(revision 6064)
@@ -9,11 +9,10 @@
 #include "psAdditionals.h"
 
-#include "pmAstrometry.h"
+#include "pmFPA.h"
+#include "pmFPAConstruct.h"
+#include "pmFPARead.h"
+#include "pmFPAWrite.h"
 #include "pmReadout.h"
 #include "pmConfig.h"
-#include "pmFPAConstruct.h"
-#include "pmFPARead.h"
-#include "pmFPAConceptsGet.h"
-#include "pmFPAWrite.h"
 
 #include "pmFlatField.h"
@@ -23,4 +22,5 @@
 #include "pmChipMosaic.h"
 //#include "pmFPAMorph.h"
+#include "pmSubtractBias.h"
 
 #define RECIPE "PHASE2"                 // Name of the recipe to use
@@ -53,17 +53,10 @@
     bool doSource;                      // Source identification and photometry
     bool doAstrom;                      // Astrometry
-
     bool doOverscan;                    // Overscan subtraction
-    int overscanBins;                   // Number of pixels per bin for overscan
-    psStats *overscanStats;             // Statistics for overscan
-    void *overscanFit;                  // Overscan fit (polynomial or spline)
-    pmFit overscanFitType;              // Fit type for overscan
-    pmOverscanAxis overscanMode;        // Axis for overscan
-
+    pmOverscanOptions *overscan;        // Overscan options
     bool doNonLin;                      // Non-linearity correction
     psDataType nonLinearType;
     psMetadataItem *nonLinearData;
     void *nonLinearSource;
-
     ppImageLoadDepth imageLoadDepth;    // How much of the FPA to load at once
 } ppOptions;
@@ -142,6 +135,8 @@
 bool ppDetrendNonLinearLookup(pmReadout *input, psMetadataItem *dataItem);
 bool ppDetrendNonLinearPolynomial(pmReadout *input, psMetadataItem *dataItem);
-bool ppDetrendBias(pmCell *inputCell, pmReadout *inputReadout, pmReadout *pedestal, ppOptions *options);
+bool ppDetrendBias(pmReadout *inputReadout, pmReadout *bias, pmReadout *dark, ppOptions *options);
+#if 0
 pmReadout* ppDetrendPedestal(pmReadout *pedestal, pmCell *input, pmReadout *bias, pmReadout *dark, float darkTime, ppOptions *options);
+#endif
 pmReadout* ppDetrendSelectFirst(pmCell *cell, char *name, bool doThis);
 
@@ -150,4 +145,6 @@
 #endif
 
+bool ppImageOutput(ppData *data, ppConfig *config);
+bool ppImagePhot(ppData *data, ppOptions *options, ppConfig *config);
 
 #endif // Pau.