Changeset 35770 for trunk/ippconfig

Timestamp:

Jul 3, 2013, 2:47:39 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130509

Location:

trunk

Files:

• . (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/gpc1/psphot.config (modified) (1 prop)
• ippconfig/recipes/ppSub.config (modified) (1 prop)
• ippconfig/recipes/psphot.config (modified) (3 diffs, 1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)

trunk/ippconfig/recipes/psphot.config

@@ -106 +106 @@
 PSF_MIN_DS                          F32   0.01
 PSF_PARAM_WEIGHTS                   BOOL  FALSE
+
+LMM_FIT_CHISQ_CONVERGENCE           BOOL  TRUE            # use the (old) chisq convergence or the new parameter one 
+LMM_FIT_GAIN_FACTOR_MODE            S32   0               # there are 3 options to determine the gain factor (0,1,2)
 
 PSF_FIT_ITER                        S32   50              # Maximum number of fitting iterations for PSF
@@ -204 +207 @@
 # these models are used for high-quality shape analysis after all sources have been removed
 EXTENDED_SOURCE_FITS                BOOL  FALSE  # perform the detailed extended sourc fits?
+
+EXTENDED_SOURCE_MODELS_SELECTION    STR   ALL
 
 # extended source models applied to sources
@@ -613 +618 @@
 END
 
+GALAXY_TEST METADATA
+  # Extended source fit parameters
+  # these models are used for high-quality shape analysis after all sources have been removed
+  EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform the detailed extended sourc fits?
+  EXT_MODEL                           STR   PS_MODEL_EXP
+
+  # if this is defined, it gives a list of the model names to fit below (ALL or NONE are also valid)
+  EXTENDED_SOURCE_MODELS_SELECTION    STR   NONE
+
+  # extended source models applied to sources
+  EXTENDED_SOURCE_MODELS METADATA 
+    TYPE      EXTENDED_SOURCE_MODEL  MODEL            SNLIM   PSF_CONVOLVED
+    EXP_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_EXP     10.0    TRUE
+    DEV_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_DEV     10.0    TRUE
+    SER_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC  10.0    TRUE
+    GAU_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_GAUSS   10.0    TRUE
+    PGA_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_PGAUSS  10.0    TRUE
+    QGA_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_QGAUSS  10.0    TRUE
+    PS1_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_PS1_V1  10.0    TRUE
+
+    EXP_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_EXP     10.0    FALSE
+    DEV_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_DEV     10.0    FALSE
+    SER_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC  10.0    FALSE
+    GAU_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_GAUSS   10.0    FALSE
+    PGA_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_PGAUSS  10.0    FALSE
+    QGA_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_QGAUSS  10.0    FALSE
+    PS1_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_PS1_V1  10.0    FALSE
+  END
+END