Changeset 31606 for branches/czw_branch/20110406/ippconfig

Timestamp:

Jun 6, 2011, 1:56:22 PM (15 years ago)

Author:

watersc1

Message:

merge from trunk before working on new stacking code

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/gpc1/camera.config (modified) (1 diff)
• ippconfig/gpc1/ppStack.config (modified) (1 diff)
• ippconfig/gpc1/psastro.config (modified) (8 diffs)
• ippconfig/gpc1/psphot.config (modified) (1 diff)
• ippconfig/isp/psastro.config (modified) (4 diffs)
• ippconfig/isp/psphot.config (modified) (1 diff)
• ippconfig/recipes/nightly_science.config (modified) (1 diff)
• ippconfig/recipes/psastro.config (modified) (1 diff)
• ippconfig/recipes/psphot.config (modified) (2 diffs)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 diff, 1 prop)

branches/czw_branch/20110406/ippconfig/gpc1/camera.config

@@ -165 +165 @@
 NPIX_INTERCHIP          S32     103794483
 
+# This sets the maximum size for the fwhm_major.  This is roughly 3", and 98.67% of all exposures in the database are less than this.
+MAX_ALLOWED_FWHM          F32         12
+
 # The set of maskbits that should not be set to NAN in "released" images
 # This value is equal to CONV.POOR | STARCORE | SPIKE | SUSPECT  = 0x5280

branches/czw_branch/20110406/ippconfig/gpc1/ppStack.config

@@ -35 +35 @@
 
 STACK_THREEPI  METADATA
+    PSF.INPUT.MAX   F32     12.0
     OUTPUT.NOCOMP   BOOL    FALSE
     OUTPUT.LOGFLUX  BOOL    TRUE

branches/czw_branch/20110406/ippconfig/gpc1/psastro.config

@@ -113 +113 @@
 
 # *** make sure the choice of CATDIR (dvo database) contains the photcodes desired below
-PSASTRO.CATDIR              STR      SYNTH.GRIZY
+PSASTRO.CATDIR              STR      SYNTH.GRIZY 
 DVO.GETSTAR.PHOTCODE        STR      i
 DVO.GETSTAR.MAX.RHO         F32      3000.0
@@ -129 +129 @@
   FILTER   STR g
   ZEROPT   F32 24.9
-  PHOTCODE STR g_SYNTH
+  PHOTCODE STR g
   GHOST_MAX_MAG                   F32 -20.0
 END
@@ -135 +135 @@
   FILTER   STR r
   ZEROPT   F32 25.1
-  PHOTCODE STR r_SYNTH
+  PHOTCODE STR r
   GHOST_MAX_MAG                   F32 -20.0
 END
@@ -141 +141 @@
   FILTER   STR i
   ZEROPT   F32 25.0
-  PHOTCODE STR i_SYNTH
+  PHOTCODE STR i
   GHOST_MAX_MAG                   F32 -25.0
 END
@@ -147 +147 @@
   FILTER   STR z
   ZEROPT   F32 24.6
-  PHOTCODE STR z_SYNTH
+  PHOTCODE STR z
   GHOST_MAX_MAG                   F32 -25.0
 END
@@ -153 +153 @@
   FILTER   STR y
   ZEROPT   F32 22.2
-  PHOTCODE STR y_SYNTH
+  PHOTCODE STR y
   GHOST_MAX_MAG                   F32 -25.0
 END
@@ -159 +159 @@
   FILTER   STR w
   ZEROPT   F32 26.3
-  PHOTCODE STR r_SYNTH
+  PHOTCODE STR r
   GHOST_MAX_MAG                   F32 -20.0
 END
@@ -345 +345 @@
   PSASTRO.MATCH.FIT.NITER S32    5
 END
+
+LAP_ASTRO METADATA
+  PSASTRO.CATDIR                STR      3PI.20110505.REFCAT
+END

branches/czw_branch/20110406/ippconfig/gpc1/psphot.config

@@ -20 +20 @@
 PSF_MODEL                           STR   PS_MODEL_PS1_V1
 PSPHOT.CR.NSIGMA.SOFTEN             F32   0.0025        # Softening parameter for weights in CR stat
+
+PSPHOT.CR.MAX.SIZE                  F32   0.8             # guess for limit on M_minor in pix^2
+PSPHOT.CR.MAX.MAG                   F32  -8.0             # guess for limit on Kron Mag
+PSPHOT.CR.AUTOSCALE                 BOOL  FALSE
 
 PSF.TREND.NX                        S32   3

