Index: /branches/eam_branches/ipp-20100823/ippconfig/recipes/ppSub.config
===================================================================
--- /branches/eam_branches/ipp-20100823/ippconfig/recipes/ppSub.config	(revision 29511)
+++ /branches/eam_branches/ipp-20100823/ippconfig/recipes/ppSub.config	(revision 29512)
@@ -2,10 +2,10 @@
 
 KERNEL.TYPE	STR	ISIS     	# Kernel type to use (POIS|ISIS|SPAM|FRIES|GUNK|RINGS)
-KERNEL.SIZE     S32	20		# Kernel half-size (pixels)
+KERNEL.SIZE     S32	10		# Kernel half-size (pixels)
 SPATIAL.ORDER   S32	1		# Spatial polynomial order
 REGION.SIZE	F32	0		# Iso-kernel region size (pixels)
 SOURCE.RADIUS	F32	3.0		# Source matching radius (pixels)
 STAMP.SPACING   F32	300		# Typical spacing between stamps (pixels)
-STAMP.FOOTPRINT S32	25		# Size of stamps (pixels)
+STAMP.FOOTPRINT S32	10		# Size of stamps (pixels)
 STAMP.THRESHOLD F32	5		# Flux threshold for stamps (stdev above background)
 STRIDE		S32	100		# Size of convolution patches (pixels)
@@ -36,29 +36,18 @@
 BADFRAC		F32	0.95		# Maximum fraction of bad pixels
 
-# Gene's choice: multiplying by 1.75
-#@ISIS.WIDTHS	F32	1.8 3.3 5.8 10.2 17.9	# Gaussian FWHMs for ISIS kernels
-#@ISIS.ORDERS	S32	2 2 2 2 2		# Polynomial orders for ISIS kernels
-# (pi/2)^i
-#@ISIS.WIDTHS	F32	1.6 2.5 3.9 6.1 9.6 15.0	# Gaussian FWHMs for ISIS kernels
-#@ISIS.ORDERS	S32	2 2 2 2 2 2		# Polynomial orders for ISIS kernels
-# (e/2)^i for even i
-#@ISIS.WIDTHS	F32	1.4 3.4 6.3 11.6	# Gaussian FWHMs for ISIS kernels
-#@ISIS.ORDERS	S32	6 4 4 2		# Polynomial orders for ISIS kernels
-# 1.69^i
-#@ISIS.WIDTHS	F32	2.9 4.8 8.2 13.8 23.3 # Gaussian FWHMs for ISIS kernels
-#@ISIS.ORDERS	S32	4 2 2 2 2	# Polynomial orders for ISIS kernels
+# photpipe kernels
+@ISIS.WIDTHS	F32	1.5  3.0  6.0   # Gaussian kernel FWHM values
+@ISIS.ORDERS	S32	6    4    2     # Polynomial orders for ISIS kernels
 
-# Paul's values
-# @ISIS.WIDTHS	F32	2.9 4.8 8.2 13.8 # Gaussian FWHMs for ISIS kernels
-# @ISIS.ORDERS	S32	4 2 2 2		# Polynomial orders for ISIS kernels
-
-# Gene's values
-@ISIS.WIDTHS	F32	2.9 4.8 8.2     # Gaussian FWHMs for ISIS kernels
-@ISIS.ORDERS	S32	4   2   2       # Polynomial orders for ISIS kernels
+# for autoscaling, the above kernel widths are multiplied by the factor max(FWHM_1,FWHM_2) / SCALE.REF
+SCALE		BOOL	TRUE		# Scale kernel parameters by the seeing?
+SCALE.REF	F32	6.0		# FWHM reference for kernel parameter scaling
+SCALE.MIN	F32	0.5		# Minimum scale value
+SCALE.MAX	F32	2.0		# Maximum scale value
 
 SPAM.BINNING	S32	2		# Binning in outer region for SPAM kernels
 INNER		S32	5		# Inner half-size for SPAM and FRIES kernels
 RINGS.ORDER	S32	2		# Polynomial order for RINGS kernels
