Changeset 29060 for branches/sc_branches/trunkTest/ippconfig/recipes/psphot.config

Timestamp:

Aug 26, 2010, 9:18:39 AM (16 years ago)

Author:

Serge CHASTEL

Message:

Merging trunk in branch

Location:

branches/sc_branches/trunkTest

Files:

• . (modified) (1 prop)
• ippconfig/recipes (modified) (1 prop)
• ippconfig/recipes/psphot.config (modified) (9 diffs)

branches/sc_branches/trunkTest/ippconfig/recipes/psphot.config

@@ -90 +90 @@
 
 PSF_FIT_ITER                        S32   50              # Maximum number of fitting iterations for PSF
-PSF_FIT_TOL                         F32   0.01            # Fit tolerance for PSF
+PSF_FIT_MIN_TOL                     F32   0.01            # Fit tolerance for PSF
+PSF_FIT_MAX_TOL                     F32   2.00            # Fit tolerance for PSF
+
+PSF_FIT_MIN_VALID_FLUX              F32  -100000000.0     # minimum allow flux for fitted source
+PSF_FIT_MAX_VALID_FLUX              F32  +100000000.0     # maximum allow flux for fitted source
+
+# the following is used to require a minimum quality of fit before
+# stopping based on the tolerance.  be careful of using this in
+# conjunction with non-poisson errors (POISSON.ERRORS.LMM) or with
+# pooly determined errors
+PSF_FIT_MAX_CHISQ                   F32  20.00            # require chisq / DOF to reach this level before giving up
 
 # PSF model parameters : choose the PSF model
@@ -113 +123 @@
 PSF.FAKE.ALLOW                      BOOL  FALSE           # Allow use of fake PSFs when having trouble?
 
+PSF_FIT_RADIUS                      F32   15.0            # XXX this is now autoscaled
 PSF_REF_RADIUS                      F32   25.0            # aperture magnitudes are scaled via 
                                                           # curve-of-growth to this radius
@@ -138 +149 @@
  
 # this model is used for approximate subtraction in the main object analysis step
-EXT_MODEL                           STR   PS_MODEL_QGAUSS
+EXT_MODEL                           STR   PS_MODEL_SERSIC
 EXT_FIT_NSIGMA                      F32   1               # significance for pixel included in fit
 EXT_FIT_PADDING                     F32   5               # extra annulus to use for fit 
@@ -145 +156 @@
 
 EXT_FIT_ITER                        S32   20              # Maximum number of fitting iterations for EXT
-EXT_FIT_TOL                         F32   0.01            # Fit tolerance for EXT
+EXT_FIT_MIN_TOL                     F32   0.01            # Fit tolerance for EXT
+EXT_FIT_MAX_TOL                     F32   2.00            # Fit tolerance for EXT
+
+# the following is used to require a minimum quality of fit before
+# stopping based on the tolerance.  be careful of using this in
+# conjunction with non-poisson errors (POISSON.ERRORS.LMM) or with
+# pooly determined errors
+EXT_FIT_MAX_CHISQ                   F32  20.00            # require chisq / DOF to reach this level before giving up
 
 # extended source aperture-like measurements
@@ -170 +188 @@
  #PGAUSS_PSF  EXTENDED_SOURCE_MODEL  PS_MODEL_PGAUSS   20.0    TRUE
  #QGAUSS_PSF  EXTENDED_SOURCE_MODEL  PS_MODEL_QGAUSS   20.0    TRUE
- SERSIC_PSF  EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC   20.0    TRUE
+ EXP_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_EXP      20.0    TRUE
+ DEV_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_DEV      20.0    TRUE
+ SER_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC   20.0    TRUE
 END
 
@@ -224 +244 @@
 PCM_BOX_SIZE                        S32   8
 
-NOISE.FACTOR                        F32   5.0
+NOISE.FACTOR                        F32  10.0
 NOISE.SIZE                          F32   2.0
 
@@ -307 +327 @@
 # Extended source fit parameters
 STACKPHOT                             METADATA
+  EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_ANALYSIS            BOOL  TRUE  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_SN_LIM              F32   20.0
   EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
-  EXTENDED_SOURCE_ISOPHOTAL           BOOL  FALSE
   EXTENDED_SOURCE_ANNULI              BOOL  TRUE
-  EXTENDED_SOURCE_KRON                BOOL  FALSE
   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?
@@ -319 +338 @@
   RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
   OUTPUT.FORMAT                       STR   PS1_SV1
+
+  EXT_FIT_MAX_RADIUS                  F32   50.0
+  PSF_MODEL                           STR   PS_MODEL_GAUSS 
+  EXT_MODEL                           STR   PS_MODEL_SERSIC
 END
 
@@ -343 +366 @@
   DIFF_STATS                        BOOL TRUE          # Calculate diff-specific stats
   OUTPUT.FORMAT                     STR  PS1_DV1       # Format of output file
-
 END