Index: branches/eam_branches/psphot.20100506/src/psphot.h
===================================================================
--- branches/eam_branches/psphot.20100506/src/psphot.h	(revision 27876)
+++ branches/eam_branches/psphot.20100506/src/psphot.h	(revision 27883)
@@ -367,10 +367,21 @@
 int pmPhotObjSortByX (const void **a, const void **b);
 
+typedef enum {
+    PSPHOT_CNV_SRC_NONE,
+    PSPHOT_CNV_SRC_AUTO,
+    PSPHOT_CNV_SRC_CNV,
+    PSPHOT_CNV_SRC_RAW,
+} psphotStackConvolveSource;
+
 /// Options for stacking process
 typedef struct {
     // Setup
     
+    int numCols;                            // size of image (X)
+    int numRows;                            // size of image (Y)
+
     int num;                            // Number of inputs
     bool convolve;                      // Convolve images?
+    psphotStackConvolveSource convolveSource;
     // psArray *convImages, *convMasks, *convVariances; // Filenames for the temporary convolved images
 
@@ -420,4 +431,5 @@
 bool psphotStackMatchPSFs (pmConfig *config, const pmFPAview *view);
 bool psphotStackMatchPSFsReadout (pmConfig *config, const pmFPAview *view, psphotStackOptions *options, int index);
+bool psphotStackMatchPSFsPrepare (pmConfig *config, const pmFPAview *view, psphotStackOptions *options, int index);
 
 // psphotStackMatchPSFsUtils
@@ -437,3 +449,8 @@
 bool readImage(psImage **target, const char *name, const pmConfig *config);
 
+pmPSF *psphotStackPSF(const pmConfig *config, int numCols, int numRows, const psArray *psfs, const psVector *inputMask);
+
+psphotStackOptions *psphotStackOptionsAlloc (int num);
+psphotStackConvolveSource psphotStackConvolveSourceFromString (const char *string);
+
 #endif