Changeset 41446

Timestamp:

Dec 1, 2020, 9:19:23 PM (6 years ago)

Author:

mhuber

Message:

merging adding psphot option to disable covariance factor (reset 1.0) in linear fit photometry primarily for diffphot use (IPP-817), adding YSE reductionClass with option to disable covariance factor in diffphot use and larger FWHM cut of 16 pixels (IPP-872)

Location:

tags/ipp-ws-20170121

Files:

• ippconfig/gpc1/psastro.config (modified) (16 diffs, 1 prop)
• ippconfig/recipes/nightly_science.config (modified) (32 diffs, 1 prop)
• ippconfig/recipes/psastro.config (modified) (9 diffs, 1 prop)
• ippconfig/recipes/psphot.config (modified) (4 diffs, 1 prop)
• psphot/src/psphotFitSourcesLinear.c (modified) (1 diff, 1 prop)

tags/ipp-ws-20170121/ippconfig/gpc1/psastro.config

@@ -129 +129 @@
 DVO.GETSTAR.PHOTCODE        STR      i
 DVO.GETSTAR.MAX.RHO         F32      10000.0
-DVO.GETSTAR.MIN.MAG         F32      12.0
-DVO.GETSTAR.MIN.MAG.INST    F32     -25.0
+DVO.GETSTAR.MIN.MAG         F32      2.0
+DVO.GETSTAR.MIN.MAG.INST    F32     -35.0
 
 # rather than mean, use specified EDGE:
@@ -144 +144 @@
   PHOTCODE STR g
   GHOST_MAX_MAG                   F32 -16.5
+  GLINT_MAX_MAG                   F32 -23.0
 END
 PHOTCODE.DATA METADATA
@@ -150 +151 @@
   PHOTCODE STR r
   GHOST_MAX_MAG                   F32 -20.0
+  GLINT_MAX_MAG                   F32 -23.0
 END
 PHOTCODE.DATA METADATA
@@ -155 +157 @@
   ZEROPT   F32 24.611
   PHOTCODE STR i
-  GHOST_MAX_MAG                   F32 -25.0
+  GHOST_MAX_MAG                   F32 -22.0
+  GLINT_MAX_MAG                   F32 -23.4
 END
 PHOTCODE.DATA METADATA
@@ -161 +164 @@
   ZEROPT   F32 24.250
   PHOTCODE STR z
-  GHOST_MAX_MAG                   F32 -25.0
+  GHOST_MAX_MAG                   F32 -22.0
+  GLINT_MAX_MAG                   F32 -23.4
 END
 PHOTCODE.DATA METADATA
@@ -167 +171 @@
   ZEROPT   F32 23.320
   PHOTCODE STR y
-  GHOST_MAX_MAG                   F32 -25.0
+  GHOST_MAX_MAG                   F32 -21.5
+  GLINT_MAX_MAG                   F32 -23.0
 END
 PHOTCODE.DATA METADATA
@@ -173 +178 @@
   ZEROPT   F32 26.3
   PHOTCODE STR r
-  GHOST_MAX_MAG                   F32 -20.0
+  GHOST_MAX_MAG                   F32 -20.4
+  GLINT_MAX_MAG                   F32 -24.4
 END
 
@@ -180 +186 @@
 REFSTAR_MASK_SATSTAR_MAG_MAX    F32 -15.0
 REFSTAR_MASK_SATSTAR_MAG_SLOPE  F32  10.15
-# CZW: Original 2010-02-08 position angle offset
-REFSTAR_MASK_SATSTAR_POS_ZERO   F32  -0.798
-# CZW: Updated 2011-02-18 position angle offset. As above, offset 0.5 degree.
-# REFSTAR_MASK_SATSTAR_POS_ZERO   F32  -0.78927
-#REFSTAR_MASK_SATSTAR_POS_ZERO   F32  -0.80237
-#REFSTAR_MASK_SATSTAR_POS_ZERO   F32  -0.81109
-# Length = 10**(SLOPE*(MAG_MAX - InstMag)) - OFFSET
+
+# TdB20200430: Updated satspike position angle offset
+REFSTAR_MASK_SATSTAR_POS_ZERO   F32  -0.79451
+PSASTRO.MODEL.ROT.PARITY      S32     1
+
+#TdB20200229: The size of saturated star circles should be an exponential for gpc2
+#rad(mag) = REFSTAR_MASK_SATSTAR_RAD_OFFSET + REFSTAR_MASK_SATSTAR_EXP**(REFSTAR_MASK_SATSTAR_MAG_MAX-mag)
+REFSTAR_MASK_SATSTAR_MAG_MAX    F32 -11.363
+REFSTAR_MASK_SATSTAR_RAD_OFFSET F32  17.631
+REFSTAR_MASK_SATSTAR_EXP        F32   1.493
 
 REFSTAR_MASK_SATSPIKE_MAG_SLOPE F32  0.096
@@ -203 +212 @@
 
 
-
-
 REFSTAR_MASK_BLEED              BOOL FALSE
 REFSTAR_MASK_BLEED_MAG_MAX      F32 -15.0
