Index: trunk/psModules/src/imcombine/pmSubtractionStamps.h
===================================================================
--- trunk/psModules/src/imcombine/pmSubtractionStamps.h	(revision 14801)
+++ trunk/psModules/src/imcombine/pmSubtractionStamps.h	(revision 14802)
@@ -67,5 +67,5 @@
 
 /// Find stamps on an image
-pmSubtractionStampList *pmSubtractionFindStamps(pmSubtractionStampList *stamps, ///< Output stamps, or NULL
+pmSubtractionStampList *pmSubtractionStampsFind(pmSubtractionStampList *stamps, ///< Output stamps, or NULL
                                                 const psImage *image, ///< Image for which to find stamps
                                                 const psImage *mask, ///< Mask, or NULL
@@ -79,5 +79,5 @@
 /// We may optionally apply an exclusion zone around each star --- this is important when we're convolving to
 /// a specified PSF; less so when we're only trying to get a good subtraction.
-pmSubtractionStampList *pmSubtractionSetStamps(const psVector *x, ///< x coordinates for each stamp
+pmSubtractionStampList *pmSubtractionStampsSet(const psVector *x, ///< x coordinates for each stamp
                                                const psVector *y, ///< y coordinates for each stamp
                                                const psVector *flux, ///< Flux for each stamp, or NULL
@@ -86,9 +86,18 @@
                                                const psRegion *region, ///< Region to search, or NULL
                                                float spacing, ///< Rough spacing for stamps
-                                               int exclusionZone // Exclusion zone around each star
+                                               int exclusionZone ///< Exclusion zone around each star
+    );
+
+///
+pmSubtractionStampList *pmSubtractionStampsSetFromSources(
+    const psArray *sources, ///< Sources for each stamp
+    const psImage *subMask, ///< Mask, or NULL
+    const psRegion *region, ///< Region to search, or NULL
+    float spacing, ///< Rough spacing for stamps
+    int exclusionZone ///< Exclusion zone around each star
     );
 
 /// Extract stamps from the images
-bool pmSubtractionExtractStamps(pmSubtractionStampList *stamps, ///< Stamps
+bool pmSubtractionStampsExtract(pmSubtractionStampList *stamps, ///< Stamps
                                 psImage *reference, ///< Reference image
                                 psImage *input, ///< Input image (or NULL)
@@ -99,5 +108,5 @@
 
 /// Generate target for stamps based on list
-bool pmSubtractionGenerateStamps(pmSubtractionStampList *stamps, ///< Stamps
+bool pmSubtractionStampsGenerate(pmSubtractionStampList *stamps, ///< Stamps
                                  float fwhm, ///< FWHM for each stamp
                                  int footprint, ///< Stamp footprint size