Index: /branches/eam_branches/ipp-20130904/ippconfig/recipes/psphot.config
===================================================================
--- /branches/eam_branches/ipp-20130904/ippconfig/recipes/psphot.config	(revision 36348)
+++ /branches/eam_branches/ipp-20130904/ippconfig/recipes/psphot.config	(revision 36349)
@@ -264,7 +264,4 @@
   EXTENDED_SOURCE_SN_LIM              F32   20.0
   EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
-  EXTENDED_SOURCE_ISOPHOTAL           BOOL  TRUE
-  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
-  EXTENDED_SOURCE_KRON                BOOL  FALSE
 END
 
@@ -475,8 +472,7 @@
 STACKPHOT_TEST                        METADATA
   EXTENDED_SOURCE_FITS                BOOL  F  # perform any of the aperture-like measurements?
-  EXTENDED_SOURCE_ANALYSIS            BOOL  F  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_SN_LIM              F32   10.0
   EXTENDED_SOURCE_PETROSIAN           BOOL  F
-  EXTENDED_SOURCE_ANNULI              BOOL  F
+
   PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
   PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
@@ -495,8 +491,7 @@
 STACKPHOT_TEST_V1                     METADATA
   EXTENDED_SOURCE_FITS                BOOL  F  # perform any of the aperture-like measurements?
-  EXTENDED_SOURCE_ANALYSIS            BOOL  F  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_SN_LIM              F32   20.0
   EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
-  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
+
   PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
   PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
@@ -520,8 +515,7 @@
 SINGLE_TEST_V1                     METADATA
   EXTENDED_SOURCE_FITS                BOOL  F  # perform any of the aperture-like measurements?
-  EXTENDED_SOURCE_ANALYSIS            BOOL  F  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_SN_LIM              F32   20.0
   EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
-  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
+
   PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
   PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
@@ -530,9 +524,6 @@
   RADIAL_APERTURES                    BOOL  F    # calculate flux in circular radial apertures?
   RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
-#  OUTPUT.FORMAT                       STR   PS1_SV1
   OUTPUT.FORMAT                       STR   PS1_V3
 
-  # CONSTANT_PHOTOMETRIC_WEIGHTS        BOOL  TRUE
-  # POISSON.ERRORS.PHOT.LMM             BOOL  FALSE
   CONSTANT_PHOTOMETRIC_WEIGHTS        BOOL  FALSE
   POISSON.ERRORS.PHOT.LMM             BOOL  TRUE