@@ -218 +225 @@
 # GHOST_MAX_MAG                   F32 -20.0
 
-GLINT_LENGTH_MAG_SLOPE          F32 2500.0
-GLINT_LENGTH_MAG_ZERO           F32 -20.0
-GLINT_WIDTH                     F32  150.0
 REFSTAR_COUNT_GHOSTS            BOOL TRUE
 REFSTAR_MASK_GHOST              BOOL TRUE
-
-# GHOST_CENTER_X_0              F32   66.2
-# GHOST_CENTER_X_SLOPE          F32   -0.02454
-# GHOST_CENTER_Y_0              F32   16.6
-# GHOST_CENTER_Y_SLOPE          F32   +0.01565
-# 
-# GHOST_INNER_MAJOR_0           F32   32.9
-# GHOST_INNER_MAJOR_SLOPE         F32   +0.00612
-# GHOST_INNER_MINOR_0           F32   58.7
-# GHOST_INNER_MINOR_SLOPE         F32   -0.00258
-# 
-# GHOST_OUTER_MAJOR_0           F32   90.6
-# GHOST_OUTER_MAJOR_SLOPE         F32   +0.01548
-# GHOST_OUTER_MINOR_0           F32  133.9
-# GHOST_OUTER_MINOR_SLOPE         F32   -0.00288
+PSASTRO.SAVE.GHOSTS             BOOL TRUE  # save ghost positions as table in output smf file
+
+#TdB20200305: The length of glints as function of mag is recomputed for gpc2
+#glint_length(mag) = GLINT_LENGTH_MAG_SLOPE*(GLINT_LENGTH_MAG_ZERO-mag)
+GLINT_LENGTH_MAG_SLOPE          F32 1901.0
+GLINT_LENGTH_MAG_ZERO           F32 -16.8
+#TdB20200308: The length of glints also depends on position off the focal plane (perpendicular to pixel FPA), out to GLINT_LENGTH_POS_CUT
+#glint_length(pos) = GLINT_LENGTH_POS_SLOPE*(GLINT_LENGTH_POS_REF-pos)
+GLINT_LENGTH_POS_SLOPE          F32 0.00019
+GLINT_LENGTH_POS_REF            F32 33821.
+GLINT_LENGTH_POS_CUT            F32 30700.
+GLINT_LENGTH_MIN_FPA            F32 1500.0
+#TdB20200312: The angle that glints have depends on position along the focal plane (parallel to pixel FPA)
+#glint_angle(pos) = GLINT_ANGLE_SLOPE*(GLINT_ANGLE_POS_REF-(pos/1000))
+GLINT_ANGLE_POS_SLOPE           F32  0.07903  
+GLINT_ANGLE_POS_REF             F32 -575.5
+GLINT_WIDTH                     F32  80.0
+
+# save glint positions?
+PSASTRO.SAVE.GLINTS             BOOL TRUE  # save glint positions as table in output smf file
+
 
 PR_RECIPE METADATA
@@ -244 +254 @@
 
 REFSTAR_MASK_GLINTS             BOOL  TRUE
-GLINT_MAX_MAG                   F32 -21.0
+GLINT_MAX_MAG                   F32 -21.
 GLINT.REGION                    MULTI
 
+#TdB20200514: GPC1 does not show any glints coming from the left or right, at all, after searching thousands of images. So, shrinking the bounding boxes to zero.
 GLINT.REGION                    METADATA
-  REGION                        STR  [-38000:-24000,-20000:+20000]
+  REGION                        STR  [-38000:-38000,-20000:+20000]
   GLINT.TYPE                    STR  LEFT
 END
 
 GLINT.REGION                    METADATA
-  REGION                        STR  [+24000:+38000,-20000:+20000]
+  REGION                        STR  [+38000:+38000,-20000:+20000]
   GLINT.TYPE                    STR  RIGHT
 END
@@ -383 +394 @@
 #  PSASTRO.CATDIR               STR     PS1.REF.20120524
 #   PSASTRO.CATDIR               STR     PS1.REF.20140605
-   PSASTRO.CATDIR                STR     PS1.REF.20140713
+#  PSASTRO.CATDIR                STR     PS1.REF.20140713
+   PSASTRO.CATDIR                STR     PS1.REF.20170919
    ZERO.POINT.USE.MEAN          BOOL    TRUE  
 END
@@ -392 +404 @@
 
 POLE_REFCAT METADATA
-   PSASTRO.CATDIR               STR  PS1.REF.20140713
+   PSASTRO.CATDIR               STR  PS1.GAIA.POLEREF.20190619
    ZERO.POINT.USE.MEAN               BOOL TRUE  
    PSASTRO.GRID.MIN.ANGLE       F32  -20
@@ -411 +423 @@
    PSASTRO.MAX.ALLOWED.FWHM    F32   16
 #   PSASTRO.CATDIR              STR   PS1.REF.20140713