-PENALTY		F32	4.0e-6		# 4.0e-6 for the updated code from 2010.09.19
+PENALTY		F32	5.0e-7		# 4.0e-6 for the updated code from 2010.09.19
 BIN1		S32	4		# Binning factor for first level
 BIN2		S32	4		# Binning factor for second level
@@ -75,9 +64,4 @@
 RENORM.MIN	F32	0.2		# Minimum value for renormalization
 RENORM.MAX	F32	5.0		# Maximum value for renormalization
-
-SCALE		BOOL	TRUE		# Scale kernel parameters by the seeing?
-SCALE.REF	F32	9.0		# Reference for kernel parameter scaling
-SCALE.MIN	F32	0.7		# Minimum scale value
-SCALE.MAX	F32	1.2		# Maximum scale value
 
 INTERPOLATION	STR	LANCZOS3	# Interpolation mode for bad pixels
@@ -141,2 +125,42 @@
 TEST.DECON METADATA
 END
+
+# Gene's choice: multiplying by 1.75
+#@ISIS.WIDTHS	F32	1.8 3.3 5.8 10.2 17.9	# Gaussian FWHMs for ISIS kernels
+#@ISIS.ORDERS	S32	2 2 2 2 2		# Polynomial orders for ISIS kernels
+# (pi/2)^i
+#@ISIS.WIDTHS	F32	1.6 2.5 3.9 6.1 9.6 15.0	# Gaussian FWHMs for ISIS kernels
+#@ISIS.ORDERS	S32	2 2 2 2 2 2		# Polynomial orders for ISIS kernels
+# (e/2)^i for even i
+#@ISIS.WIDTHS	F32	1.4 3.4 6.3 11.6	# Gaussian FWHMs for ISIS kernels
+#@ISIS.ORDERS	S32	6 4 4 2		# Polynomial orders for ISIS kernels
+# 1.69^i
+#@ISIS.WIDTHS	F32	2.9 4.8 8.2 13.8 23.3 # Gaussian FWHMs for ISIS kernels
+#@ISIS.ORDERS	S32	4 2 2 2 2	# Polynomial orders for ISIS kernels
+
+# Paul's values
+# @ISIS.WIDTHS	F32	2.9 4.8 8.2 13.8 # Gaussian FWHMs for ISIS kernels
+# @ISIS.ORDERS	S32	4 2 2 2		# Polynomial orders for ISIS kernels
+
+# Armin's values
+#@ISIS.WIDTHS	F32	1.5 3.0 6.0 12.0   # Gaussian FWHMs for ISIS kernels
+#@ISIS.ORDERS	S32	6   4   2   2      # Polynomial orders for ISIS kernels
+
+# test
+#@ISIS.WIDTHS	F32	4.0  6.0 9.0     # Gaussian FWHMs for ISIS kernels
+#@ISIS.ORDERS	S32	6    4   2       # Polynomial orders for ISIS kernels
+
+#@ISIS.WIDTHS	F32	1.8  3.2  5.7   # Gaussian FWHMs for ISIS kernels
+#@ISIS.ORDERS	S32	2    4    2     # Polynomial orders for ISIS kernels
+
+# @ISIS.WIDTHS	F32	2.33 5.00  9.90   # hotpants values for test 01 - 00: 
+# @ISIS.WIDTHS	F32	2.47 5.29 10.86   # hotpants values for test 02 - 00: 
+# @ISIS.WIDTHS	F32	2.47 5.29 11.75   # hotpants values for test 03 - 00: 
+# @ISIS.WIDTHS	F32	2.47 5.29 13.54   # hotpants values for test 04 - 00: 
+# @ISIS.WIDTHS	F32	2.12 4.51 9.05    # hotpants values for test 07 - 00: 
+# @ISIS.ORDERS	S32	6    4    2       # Polynomial orders for ISIS kernels
+
+# @ISIS.WIDTHS	F32	1.90 4.07 8.11 16.22 # hotpants values for test 05 - 00: 
+# @ISIS.WIDTHS	F32	2.11 4.51 9.02 18.05 # hotpants values for test 06 - 00: 
+# @ISIS.ORDERS	S32	6    4    2    2    # Polynomial orders for ISIS kernels
+