branches/czw_branch/20110406/ippconfig/isp/psastro.config

@@ -3 +3 @@
 
 # nominal plate scale (microns / pixel)
-PSASTRO.PIXEL.SCALE    F32  10.0
+PSASTRO.PIXEL.SCALE    F32  1.0
 
 # pmAstromGridMatch:
 PSASTRO.GRID.MIN.ANGLE F32 -2.0
 PSASTRO.GRID.MAX.ANGLE F32 +2.0
-PSASTRO.GRID.DEL.ANGLE F32  0.25
+PSASTRO.GRID.DEL.ANGLE F32  0.5
 PSASTRO.GRID.MIN.SIGMA F32  5.0
 
@@ -14 +14 @@
 # max grid offset in FP units (microns)
 # use plate-scale to make this in pixels?
-PSASTRO.GRID.OFFSET    F32   10000.
-PSASTRO.GRID.SCALE     F32     500
+PSASTRO.GRID.OFFSET    F32   500.
+PSASTRO.GRID.SCALE     F32      10
 
+PSASTRO.GRID.NREF.MAX S32 2500
+PSASTRO.GRID.NRAW.MAX S32 1500
+
+PSASTRO.PLOT.INST.MAG.MAX F32 -4.0
+PSASTRO.PLOT.INST.MAG.MIN F32 -12.0
+PSASTRO.PLOT.REF.MAG.MIN  F32 +10.0
+PSASTRO.PLOT.REF.MAG.MAX  F32 +20.0
+
+PSASTRO.MIN.INST.MAG.RAW      F32  -12
+PSASTRO.GRID.MIN.INST.MAG.RAW F32  -12
+PSASTRO.MAX.INST.MAG.RAW      F32  -4
+PSASTRO.GRID.MAX.INST.MAG.RAW F32  -4 
+
+ #PSASTRO.MATCH.RADIUS   F32    3
+
+PSASTRO.MATCH.RADIUS.N0 F32    15
+PSASTRO.MATCH.RADIUS.N1 F32    10
+PSASTRO.MATCH.RADIUS.N2 F32    9
+PSASTRO.MATCH.RADIUS.N3 F32    8
+PSASTRO.MATCH.RADIUS.N4 F32    7
+PSASTRO.MATCH.RADIUS.N5 F32    5
+PSASTRO.MATCH.RADIUS.N6 F32    5
+PSASTRO.MATCH.RADIUS.N7 F32    3
+
+PSASTRO.MATCH.FIT.NITER S32    8 
 # these tweak are in FP units (pixels, currently)
 PSASTRO.TWEAK.SCALE     F32      1
@@ -24 +49 @@
 
 # match radius in pixels for CHIP astrometry
-PSASTRO.MATCH.RADIUS   F32    8
+PSASTRO.MATCH.RADIUS   F32    5
 
 # pmAstromMatchFit
@@ -38 +63 @@
 PSASTRO.CATDIR         STR      SYNTH.BRIGHT
 PSASTRO.MATCH.LUMFUNC  BOOL     TRUE
+PSASTRO.IGNORE         STR      SATURATED, DEFECT, SATSTAR, BLEND,FAIL
+
+
 
 

branches/czw_branch/20110406/ippconfig/isp/psphot.config

@@ +1 @@
+# cosmic ray recipe options - these were tested with o5472i0009o01.201734.ch.191131.cmf
+
+PSPHOT.CR.MAX.SIZE                  F32   0.20           # guess for limit on M_minor in pix^2
+PSPHOT.CR.MAX.MAG                   F32   -7.0             # guess for limit on Kron Mag
+PSPHOT.CR.AUTOSCALE                 BOOL  FALSE
+
 
 # turn these on to see specific outputs

branches/czw_branch/20110406/ippconfig/recipes/nightly_science.config

@@ -203 +203 @@
   NAME      STR STS
   DISTRIBUTION STR STS
-  # XXX: STS observations are temporarily being taken outside the STS tessellation
-  # switch tess_id from STS.V3 to RINGS
-  TESS      STR RINGS.V3
-  # TESS      STR STS.V3
+  TESS      STR STS.V4
   OBSMODE   STR STS%