+   PSASTRO.CATDIR               STR     PS1.REF.20170919
+END
+
+YSE_ASTRO METADATA
+   ZERO.POINT.USE.MEAN         BOOL  TRUE
+   PSASTRO.MAX.ALLOWED.FWHM    F32   16
    PSASTRO.CATDIR               STR     PS1.REF.20170919
 END
@@ -619 +637 @@
 END
 
+STATICSKY_POLE   METADATA
+    REFSTAR_MASK                BOOL FALSE
+    PSASTRO.SAVE.REFMATCH       BOOL FALSE
+    PSASTRO.FIX.CHIPS           BOOL FALSE
+    PSASTRO.USE.MODEL           BOOL FALSE
+    PSASTRO.MOSAIC.MODE         BOOL FALSE
+    DVO.GETSTAR.FIXED.ZEROPT    F32   25.0
+    DVO.GETSTAR.MIN.MAG.INST    F32  -15.0
+#   PSASTRO.CATDIR              STR  PS1.REF.20120524
+#   PSASTRO.CATDIR              STR  PS1.REF.20140605
+#   PSASTRO.CATDIR              STR  PS1.REF.20140713
+#   PSASTRO.CATDIR              STR  PS1.REF.20170919
+    PSASTRO.CATDIR              STR  PS1.GAIA.POLEREF.20190619
+    ZERO.POINT.USE.MEAN         BOOL TRUE
+
+    ## for skycell, radius shouldn't need to be as large as 90 pixel default. deeper stacks, crowded fields can be problems
+    PSASTRO.MATCH.RADIUS.N0 F32    15
+    PSASTRO.MATCH.RADIUS.N1 F32    10
+    PSASTRO.MATCH.RADIUS.N2 F32    5
+    PSASTRO.MATCH.RADIUS.N3 F32    1
+    PSASTRO.MATCH.RADIUS.N4 F32    0.5
+    PSASTRO.MATCH.FIT.NITER S32    5
+
+    PSASTRO.MAX.ERROR      F32      0.2  # in arcsec units, if larger than 0.2" on skycell then a problem..
+
+    TRANSFORM.GALAXY.SHAPE.ERRORS  BOOL T
+END
 
 # revised setup for MD nightly stack inputs, should work for case of N~2-30
@@ -813 +858 @@
    END
 END
+
+SWEETSPOT_TEST METADATA
+   PSASTRO.CATDIR               STR     PS1.REF.20170919
+   ZERO.POINT.USE.MEAN          BOOL    TRUE
+END

tags/ipp-ws-20170121/ippconfig/recipes/nightly_science.config

@@ -3 +3 @@
   MODE           STR CHIP
   COMMAND        STR chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
-  RETENTION_TIME U16 2
+#  RETENTION_TIME U16 2
+  RETENTION_TIME U16 -1
 END
 CLEAN_MODES METADATA
   MODE           STR WARP
   COMMAND        STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
-  RETENTION_TIME U16 7 
+  RETENTION_TIME U16 -1 
 END
 CLEAN_MODES METADATA
   MODE           STR DIFF
   COMMAND        STR difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
-  RETENTION_TIME S16 3
+#  RETENTION_TIME S16 3
+  RETENTION_TIME S16 -1
 END
 CLEAN_MODES METADATA
   MODE           STR DIST
   COMMAND        STR disttool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -full -set_label goto_cleaned -label @LABEL@ -time_stamp_end @CURRENT_DATE@
-  RETENTION_TIME S16 10
+#  RETENTION_TIME S16 10
+  RETENTION_TIME S16 -1
 END
 CLEAN_MODES METADATA
   MODE           STR MAGICDS
   COMMAND        STR magicdstool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
-  RETENTION_TIME S16 2
+#  RETENTION_TIME S16 2
+  RETENTION_TIME S16 -1
 END
 CLEAN_MODES METADATA
   MODE           STR BGCHIP
   COMMAND        STR bgtool -dbname @DBNAME@ -updatechip -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
-  RETENTION_TIME S16 7
+#  RETENTION_TIME S16 7
+  RETENTION_TIME S16 1
 END
 CLEAN_MODES METADATA
   MODE           STR BGWARP
   COMMAND        STR bgtool -dbname @DBNAME@ -updatewarp -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
-  RETENTION_TIME S16 7
+#  RETENTION_TIME S16 7
+  RETENTION_TIME S16 -1
 END
 
@@ -47 +53 @@
 
 FILTERS MULTI
-FILTERS STR g.00000
-FILTERS STR r.00000
-FILTERS STR i.00000
-FILTERS STR z.00000
-FILTERS STR y.00000
-FILTERS STR w.00000
+FILTERS STR g.00002
+FILTERS STR r.00002
+FILTERS STR i.00002
+FILTERS STR z.00002
+FILTERS STR y.00002
+FILTERS STR w.00002
 
 UNRECOVERABLE_QUALITY MULTI
@@ -67 +73 @@
 END
 
