Changeset 36087 for trunk/ippconfig

Timestamp:

Aug 31, 2013, 6:06:40 AM (13 years ago)

Author:

eugene

Message:

merge changes from EAM branch (add fitting tweaks for MOPS and trails; add EXTENDED_SOURCE_FITS_INTERACTIVE; add LMM mods to STACKPHOT only)

Location:

trunk/ippconfig

Files:

• . (modified) (1 prop)
• gpc1/psphot.config (modified) (1 diff, 1 prop)
• recipes/filerules-split.mdc (modified) (1 diff)
• recipes/ppSub.config (modified) (1 prop)
• recipes/psphot.config (modified) (3 diffs, 1 prop)
• recipes/reductionClasses.mdc (modified) (1 prop)

trunk/ippconfig/gpc1/psphot.config

@@ -54 +54 @@
   PSPHOT.EXT.DIFF.ALTERNATE.THRESH  F32  1.25
 
+  # XXX enable these when MOPS is ready
+  # LMM_FIT_CHISQ_CONVERGENCE         BOOL FALSE
+  # LMM_FIT_GAIN_FACTOR_MODE          S32  2
+  # PSF_FIT_MIN_TOL                   F32  0.2
+  # EXT_FIT_MIN_TOL                   F32  0.2 
+  # PSF_FIT_ITER                      S32  20
+  # EXT_FIT_ITER                      S32  20
+  # FOOTPRINT_CULL_NSIGMA_DELTA       F32  10
+  # FOOTPRINT_CULL_NSIGMA_MIN         F32   2  
+
   PSPHOT.EXT.FIT.ALL.SOURCES        BOOL TRUE
   PSPHOT.EXT.FIT.ALL.THRESH         F32  1000

trunk/ippconfig/recipes/filerules-split.mdc

@@ -280 +280 @@
 PSASTRO.OUT.ORIGINAL.CMF.MEF OUTPUT {OUTPUT}.smf.original             CMF             NONE       FPA        TRUE      MEF
                                                                                                               
+# XXX need to use CHIP for tc3 tests, but why?
+#PSWARP.OUTPUT                OUTPUT {OUTPUT}.fits                     IMAGE           COMP_IMG   CHIP       TRUE      NONE
+#PSWARP.OUTPUT.MASK           OUTPUT {OUTPUT}.mask.fits                MASK            COMP_MASK  CHIP       TRUE      NONE
+#PSWARP.OUTPUT.VARIANCE       OUTPUT {OUTPUT}.wt.fits                  VARIANCE        COMP_WT    CHIP       TRUE      NONE
 PSWARP.OUTPUT                OUTPUT {OUTPUT}.fits                     IMAGE           COMP_IMG   FPA        TRUE      NONE
 PSWARP.OUTPUT.MASK           OUTPUT {OUTPUT}.mask.fits                MASK            COMP_MASK  FPA        TRUE      NONE

trunk/ippconfig/recipes/psphot.config

@@ -207 +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_FITS_INTERACTIVE    BOOL  FALSE  # perform the detailed extended sourc fits?
 
 EXTENDED_SOURCE_MODELS_SELECTION    STR   ALL
@@ -438 +439 @@
   POISSON.ERRORS.PHOT.LMM             BOOL  TRUE
 
+  LMM_FIT_CHISQ_CONVERGENCE           BOOL  FALSE           # use the (old) chisq convergence or the new parameter one 
+  LMM_FIT_GAIN_FACTOR_MODE            S32   2               # there are 3 options to determine the gain factor (0,1,2)
+
   EXT_FIT_MAX_RADIUS                  F32   50.0
   PSF_MODEL                           STR   PS_MODEL_PS1_V1 
@@ -622 +626 @@
   # 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
+  EXT_MODEL                           STR   PS_MODEL_GAUSS
 
   # if this is defined, it gives a list of the model names to fit below (ALL or NONE are also valid)