-  OBJECT    STR STS%
+#  OBJECT    STR STS%
   STACKABLE BOOL FALSE
   DIFFABLE  BOOL FALSE
   REDUCTION STR STS_DATASET
+  # bump the retention times for the time being
+  CHIP S16 60
+  WARP S16 60
+  DIFF S16 60
 END
 TARGETS METADATA

branches/czw_branch/20110406/ippconfig/recipes/psastro.config

@@ -250 +250 @@
 STS_DATASET METADATA
 END
+
+LAP_ASTRO METADATA
+  
+END
+

branches/czw_branch/20110406/ippconfig/recipes/psphot.config

@@ -318 +318 @@
 PSPHOT.CRMASK.YTEST                 S32   0
 PSPHOT.CRMASK.APPLY                 BOOL  FALSE           # TEST THIS before enabling.
-PSPHOT.CR.MAX.SIZE                  F32   0.8             # guess for limit on M_minor in pix^2
-PSPHOT.CR.MAX.MAG                   F32  -8.0             # guess for limit on Kron Mag
+PSPHOT.CR.MAX.SIZE                  F32   0               # guess for limit on M_minor in pix^2
+PSPHOT.CR.MAX.MAG                   F32   0               # guess for limit on Kron Mag
 PSPHOT.CR.AUTOSCALE                 BOOL  FALSE
 
@@ -377 +377 @@
 END
 
+# Extended source fit parameters
+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?
+  PSPHOT.STACK.USE.RAW                BOOL  F    # perform photometry & morphology analysis on the raw image
+  @PSPHOT.STACK.TARGET.PSF.FWHM       F32   8.0 10.0 # FWHM of target PSF (if NOT AUTO sized; pixels)
+  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_V3
+
+  CONSTANT_PHOTOMETRIC_WEIGHTS        BOOL  TRUE
+  POISSON.ERRORS.PHOT.LMM             BOOL  FALSE
+  PSF_APERTURE_SCALE                  F32   4.5
+  PSF_REF_RADIUS                      F32   35
+
+  EXT_FIT_MAX_RADIUS                  F32   50.0
+  PSF_MODEL                           STR   PS_MODEL_QGAUSS 
+  EXT_MODEL                           STR   PS_MODEL_SERSIC
+END
+
+# Extended source fit parameters
+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?
+  PSPHOT.STACK.USE.RAW                BOOL  F    # perform photometry & morphology analysis on the raw image
+  @PSPHOT.STACK.TARGET.PSF.FWHM       F32   8.0 10.0 # FWHM of target PSF (if NOT AUTO sized; pixels)
+  RADIAL_APERTURES                    BOOL  T    # 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
+
+  PSF_APERTURE_SCALE                  F32   4.5
+  PSF_REF_RADIUS                      F32   35
+
+  EXT_FIT_MAX_RADIUS                  F32   50.0
+  PSF_MODEL                           STR   PS_MODEL_PS1_V1 
+  EXT_MODEL                           STR   PS_MODEL_SERSIC
+END
+
 STACKPHOT_SINGLE    METADATA
   PSPHOT.STACK.USE.RAW                BOOL  F   # since false perform photometry & morphology analysis on the convolved images

branches/czw_branch/20110406/ippconfig/recipes/reductionClasses.mdc

@@ -165 +165 @@
 END
 
+# large area science analysis
+LAP_SCIENCE             METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        CHIP_PSPHOT       STR     CHIP
+        WARP_PSWARP       STR     WARP
+        STACK_PPSTACK     STR     STACK
+        STACK_PPSUB       STR     STACK
+        STACK_PSPHOT      STR     STACK
+        DIFF_PPSUB        STR     DIFF
+        DIFF_PSPHOT       STR     DIFF
+        JPEG_BIN1         STR     PPIMAGE_J1
+        JPEG_BIN2         STR     PPIMAGE_J2
+        FAKEPHOT          STR     FAKEPHOT
+        ADDSTAR           STR     ADDSTAR
+        PSASTRO           STR     LAP_ASTRO
+        STACKPHOT_PSPHOT  STR     STACKPHOT
+        STACKPHOT_PPSUB   STR     STACKPHOT
+        STACKPHOT_PPSTACK STR     STACKPHOT
+        STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+END
+
 DEFAULT_MASKTEST                METADATA
         CHIP_PPIMAGE    STR     CHIP_MASKTEST