+# 2018-04-30 CZW: Comment out all targets to allow commissioning training and tests to skip processing.
 TARGETS MULTI
 TARGETS METADATA
@@ -77 +84 @@
   OFFNIGHT_DIFFS BOOL FALSE
   REDUCTION STR SWEETSPOT
-  ADDITIONAL_STACK_LABEL STR ecliptic.rp
+#  ADDITIONAL_STACK_LABEL STR ecliptic.rp
   DESPERATE_DIFFS BOOL TRUE
 #  REDUCTION STR SSTF_4SIG
-  COMMENT      STR  %OSS%
+  COMMENT      STR  OSS%
+END
+TARGETS METADATA
+  NAME         STR EU
+  DISTRIBUTION STR SweetSpot
+  TESS         STR RINGS.V3
+  OBSMODE      STR OSS
+  STACKABLE   BOOL FALSE
+  DIFFABLE    BOOL TRUE
+  OFFNIGHT_DIFFS BOOL FALSE
+  REDUCTION STR SWEETSPOT
+  DESPERATE_DIFFS BOOL TRUE
+  COMMENT      STR  EU.%
 END
 TARGETS METADATA
@@ -91 +110 @@
   OFFNIGHT_DIFFS BOOL FALSE
   REDUCTION STR SWEETSPOT
-  ADDITIONAL_STACK_LABEL STR ecliptic.rp
+#  ADDITIONAL_STACK_LABEL STR ecliptic.rp
   DESPERATE_DIFFS BOOL TRUE
 #  REDUCTION STR SSTF_4SIG
@@ -105 +124 @@
   OFFNIGHT_DIFFS BOOL FALSE
   REDUCTION STR SWEETSPOT
-  ADDITIONAL_STACK_LABEL STR ecliptic.rp
+#  ADDITIONAL_STACK_LABEL STR ecliptic.rp
   DESPERATE_DIFFS BOOL TRUE
 #  REDUCTION STR SSTF_4SIG
@@ -119 +138 @@
   OFFNIGHT_DIFFS BOOL FALSE
   REDUCTION STR SWEETSPOT
-  CHIP      S16 5
-  WARP      S16 300
-  DIFF      S16 300
+#  CHIP      S16 5
+#  DIFF      S16 300
 END
 TARGETS METADATA
@@ -133 +151 @@
   DESPERATE_DIFFS BOOL TRUE
   COMMENT      STR  %3PI%
-#  CHIP          S16  7
-#  DIFF          S16  7
-#  CHIP         S16 10
-#  DIFF         S16 12
 END
 TARGETS METADATA
@@ -144 +158 @@
   OBSMODE      STR BRIGHT
   STACKABLE   BOOL FALSE
+  DIFFABLE    BOOL TRUE
+  OFFNIGHT_DIFFS BOOL FALSE
+  DESPERATE_DIFFS BOOL TRUE
+  REDUCTION STR EUCLID_DEFAULT 
+  COMMENT      STR  Euclid.r%
+#  DIFF          S16  7
+END
+TARGETS METADATA
+  NAME         STR BrightTwi
+  DISTRIBUTION STR NODIST
+  TESS         STR RINGS.V3
+  OBSMODE      STR BRIGHT
+  STACKABLE   BOOL FALSE
   DIFFABLE    BOOL FALSE
   OFFNIGHT_DIFFS BOOL FALSE
   DESPERATE_DIFFS BOOL FALSE
-  COMMENT      STR  Euclid%
+  REDUCTION STR EUCLID_DEFAULT 
+  COMMENT      STR  Euclid.twi%
+#  DIFF          S16  7
+END
+TARGETS METADATA
+  NAME         STR Bright3Pi 
+  DISTRIBUTION STR NODIST
+  TESS         STR RINGS.V3
+  OBSMODE      STR BRIGHT
+  STACKABLE   BOOL FALSE
+  DIFFABLE    BOOL FALSE
+  OFFNIGHT_DIFFS BOOL FALSE
+  DESPERATE_DIFFS BOOL FALSE
+  REDUCTION STR EUCLID_DEFAULT 
+  COMMENT      STR  %3PI%
 #  DIFF          S16  7
 END
@@ -161 +202 @@
   OFFNIGHT_DIFFS BOOL FALSE
   REDUCTION STR MD_DEFAULT
-#  DIST S16 30  
+END
+TARGETS METADATA
+  NAME         STR YSE
+  DISTRIBUTION STR YSE
+  TESS         STR RINGS.V3
+  OBSMODE      STR YSE
+  STACKABLE   BOOL FALSE
+  DIFFABLE    BOOL FALSE
+  OFFNIGHT_DIFFS  BOOL FALSE
+  DESPERATE_DIFFS BOOL FALSE
+  REDUCTION STR YSE
+  ## don't use so can include Trans% for YSE in same config
+  #COMMENT   STR  YSE%
+  ## change days for cleanup at start
+  DIST      S16  30
+  DIFF      S16  10 
 END
 TARGETS METADATA
