Index: trunk/ippconfig/gpc1/psastro.config
===================================================================
--- trunk/ippconfig/gpc1/psastro.config	(revision 41668)
+++ trunk/ippconfig/gpc1/psastro.config	(revision 41705)
@@ -129,6 +129,6 @@
 DVO.GETSTAR.PHOTCODE        STR      i
 DVO.GETSTAR.MAX.RHO         F32      10000.0
-DVO.GETSTAR.MIN.MAG         F32      2.0
-DVO.GETSTAR.MIN.MAG.INST    F32     -35.0
+DVO.GETSTAR.MIN.MAG         F32     -10.0
+DVO.GETSTAR.MIN.MAG.INST    F32     -45.0
 
 # rather than mean, use specified EDGE:
@@ -184,6 +184,4 @@
 REFSTAR_MASK                    BOOL TRUE
 REFSTAR_MASK_MAX_MAG            F32 -15.0
-REFSTAR_MASK_SATSTAR_MAG_MAX    F32 -15.0
-REFSTAR_MASK_SATSTAR_MAG_SLOPE  F32  10.15
 
 # TdB20200430: Updated satspike position angle offset
Index: trunk/ippconfig/gpc2/Makefile.am
===================================================================
--- trunk/ippconfig/gpc2/Makefile.am	(revision 41668)
+++ trunk/ippconfig/gpc2/Makefile.am	(revision 41705)
@@ -12,4 +12,5 @@
         ppMerge.config \
 	psphot.config \
+	pswarp.config \
 	ppStack.config \
 	psastro.config \
Index: trunk/ippconfig/gpc2/psastro.config
===================================================================
--- trunk/ippconfig/gpc2/psastro.config	(revision 41668)
+++ trunk/ippconfig/gpc2/psastro.config	(revision 41705)
@@ -129,7 +129,7 @@
 
 DVO.GETSTAR.PHOTCODE        STR      i
-DVO.GETSTAR.MAX.RHO         F32      3000.0
-DVO.GETSTAR.MIN.MAG         F32      2.0
-DVO.GETSTAR.MIN.MAG.INST    F32     -35.0
+DVO.GETSTAR.MAX.RHO         F32      10000.0
+DVO.GETSTAR.MIN.MAG         F32     -10.0
+DVO.GETSTAR.MIN.MAG.INST    F32     -45.0
 
 # rather than mean, use specified EDGE:
@@ -185,6 +185,4 @@
 REFSTAR_MASK                    BOOL TRUE
 REFSTAR_MASK_MAX_MAG            F32 -16.5
-REFSTAR_MASK_SATSTAR_MAG_MAX    F32 -15.0
-REFSTAR_MASK_SATSTAR_MAG_SLOPE  F32  10.15
 
 #TdB20200214: Position of gpc2 spikes determined on image
Index: trunk/ippconfig/gpc2/pswarp.config
===================================================================
--- trunk/ippconfig/gpc2/pswarp.config	(revision 41705)
+++ trunk/ippconfig/gpc2/pswarp.config	(revision 41705)
@@ -0,0 +1,2 @@
+APPLY.PIXELNAN		BOOL	FALSE		# Apply NAN'ing of pixels underneath masks
+
Index: trunk/ippconfig/recipes/masks.16bit.config
===================================================================
--- trunk/ippconfig/recipes/masks.16bit.config	(revision 41668)
+++ trunk/ippconfig/recipes/masks.16bit.config	(revision 41705)
@@ -24,5 +24,5 @@
 SPIKE		U16	0x0200		# Pixel contains a diffraction spike
 GHOST		U16	0x0400		# Pixel contains an optical ghost
-STREAK		U16	0x0800		# Pixel contains a streak
+CROSSTALK	U16	0x0800		# Pixel contains electronic crosstalk
 STARCORE	U16	0x1000		# Pixel contains a bright star core
 
Index: trunk/ippconfig/recipes/masks.config
===================================================================
--- trunk/ippconfig/recipes/masks.config	(revision 41668)
+++ trunk/ippconfig/recipes/masks.config	(revision 41705)
@@ -25,5 +25,5 @@
 CR		U8	0x20		# Pixel contains a cosmic ray
 GHOST		U8	0x20		# Pixel contains an optical ghost
-STREAK		U8	0x20		# Pixel contains a streak
+CROSSTALK	U16	0x0800		# Pixel contains electronic crosstalk
 
 SPIKE		U8	0x20		# Pixel contains a diffraction spike
Index: trunk/ippconfig/recipes/ppStack.config
===================================================================
--- trunk/ippconfig/recipes/ppStack.config	(revision 41668)
+++ trunk/ippconfig/recipes/ppStack.config	(revision 41705)
@@ -10,5 +10,5 @@
 
 MASK.VAL	STR	MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels
-MASK.SUSPECT	STR	SUSPECT,BURNTOOL,SPIKE,STREAK,STARCORE,CONV.POOR # Mask value of suspect pixels
+MASK.SUSPECT	STR	SUSPECT,BURNTOOL,SPIKE,CROSSTALK,STARCORE,CONV.POOR # Mask value of suspect pixels
 MASK.BAD	STR	BLANK		# Mask value to give bad pixels
 MASK.POOR	STR	CONV.POOR	# Mask value to give poor pixels