Changeset 40620
- Timestamp:
- Feb 7, 2019, 11:48:48 AM (7 years ago)
- Location:
- tags/ipp-20170121/ippconfig
- Files:
-
- 4 edited
-
gpc1/ppImage.config (modified) (1 diff, 1 prop)
-
gpc2/ppImage.config (modified) (10 diffs, 1 prop)
-
recipes/ppImage.config (modified) (1 diff, 1 prop)
-
recipes/reductionClasses.mdc (modified) (1 diff, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-20170121/ippconfig/gpc1/ppImage.config
-
Property svn:mergeinfo
set to
/branches/czw_branch/20160809/ippconfig/gpc1/ppImage.config merged eligible /trunk/ippconfig/gpc1/ppImage.config merged eligible
r36772 r40620 225 225 CROSSTALK.MEASURE BOOL FALSE # Subtract model background? 226 226 NO.COMPRESS BOOL TRUE # do not compress images 227 END 228 229 # test for MOPS request reprocessing without masking 230 CHIP_NOMASKTEST METADATA 231 BASE.FITS BOOL FALSE # Save base detrended image? 232 BASE.MASK.FITS BOOL FALSE # Save base detrended image? 233 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 234 CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? 235 CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? 236 CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? 237 OVERSCAN BOOL TRUE # Overscan subtraction 238 NONLIN BOOL TRUE # Non-linearity correction; not implemented 239 NOISEMAP BOOL TRUE 240 BIAS BOOL FALSE # Bias subtraction 241 DARK BOOL TRUE # Dark subtraction 242 REMNANCE BOOL FALSE # Remnance masking 243 SHUTTER BOOL FALSE # Shutter correction 244 FLAT BOOL TRUE # Flat-field normalisation 245 MASK BOOL FALSE # Mask bad pixels 246 MASK.BUILD BOOL FALSE # Build internal mask? 247 MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails 248 PATTERN.ROW BOOL TRUE # Row pattern correction 249 PATTERN.CELL BOOL FALSE # Cell pattern correction 250 PATTERN.CONTINUITY BOOL TRUE # Cell pattern correction using edge continuity 251 FRINGE BOOL TRUE # Fringe subtraction 252 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 253 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 254 PHOTOM BOOL TRUE # Source identification and photometry 255 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 256 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 257 BACKGROUND BOOL TRUE # Subtract background? 258 CROSSTALK.MEASURE BOOL FALSE # Subtract model background? 227 259 END 228 260 -
Property svn:mergeinfo
set to
-
tags/ipp-20170121/ippconfig/gpc2/ppImage.config
-
Property svn:mergeinfo
set to
/branches/czw_branch/20160809/ippconfig/gpc2/ppImage.config merged eligible /trunk/ippconfig/gpc2/ppImage.config merged eligible
r38265 r40620 1 1 BACKGROUND BOOL FALSE 2 2 # binned output image options 3 3 BIN1.XBIN S32 16 … … 36 36 # AUX.VIDEO.MASK STR neb://any/gpc1/auxmask/mpg.20130930/mask_video_cell_corners.fits 37 37 38 38 # only valid for GPC1 39 39 TILTYSTREAK.BY.CLASS METADATA # apply the 'tiltystreak' tool 40 APPLY.XY01 BOOL FALSE41 APPLY.XY03 BOOL FALSE42 APPLY.XY04 BOOL FALSE43 APPLY.XY05 BOOL FALSE44 APPLY.XY06 BOOL FALSE45 APPLY.XY10 BOOL FALSE46 APPLY.XY11 BOOL FALSE47 APPLY.XY13 BOOL FALSE48 APPLY.XY14 BOOL FALSE49 APPLY.XY15 BOOL FALSE50 APPLY.XY16 BOOL FALSE51 APPLY.XY17 BOOL FALSE52 APPLY.XY20 BOOL FALSE53 APPLY.XY21 BOOL FALSE54 APPLY.XY23 BOOL FALSE55 APPLY.XY24 BOOL FALSE56 APPLY.XY25 BOOL FALSE57 APPLY.XY26 BOOL FALSE58 APPLY.XY30 BOOL FALSE59 APPLY.XY31 BOOL FALSE60 APPLY.XY33 BOOL FALSE61 APPLY.XY34 BOOL FALSE62 APPLY.XY35 BOOL FALSE63 APPLY.XY36 BOOL FALSE64 APPLY.XY37 BOOL FALSE65 APPLY.XY40 BOOL FALSE66 APPLY.XY41 BOOL FALSE67 APPLY.XY42 BOOL FALSE68 APPLY.XY43 BOOL FALSE69 APPLY.XY44 BOOL FALSE70 APPLY.XY46 BOOL FALSE71 APPLY.XY50 BOOL FALSE72 APPLY.XY52 BOOL FALSE73 APPLY.XY53 BOOL FALSE74 APPLY.XY54 BOOL FALSE75 APPLY.XY56 BOOL FALSE76 APPLY.XY60 BOOL FALSE77 APPLY.XY62 BOOL FALSE78 APPLY.XY63 BOOL FALSE79 APPLY.XY64 BOOL FALSE80 APPLY.XY66 BOOL FALSE81 APPLY.XY71 BOOL FALSE82 APPLY.XY72 BOOL FALSE83 APPLY.XY73 BOOL FALSE84 APPLY.XY74 BOOL FALSE85 APPLY.XY76 BOOL FALSE86 87 APPLY.XY02 BOOL TRUE88 APPLY.XY12 BOOL TRUE89 APPLY.XY22 BOOL TRUE90 APPLY.XY27 BOOL TRUE91 APPLY.XY32 BOOL TRUE92 APPLY.XY45 BOOL TRUE93 APPLY.XY47 BOOL TRUE94 APPLY.XY51 BOOL TRUE95 APPLY.XY55 BOOL TRUE96 APPLY.XY57 BOOL TRUE97 APPLY.XY61 BOOL TRUE98 APPLY.XY65 BOOL TRUE99 APPLY.XY67 BOOL TRUE100 APPLY.XY75 BOOL TRUE101 102 OPTIONS.XY02 STR mask=0001011100010111000101110001011100010111000101110001011100010111 # cols: 3,5,6,7103 OPTIONS.XY12 STR mask=0000011100000111000001110000011100000111111101111111011111110111 # col 5,6,7 (+ 0,1,2,3 for row > 4)104 OPTIONS.XY22 STR mask=0001001100010011000100110001001100010011000100110001001100010011 # cols: 3,6,7105 OPTIONS.XY27 STR none106 OPTIONS.XY32 STR mask=0011011100110111001101110011011100110111001101110011011100110111 # cols: 2,3,5,6,7107 OPTIONS.XY45 STR mask=0111111101111111011111111111111111111111111111111111111111111111 # all except 00, 01, 02108 OPTIONS.XY47 STR mask=1111111001111110011111100111111001111110011111100111111001111110 # cols: 2,3,4,5,6,7 (add 00)109 OPTIONS.XY51 STR mask=0011101100111011001110110011101100111011001110110011101100111011 # cols: 2,3,4,6,7110 OPTIONS.XY55 STR mask=0000000011111111111111111111111111111111111111111111111111111111 # all except row 0111 OPTIONS.XY57 STR none112 OPTIONS.XY61 STR none113 OPTIONS.XY65 STR mask=0111011101110111011101110111011101110111011101110111011101110111 # cols: 1,2,3,5,6,7114 OPTIONS.XY67 STR mask=1100111111001111110011111100111100000000000000000000000000000000 # cols: 0,1,4,5,6,7 except rows 4,5,6,7115 OPTIONS.XY75 STR mask=0001111100011111000111110001111100011111000111110001111100011111 # cols: 3,4,5,6,7116 117 # OPTIONS.XY02 STR mask=00010111.00010111.00010111.00010111.00010111.00010111.00010111.00010111 # cols: 3,5,6,7118 40 END 119 41 … … 222 144 END 223 145 146 # test for MOPS request reprocessing without masking 147 CHIP_NOMASKTEST METADATA 148 BASE.FITS BOOL FALSE # Save base detrended image? 149 BASE.MASK.FITS BOOL FALSE # Save base detrended image? 150 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 151 CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? 152 CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? 153 CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? 154 OVERSCAN BOOL TRUE # Overscan subtraction 155 NONLIN BOOL FALSE # apply non-linearity correction 156 BIAS BOOL FALSE # Bias subtraction 157 DARK BOOL TRUE # Dark subtraction 158 NOISEMAP BOOL FALSE 159 REMNANCE BOOL FALSE # Remnance masking 160 SHUTTER BOOL FALSE # Shutter correction 161 FLAT BOOL TRUE # Flat-field normalisation 162 MASK BOOL FALSE # Mask bad pixels 163 MASK.BUILD BOOL FALSE # Build internal mask? 164 MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails 165 MASK.AUXMASK BOOL FALSE # augment mask with more restrictive auxiliary mask 166 PATTERN.ROW BOOL FALSE # Row pattern correction 167 PATTERN.CELL BOOL FALSE # Cell pattern correction 168 PATTERN.CONTINUITY BOOL FALSE # Cell pattern correction using edge continuity 169 FRINGE BOOL FALSE # Fringe subtraction 170 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 171 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 172 PHOTOM BOOL TRUE # Source identification and photometry 173 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 174 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 175 BACKGROUND BOOL TRUE # Subtract background? 176 CROSSTALK.MEASURE BOOL FALSE # Subtract model background? 177 END 178 224 179 # Chip processing for testing pattern correction 225 180 CHIP_PATTERNTEST METADATA … … 318 273 OVERSCAN BOOL TRUE # Overscan subtraction 319 274 NONLIN BOOL FALSE # Non-linearity correction; not implemented 320 NOISEMAP BOOL TRUE321 275 BIAS BOOL FALSE # Bias subtraction 322 276 DARK BOOL TRUE # Dark subtraction 277 NOISEMAP BOOL FALSE 323 278 REMNANCE BOOL FALSE # Remnance masking 324 279 SHUTTER BOOL FALSE # Shutter correction … … 326 281 MASK BOOL TRUE # Mask bad pixels 327 282 MASK.BUILD BOOL TRUE # Build internal mask? 328 MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails329 PATTERN.ROW BOOL TRUE # Row pattern correction330 PATTERN.CELL BOOL FALSE # Cell pattern correction331 PATTERN.CONTINUITY BOOL TRUE # Cell pattern correction using edge continuity332 FRINGE BOOL TRUE # Fringe subtraction283 MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails 284 PATTERN.ROW BOOL FALSE # Row pattern correction 285 PATTERN.CELL BOOL FALSE # Cell pattern correction 286 PATTERN.CONTINUITY BOOL FALSE # Cell pattern correction using edge continuity 287 FRINGE BOOL FALSE # Fringe subtraction 333 288 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 334 289 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? … … 341 296 DETREND.CONSTRAINTS METADATA 342 297 DARK METADATA 343 DETTYPE STR DARKTEST344 298 EXPTIME STR FPA.EXPOSURE 345 299 END … … 641 595 DETREND.CONSTRAINTS METADATA 642 596 DARK METADATA 643 DETTYPE STR DARK 597 DETTYPE STR DARK_PREMASK 644 598 EXPTIME STR FPA.EXPOSURE 645 599 END … … 696 650 DETREND.CONSTRAINTS METADATA 697 651 DARK METADATA 698 DETTYPE STR DARK 652 DETTYPE STR DARK_PREMASK 699 653 EXPTIME STR FPA.EXPOSURE 700 654 END … … 1688 1642 END 1689 1643 1644 # CZW 2018-02-14 1645 # The default PPIMAGE_N includes BACKGROUND=T, and that breaks detrend construction 1646 PPIMAGE_N METADATA 1647 BASE.FITS BOOL TRUE # Save base detrended image? 1648 BASE.MASK.FITS BOOL FALSE # Save base detrended image? 1649 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 1650 CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? 1651 CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? 1652 CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? 1653 OVERSCAN BOOL FALSE # Overscan subtraction 1654 NONLIN BOOL FALSE # Non-linearity correction; not implemented 1655 BIAS BOOL FALSE # Bias subtraction 1656 DARK BOOL FALSE # Dark subtraction 1657 SHUTTER BOOL FALSE # Shutter correction 1658 FLAT BOOL FALSE # Flat-field normalisation 1659 MASK BOOL FALSE # Mask bad pixels 1660 MASK.BUILD BOOL FALSE # Build internal mask? 1661 FRINGE BOOL FALSE # Fringe subtraction 1662 PHOTOM BOOL FALSE # Source identification and photometry 1663 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 1664 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 1665 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 1666 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 1667 BACKGROUND BOOL FALSE # Subtract background? 1668 END 1669 1670 1690 1671 # test recipes 1691 1672 # currently : default CHIP recipe … … 1795 1776 END 1796 1777 1778 PPIMAGE_BKGCONT METADATA 1779 OVERSCAN BOOL FALSE # Overscan subtraction 1780 NONLIN BOOL FALSE # Non-linearity correction; not implemented 1781 BIAS BOOL FALSE # Bias subtraction 1782 DARK BOOL FALSE # Dark subtraction 1783 SHUTTER BOOL FALSE # Shutter correction 1784 FLAT BOOL FALSE # Flat-field normalisation 1785 MASK BOOL FALSE # Mask bad pixels 1786 MASK.BUILD BOOL FALSE # Build internal mask? 1787 FRINGE BOOL FALSE # Fringe subtraction 1788 PHOTOM BOOL FALSE # Source identification and photometry 1789 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 1790 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 1791 BASE.FITS BOOL FALSE # Save base image? 1792 BASE.MASK.FITS BOOL FALSE # Save base detrended image? 1793 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 1794 CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? 1795 CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? 1796 CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? 1797 BIN1.FITS BOOL FALSE # Save 1st binned chip image? 1798 BIN2.FITS BOOL FALSE # Save 2nd binned chip image? 1799 BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? 1800 BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? 1801 BIN1.XBIN S32 1 # Image is already binned 1802 BIN1.YBIN S32 1 # Image is already binned 1803 BIN2.XBIN S32 1 # Image is already binned 1804 BIN2.YBIN S32 1 # Image is already binned 1805 MASK.SATURATED BOOL FALSE # DO NOT Mask the saturated pixels 1806 MASK.LOW BOOL FALSE # DO NOT Mask the saturated pixels 1807 BACKGROUND.CONTINUITY BOOL FALSE 1808 PATTERN.CONTINUITY.WIDTH S32 2 1809 END -
Property svn:mergeinfo
set to
-
tags/ipp-20170121/ippconfig/recipes/ppImage.config
-
Property svn:mergeinfo
set to
/branches/czw_branch/20160809/ippconfig/recipes/ppImage.config merged eligible /trunk/ippconfig/recipes/ppImage.config merged eligible
r38456 r40620 512 512 # Standard chip processing for areas with high stellar density 513 513 CHIP_DENSE_STARS METADATA 514 END 515 516 # test for MOPS request reprocessing without masking -- may be different for gpc1/gpc2 517 CHIP_NOMASKTEST METADATA 514 518 END 515 519 -
Property svn:mergeinfo
set to
-
tags/ipp-20170121/ippconfig/recipes/reductionClasses.mdc
- Property svn:mergeinfo changed
/trunk/ippconfig/recipes/reductionClasses.mdc merged: 40619
r40607 r40620 552 552 JPEG_BIN1 STR PPIMAGE_J1 553 553 JPEG_BIN2 STR PPIMAGE_J2 554 END 555 556 # test for MOPS request reprocessing without masking 557 NOMASKTEST METADATA 558 CHIP_PPIMAGE STR CHIP_NOMASKTEST 559 CHIP_PSPHOT STR CHIP 560 WARP_PSWARP STR WARP 561 STACK_PPSTACK STR QUICKSTACK 562 STACK_PPSUB STR STACK 563 STACK_PSPHOT STR STACK 564 DIFF_PPSUB STR DIFF 565 DIFF_PSPHOT STR SSTF_DIFF 566 JPEG_BIN1 STR PPIMAGE_J1 567 JPEG_BIN2 STR PPIMAGE_J2 568 FAKEPHOT STR FAKEPHOT 569 ADDSTAR STR ADDSTAR 570 PSASTRO STR DEFAULT_RECIPE 571 STACKPHOT_PSPHOT STR STACKPHOT 572 STACKPHOT_PPSUB STR STACKPHOT 573 STACKPHOT_PPSTACK STR STACKPHOT 574 STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE 575 BACKGROUND_PPBACKGROUND STR BACKGROUND 576 BACKGROUND_PSWARP STR BACKGROUND 577 PSVIDEOPHOT STR PSVIDEOPHOT 554 578 END 555 579 - Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