@@ -174 +230 @@
   COMMENT   STR  Supernova%
   ## change days till cleanup
-  DIST      S16 20
-  CHIP      S16  2
-  WARP      S16  2 
-  DIFF      S16  2 
+#  DIST      S16 20
 END
 TARGETS METADATA
@@ -189 +242 @@
   REDUCTION    STR MD_DEFAULT
   COMMENT      STR ICECUBE%
-  DIST           S16  15
-  WARP           S16  300
-  DIFF           S16  300
+#  DIST           S16  15
+#  DIFF           S16  300
 END
 TARGETS METADATA
@@ -204 +256 @@
   REDUCTION    STR SWEETSPOT
   COMMENT      STR G%.R%.P%
-  DIST           S16  15
-  WARP           S16  300
-  DIFF           S16  300
+#  DIST           S16  15
+#  DIFF           S16  300
 END
 TARGETS METADATA
@@ -218 +269 @@
 #  REDUCTION    STR SWEETSPOT
   COMMENT      STR  K2%
-  DIST           S16  30
-  WARP           S16  10
-  DIFF           S16  10
+#  DIST           S16  30
+#  DIFF           S16  10
 END
 TARGETS  METADATA
@@ -232 +282 @@
   REDUCTION     STR SWEETSPOT
   COMMENT      STR  %NCU%
-  DIST          S16 300
-  CHIP          S16 300
-  WARP          S16 300
-  DIFF          S16 300
+#  DIST          S16 300
+#  CHIP          S16 300
+#  DIFF          S16 300
 END
 # TARGETS METADATA
@@ -261 +310 @@
   DIST      S16  30
   # bump the retention times for the time being
-  CHIP S16 60
-  WARP S16 60
-  DIFF S16 60
-  CHIPBG S16 60
-  WARPBG S16 60
+ # CHIP S16 60
+ # WARP S16 60
+ # DIFF S16 60
+ # CHIPBG S16 60
+ # WARPBG S16 60
 END
 TARGETS METADATA
@@ -277 +326 @@
   DIFFABLE  BOOL FALSE
   REDUCTION STR MD_DEFAULT
-  DIST      S16  30
+#  DIST      S16  30
 END
 TARGETS METADATA
@@ -289 +338 @@
   DIFFABLE  BOOL FALSE
   REDUCTION STR MD_DEFAULT
-  DIST      S16 30
+#  DIST      S16 30
 END
 TARGETS METADATA
@@ -301 +350 @@
   DIFFABLE  BOOL FALSE
   REDUCTION STR MD_DEFAULT
-  DIST      S16 30
+#  DIST      S16 30
 END
 TARGETS METADATA
@@ -313 +362 @@
   DIFFABLE  BOOL FALSE
   REDUCTION STR MD_DEFAULT
-  DIST      S16 30
+#  DIST      S16 30
 END
 TARGETS METADATA
@@ -325 +374 @@
   DIFFABLE  BOOL FALSE
   REDUCTION STR MD_DEFAULT
-  DIST      S16 30
+#  DIST      S16 30
   ## change days till cleanup
-  #CHIP S16 60
-  WARP S16 60
-  DIFF S16 60
+#  #CHIP S16 60
+#  WARP S16 60
+#  DIFF S16 60
 END
 TARGETS METADATA
@@ -341 +390 @@
   DIFFABLE  BOOL FALSE
   REDUCTION STR MD_DEFAULT
-  DIST      S16 30
+#  DIST      S16 30
   ## change days till cleanup
-  #CHIP S16 60
-  WARP S16 60
-  DIFF S16 60
+#  #CHIP S16 60
+#  WARP S16 60
+#  DIFF S16 60
 END
 TARGETS METADATA
@@ -357 +406 @@
   DIFFABLE  BOOL FALSE
   REDUCTION STR MD_DEFAULT
-  DIST      S16 30
+#  DIST      S16 30
   ## change days till cleanup
-  #CHIP S16 60
-  WARP S16 60
-  DIFF S16 60
+#  #CHIP S16 60
+#  WARP S16 60
+#  DIFF S16 60
 END
 TARGETS METADATA
@@ -373 +422 @@
   DIFFABLE  BOOL FALSE
   REDUCTION STR MD_DEFAULT
-  DIST      S16 30
+#  DIST      S16 30
   ## change days till cleanup
-  #CHIP S16 60
-  WARP S16 60
-  DIFF S16 60
+#  #CHIP S16 60
+#  WARP S16 60
+#  DIFF S16 60
 END
 TARGETS METADATA
@@ -389 +438 @@
   DIFFABLE  BOOL FALSE
   REDUCTION STR MD_DEFAULT
-  DIST      S16 30
+#  DIST      S16 30
 END
 TARGETS METADATA
@@ -401 +450 @@
   DIFFABLE  BOOL FALSE
   REDUCTION STR MD_DEFAULT
-  DIST      S16 30
+#  DIST      S16 30
 END
 TARGETS METADATA
@@ -412 +461 @@
   MIN_STACK U16 8
   DIFFABLE  BOOL FALSE
-  DIST      S16 30
+#  DIST      S16 30
 END
 TARGETS METADATA
@@ -424 +473 @@
   REDUCTION STR STS_DATASET
   # bump the retention times for the time being
-  CHIP S16 60
-  WARP S16 60
-  DIFF S16 60
+#  CHIP S16 60
+#  WARP S16 60
+#  DIFF S16 60
 END
 TARGETS METADATA
@@ -433 +482 @@
   TESS      STR RINGS.V3
   OBSMODE   STR SS
-  STACKABLE BOOL TRUE
-  DIFFABLE  BOOL TRUE
+  STACKABLE BOOL FALSE
+  DIFFABLE  BOOL FALSE
   REDUCTION STR SWEETSPOT
-  ADDITIONAL_STACK_LABEL STR ecliptic.rp
+#  ADDITIONAL_STACK_LABEL STR ecliptic.rp
 #  REDUCTION STR SSTF_4SIG
 #  WARP      S16 60
@@ -446 +495 @@
   OBSMODE      STR PI
   STACKABLE   BOOL FALSE
-  DIFFABLE    BOOL TRUE
+  DIFFABLE    BOOL FALSE
 END
 TARGETS METADATA
@@ -456 +505 @@
   DIFFABLE    BOOL FALSE
   REDUCTION   STR  CNP_DATASET
-  CHIP        S16  800
-  WARP        S16  800
+#  CHIP       S16  800
+#  WARP       S16  800
 END
 TARGETS METADATA
@@ -476 +525 @@
 END
 
-# This is a hack, and I freely admit it.
-# Removed the rest because we do not regularly run microtests.
+#This is a hack, and I freely admit it.
+#Removed the rest because we do not regularly run microtests.
 # TARGETS METADATA
 #   NAME STR microtestMD01

tags/ipp-ws-20170121/ippconfig/recipes/psastro.config

@@ -22 +22 @@
 # extra field for ref stars:
 PSASTRO.FIELD.PADDING  F32 0.25
+
+PSASTRO.REFSTAR.CLUMP.SCALE S32 150
+PSASTRO.REFSTAR.CLUMP.NITER S32 3
 
 # extra field for ref stars:
@@ -70 +73 @@
 PSASTRO.MATCH.FIT.NITER S32   1
 
+# single-chip radius match in pixels
+PSASTRO.ONE.CHIP.ORDER.N0 F32    1
+PSASTRO.ONE.CHIP.ORDER.N1 F32    1 
+PSASTRO.ONE.CHIP.ORDER.N2 F32    1
+PSASTRO.ONE.CHIP.ORDER.N3 F32    1
+PSASTRO.ONE.CHIP.ORDER.N4 F32    1
+PSASTRO.ONE.CHIP.ORDER.N5 F32    1
+PSASTRO.ONE.CHIP.ORDER.N6 F32    1
+PSASTRO.ONE.CHIP.ORDER.N7 F32    1
+
 # for iterations >= N, require a single match per reference
 PSASTRO.MATCH.UNIQ.ITER S32     4 
@@ -137 +150 @@
 REFSTAR_MASK_REGIONS            BOOL FALSE
 REFSTAR_MASK_MAX_MAG            F32 -15.0
-REFSTAR_MASK_SATSTAR_MAG_MAX    F32 -17.0
 REFSTAR_MASK_SATSTAR_MAG_SLOPE  F32  10.0
 REFSTAR_MASK_SATSTAR_POS_ZERO   F32   0.0
@@ -148 +160 @@
 REFSTAR_MASK_SATSPIKE_WIDTH_SLOPE F32 0.00
 
+REFSTAR_MASK_SATSTAR_MAG_MAX    F32 -11.363
+REFSTAR_MASK_SATSTAR_RAD_OFFSET F32  17.631
+REFSTAR_MASK_SATSTAR_EXP        F32   1.493
+
+PSASTRO.SAVE.GHOSTS             BOOL FALSE
 REFSTAR_MASK_GHOST              BOOL FALSE
 REFSTAR_COUNT_GHOSTS            BOOL FALSE
@@ -154 +171 @@
 
 REFSTAR_MASK_BLEED              BOOL FALSE
+
 REFSTAR_MASK_BLEED_MAG_MAX      F32 -15.0
 REFSTAR_MASK_BLEED_MAG_SLOPE    F32   5.0
+
+# Additional parameters to allow for saturation bleeds to be masked in either direction.
+REFSTAR_MASK_BLEED_ORIENTATION_X BOOL FALSE
+REFSTAR_MASK_BLEED_MAG_MAX_X    F32 -15.0
+REFSTAR_MASK_BLEED_MAG_SLOPE_X  F32   5.0
+
+REFSTAR_MASK_BLEED_ORIENTATION_Y BOOL FALSE
+REFSTAR_MASK_BLEED_MAG_MAX_Y    F32 -15.0
+REFSTAR_MASK_BLEED_MAG_SLOPE_Y  F32   5.0
 
 REFSTAR_MASK_GLINTS             BOOL  FALSE
@@ -161 +188 @@
 GLINT_LENGTH_MAG_SLOPE          F32 0.0
 GLINT_LENGTH_MAG_ZERO           F32 0.0
+GLINT_LENGTH_POS_SLOPE          F32 0.0
+GLINT_LENGTH_POS_REF            F32 0.0
+GLINT_LENGTH_POS_CUT            F32 0.0
+GLINT_LENGTH_MIN_FPA            F32 0.0
+GLINT_ANGLE_POS_SLOPE           F32 0.0
+GLINT_ANGLE_POS_REF             F32 0.0
+# save glint positions?
+PSASTRO.SAVE.GLINTS             BOOL FALSE
+
 GLINT_WIDTH                     F32 0.0
 GLINT.REGION                    MULTI
@@ -299 +335 @@
 END
 
+YSE_ASTRO METADATA
+END
+
 CNP_ASTRO_PV3 METADATA
 END
@@ -318 +357 @@
 END
 
+STATICSKY_POLE   METADATA
+    PSASTRO.SAVE.CFF           BOOL TRUE  # save a cff file (input for psphotFullForce)
+END
+
 STATICSKY_TESTCAL   METADATA
 END
@@ -333 +376 @@
 END
 
+GLINT_TEST METADATA
+END
+
+M31_SHALLOW METADATA 
+END
+
+M31_DEEP METADATA 
+END
+
+SWEETSPOT_TEST METADATA
+END
+

tags/ipp-ws-20170121/ippconfig/recipes/psphot.config

@@ -337 +337 @@
 # it overrides).
 LINEAR_FIT_VARIANCE_MODE            STR  CONSTANT
+
+# Use the covariance factor in the linear fit (true) or set factor to 1.0 (false)
+LINEAR_FIT_COVAR_FACTOR             BOOL  TRUE
 
 PCM_BOX_SIZE                        S32   8
@@ -574 +577 @@
   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
+
+  # NOTE: if PSPHOT.STACK.USE.RAW is set to False, KRON.SMOOTH should be
+  # set to false as well in order to get the best MOMENTS_R1 measurement
+  PSPHOT.STACK.USE.RAW                BOOL  T    # perform photometry & morphology analysis on the raw image
+  KRON_SMOOTH                         BOOL  T    # smooth before kron radius measurement
   @PSPHOT.STACK.TARGET.PSF.FWHM       F32   6.0 8.0 # FWHM of target PSF (if NOT AUTO sized; pixels)
-  RADIAL_APERTURES                    BOOL  F    # calculate flux in circular radial apertures?
+  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_SV3
+  OUTPUT.FORMAT                       STR   PS1_SV4
+
+  # subtract radial profiles for extremely bright stars?
+  SUBTRACT_SATSTAR_PROFILE            BOOL  T
+  
+  CONSTANT_PHOTOMETRIC_WEIGHTS        BOOL  TRUE 
+  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_MIN_TOL                     F32   0.1             # Fit tolerance for EXT
 
   EXT_FIT_MAX_RADIUS                  F32   50.0
-  PSF_MODEL                           STR   PS_MODEL_GAUSS 
+  PSF_MODEL                           STR   PS_MODEL_PS1_V1 
   EXT_MODEL                           STR   PS_MODEL_QGAUSS
+  PEAKS_NMAX_TOTAL                    S32   0 # set this to limit the allowed number of peaks - Yields fault instead of avoid memory explosion
+
+  REPAIR.PETROSIAN.MAG.ERRORS         BOOL  TRUE # write PETRO_MAG_ERR as dFlux / Flux when writing
+
+  SAVE.RESID                          BOOL  FALSE
+END
+
+# Extended source fit parameters
+STACKPHOT_EUCLID                      METADATA
+  EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform any of the aperture-like measurements?
+  EXTENDED_SOURCE_GALAXY_PARAMS       BOOL  TRUE  # measure additional paramters for "galaxies"
+  EXTENDED_SOURCE_SN_LIM              F32   10.0
+  EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
+  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
+  EXT.NSIGMA.LIMIT.USE                BOOL  FALSE
+  EXT.FIT.MIN.GAL.LIMIT.USE           BOOL  TRUE  # limit extended source fits by galactic coordinates
+
+  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?
+  # NOTE: if PSPHOT.STACK.USE.RAW is set to False, KRON.SMOOTH should be
+  # set to false as well in order to get the best MOMENTS_R1 measurement
+  PSPHOT.STACK.USE.RAW                BOOL  T    # perform photometry & morphology analysis on the raw image
+  KRON_SMOOTH                         BOOL  T    # smooth before kron radius measurement
+  @PSPHOT.STACK.TARGET.PSF.FWHM       F32   6.0 8.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_SV4
+
+  # PS1 EUCLID values (dropped inner 2 apertures)
+  @RADIAL.ANNULAR.BINS.LOWER           F32      0.00  5.38 10.77 16.15 21.54 32.30 # perl parser fails without a comment ticket #1476 still?
+  @RADIAL.ANNULAR.BINS.UPPER           F32      5.38 10.77 16.15 21.54 32.30 43.06 # perl parser fails without a comment ticket #1476 still?
+  #                aperture radius in arcsec:   1.0   2.0   3.0   4.0   6.0   8.0
+
+  # subtract radial profiles for extremely bright stars?
+  SUBTRACT_SATSTAR_PROFILE            BOOL  T
+  
+  CONSTANT_PHOTOMETRIC_WEIGHTS        BOOL  TRUE 
+  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_MIN_TOL                     F32   0.1             # Fit tolerance for EXT
+
+  EXT_FIT_MAX_RADIUS                  F32   50.0
+  PSF_MODEL                           STR   PS_MODEL_PS1_V1 
+  EXT_MODEL                           STR   PS_MODEL_QGAUSS
+  PEAKS_NMAX_TOTAL                    S32   0 # set this to limit the allowed number of peaks - Yields fault instead of avoid memory explosion
+
+  REPAIR.PETROSIAN.MAG.ERRORS         BOOL  TRUE # write PETRO_MAG_ERR as dFlux / Flux when writing
+
+  SAVE.RESID                          BOOL  FALSE
 END
 
@@ -789 +857 @@
     TRAIL_RAW EXTENDED_SOURCE_MODEL  PS_MODEL_TRAIL    10.0   FALSE
   END
+END
+
+YSE_DIFF METADATA
+  PEAKS_NSIGMA_LIMIT_2              F32  3.5           # peak significance threshold 
+  DIFF_STATS                        BOOL TRUE          # Calculate diff-specific stats
+  OUTPUT.FORMAT                     STR  PS1_DV5       # Format of output file
+
+  PSF_FIT_MODEL_SUM_FRAC_CUT        F32  0.5
+  PSF_FIT_MASKED_SUM_FRAC_CUT       F32  0.1
+
+END
+
+YSE_NOCOVAR_DIFF METADATA
+  PEAKS_NSIGMA_LIMIT_2              F32  3.5           # peak significance threshold 
+  DIFF_STATS                        BOOL TRUE          # Calculate diff-specific stats
+  OUTPUT.FORMAT                     STR  PS1_DV5       # Format of output file
+
+  PSF_FIT_MODEL_SUM_FRAC_CUT        F32  0.5
+  PSF_FIT_MASKED_SUM_FRAC_CUT       F32  0.1
+
+  ## Use the covariance factor in the linear fit (true) or set factor to 1.0 (false)
+  LINEAR_FIT_COVAR_FACTOR             BOOL  FALSE
+
+  LINEAR_FIT_VARIANCE_MODE            STR   IMAGE_VAR
+
 END
 
@@ -860 +953 @@
 END
 
+FULLFORCE_EUCLID METADATA
+    GALAXY_SHAPES           BOOL    TRUE
+
+    # new recipe values which set paramter spacing based on signal to noise
+    # DELTA = Q / SN
+    # F_MIN = 1 - NSIGMA * DELTA
+    # F_MAX = 1 + NSIGMA * DELTA
+    GALAXY_SHAPES_Q                     F32   1.5       # these values result in
+    GALAXY_SHAPES_NSIGMA                F32   4.0       # a 9 x 9 grid
+    GALAXY_SHAPES_CLAMP_SN              F32   50.       # with minimum delta .03 pixels
+
+    RADIAL_APERTURES        BOOL    TRUE
+    EXTENDED_SOURCE_FITS    BOOL    TRUE    # this casues the xfit extension to be written out
+    EXTENDED_SOURCE_PETROSIAN BOOL  TRUE    # To measure petrosian magnitudes
+    EXTENDED_SOURCE_ANNULI  BOOL    TRUE
+    LENSING_PARAMETERS      BOOL    TRUE
+    SAVE.PSF                BOOL    FALSE
+    SAVE.BACKMDL            BOOL    FALSE
+    SAVE.RESID              BOOL    FALSE
+    OUTPUT.FORMAT           STR     PS1_V5
+END
+
 CHIP_SHALLOW METADATA
   PEAKS_NSIGMA_LIMIT                  F32   25.0            # peak significance threshold
   PEAKS_NSIGMA_LIMIT_2                F32   15.0            # peak significance threshold
 END
+
+M31_DEEP METADATA 
+END

tags/ipp-ws-20170121/psphot/src/psphotFitSourcesLinear.c

@@ -203 +203 @@
     // XXX do not apply covarFactor for the moment...
     // covarFactor = 1.0;
+
+    bool use_covarfactor = psMetadataLookupBool(&status, recipe, "LINEAR_FIT_COVAR_FACTOR");
+    if (!status) {
+        use_covarfactor = true;
+    }
+
+    if (!use_covarfactor) {
+        covarFactor = 1.0;
+        psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "Manually reset covariance factor: %f\n", covarFactor);
+
+    }
 
     int Nsat = 0;