Changeset 42390 for trunk/ippconfig/recipes
- Timestamp:
- Feb 8, 2023, 12:19:14 PM (3 years ago)
- Location:
- trunk/ippconfig
- Files:
-
- 11 edited
- 1 copied
-
. (modified) (1 prop)
-
recipes/Makefile.am (modified) (1 diff)
-
recipes/filerules-mef.mdc (modified) (4 diffs)
-
recipes/filerules-simple.mdc (modified) (3 diffs)
-
recipes/filerules-split.mdc (modified) (4 diffs)
-
recipes/fpcamera.config (copied) (copied from branches/eam_branches/ipp-20220316/ippconfig/recipes/fpcamera.config )
-
recipes/ppImage.config (modified) (4 diffs)
-
recipes/ppSim.config (modified) (1 diff)
-
recipes/ppStats.config (modified) (2 diffs)
-
recipes/ppStatsFromMetadata.config (modified) (1 diff)
-
recipes/psastro.config (modified) (2 diffs)
-
recipes/reductionClasses.mdc (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippconfig
- Property svn:mergeinfo changed
/branches/eam_branches/ipp-20220316/ippconfig (added) merged: 42159,42162,42166,42169-42170,42184,42208,42217,42221,42373
- Property svn:mergeinfo changed
-
trunk/ippconfig/recipes/Makefile.am
r41750 r42390 34 34 ppBackground.mdc \ 35 35 pstamp.config \ 36 fpcamera.config \ 36 37 remote_hosts.config 37 38 -
trunk/ippconfig/recipes/filerules-mef.mdc
r42334 r42390 19 19 PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.MEF 20 20 PSPHOT.PSF.SAVE STR PSPHOT.PSF.RAW.SAVE 21 22 FPCAMERA.OUTPUT STR FPCAMERA.OUT.CMF.MEF 21 23 22 24 ### Redirections (SPL) … … 67 69 PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE 68 70 PPIMAGE.LINEARITY INPUT @DETDB CHIP LINEARITY 71 PPIMAGE.PATTERN.ROW.AMP INPUT @DETDB FPA PATTERN.ROW.AMP 72 PPIMAGE.PATTERN.DEAD.CELLS INPUT @DETDB FPA PATTERN.DEAD.CELLS 69 73 PPIMAGE.NEWNONLIN INPUT @DETDB CHIP NEWNONLIN 70 PPIMAGE.PATTERN.ROW.AMP INPUT @DETDB FPA PATTERN.ROW.AMP71 74 72 75 ## Files used by ppMerge … … 200 203 PPBACKGROUND.BACKGROUND INPUT @FILES CHIP IMAGE 201 204 PPBACKGROUND.STACK INPUT @FILES FPA IMAGE 205 206 ## files used by fpcamera 207 FPCAMERA.INPUT INPUT @FILES CHIP IMAGE 208 FPCAMERA.INPUT.MASK INPUT @FILES CHIP MASK 209 FPCAMERA.INPUT.VARIANCE INPUT @FILES CHIP VARIANCE 210 FPCAMERA.INPUT.ASTROM INPUT @FILES CHIP WCS 202 211 203 212 ### output file definitions … … 313 322 PSASTRO.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK COMP_MASK CHIP TRUE NONE 314 323 324 FPCAMERA.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE MEF 325 FPCAMERA.RESID OUTPUT {OUTPUT}.res.fits IMAGE COMP_SUB CHIP TRUE MEF 326 FPCAMERA.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE 327 FPCAMERA.CONFIG OUTPUT {OUTPUT}.mdc TEXT NONE FPA TRUE NONE 328 315 329 PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE 316 330 PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE -
trunk/ippconfig/recipes/filerules-simple.mdc
r42334 r42390 33 33 PPIMAGE.NEWNONLIN INPUT @DETDB CHIP NEWNONLIN 34 34 35 FPCAMERA.OUTPUT STR FPCAMERA.OUT.CMF 36 35 37 ## Files used by psvideophot 36 38 PSVIDEOPHOT.INPUT INPUT @FILES CHIP IMAGE … … 170 172 PPBACKGROUND.STACK INPUT @FILES FPA IMAGE 171 173 174 ## files used by fpcamera 175 FPCAMERA.INPUT INPUT @FILES CHIP IMAGE 176 FPCAMERA.INPUT.MASK INPUT @FILES CHIP MASK 177 FPCAMERA.INPUT.VARIANCE INPUT @FILES CHIP VARIANCE 178 FPCAMERA.INPUT.ASTROM INPUT @FILES CHIP WCS 179 172 180 ### output file definitions 173 181 TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT … … 265 273 PSASTRO.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK CHIP TRUE NONE 266 274 275 FPCAMERA.OUT.CMF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE NONE 276 FPCAMERA.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits IMAGE COMP_SUB CHIP TRUE NONE 277 FPCAMERA.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE 278 FPCAMERA.CONFIG OUTPUT {OUTPUT}.mdc TEXT NONE FPA TRUE NONE 279 267 280 PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE 268 281 PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE -
trunk/ippconfig/recipes/filerules-split.mdc
r42334 r42390 27 27 PPSTACK.UNCONV.VARIANCE STR PPSTACK.UNCONV.VARIANCE.COMP 28 28 PPSTACK.UNCONV.EXPWT STR PPSTACK.UNCONV.EXPWT.COMP 29 30 FPCAMERA.OUTPUT STR FPCAMERA.OUT.CMF.MEF 29 31 30 32 ### input file definitions … … 53 55 PPIMAGE.NEWNONLIN INPUT @DETDB CHIP NEWNONLIN 54 56 PPIMAGE.PATTERN.ROW.AMP INPUT @DETDB FPA PATTERN.ROW.AMP 57 PPIMAGE.PATTERN.DEAD.CELLS INPUT @DETDB FPA PATTERN.DEAD.CELLS 55 58 56 59 ## Files used by psvideophot … … 183 186 PPBACKGROUND.STACK INPUT @FILES FPA IMAGE 184 187 188 ## files used by fpcamera 189 FPCAMERA.INPUT INPUT @FILES CHIP IMAGE 190 FPCAMERA.INPUT.MASK INPUT @FILES CHIP MASK 191 FPCAMERA.INPUT.VARIANCE INPUT @FILES CHIP VARIANCE 192 FPCAMERA.INPUT.ASTROM INPUT @FILES CHIP WCS 193 185 194 ### output file definitions 186 195 TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT … … 293 302 PSASTRO.OUT.ORIGINAL.CMF.MEF OUTPUT {OUTPUT}.smf.original CMF NONE FPA TRUE MEF 294 303 304 FPCAMERA.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE MEF 305 FPCAMERA.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits IMAGE COMP_SUB CHIP TRUE NONE 306 FPCAMERA.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE 307 FPCAMERA.CONFIG OUTPUT {OUTPUT}.mdc TEXT NONE FPA TRUE NONE 308 295 309 # XXX need to use CHIP for tc3 tests, but why? 296 310 #PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG CHIP TRUE NONE -
trunk/ippconfig/recipes/ppImage.config
r42334 r42390 28 28 PATTERN.CELL BOOL FALSE # Cell pattern correction (see options below) 29 29 PATTERN.CONTINUITY BOOL FALSE # continuity corrections (see options below) 30 PATTERN.DEAD.CELLS BOOL FALSE # continuity corrections (see options below) 30 31 FRINGE BOOL FALSE # Fringe subtraction 31 32 PHOTOM BOOL FALSE # Source identification and photometry … … 103 104 OVERSCAN.CONSTANT BOOL FALSE # Apply a known, fixed value? 104 105 OVERSCAN.VALUE F32 0.0 # value to apply, if requested 106 OVERSCAN.MIN.VALID F32 0.0 # minimum valid overscan value 107 OVERSCAN.MAX.VALID F32 65536.0 # maximum valid overscan value 105 108 106 109 # Pattern Row subtraction options … … 2617 2620 OVERSCAN BOOL TRUE # Overscan subtraction 2618 2621 NONLIN BOOL FALSE # Non-linearity correction; not implemented 2619 BIAS BOOL TRUE# Bias subtraction2622 BIAS BOOL FALSE # Bias subtraction 2620 2623 DARK BOOL TRUE # Dark subtraction 2624 REMNANCE BOOL FALSE # Remnance masking 2621 2625 SHUTTER BOOL FALSE # Shutter correction 2622 2626 FLAT BOOL TRUE # Flat-field normalisation 2623 2627 MASK BOOL TRUE # Mask bad pixels 2624 FRINGE BOOL TRUE # Fringe subtraction 2625 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 2626 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 2627 PHOTOM BOOL TRUE # Source identification and photometry 2628 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 2629 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 2628 MASK.BUILD BOOL TRUE # Build internal mask? 2629 MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails 2630 PATTERN.ROW BOOL FALSE # Row pattern correction 2631 PATTERN.CELL BOOL FALSE # Cell pattern correction 2632 FRINGE BOOL FALSE # Fringe subtraction 2633 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 2634 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 2635 PHOTOM BOOL FALSE # Source identification and photometry 2636 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 2637 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 2638 MASK.STATS BOOL FALSE # Calculate Mask statistics. 2639 CROSSTALK.MEASURE BOOL FALSE # Subtract model background? 2640 2630 2641 BACKGROUND BOOL TRUE # Subtract background? 2631 MASK.STATS BOOL TRUE # Calculate Mask statistics. 2642 PATTERN.DEAD.CELLS BOOL TRUE # continuity corrections (see options below) 2643 OVERSCAN.MIN.VALID F32 100.0 # Overscan subtraction 2644 OVERSCAN.MAX.VALID F32 64000.0 # Overscan subtraction 2632 2645 END 2633 2646 … … 2643 2656 OVERSCAN BOOL TRUE # Overscan subtraction 2644 2657 NONLIN BOOL FALSE # Non-linearity correction; not implemented 2645 BIAS BOOL TRUE# Bias subtraction2658 BIAS BOOL FALSE # Bias subtraction 2646 2659 DARK BOOL TRUE # Dark subtraction 2660 REMNANCE BOOL FALSE # Remnance masking 2647 2661 SHUTTER BOOL FALSE # Shutter correction 2648 2662 FLAT BOOL TRUE # Flat-field normalisation 2649 MASK BOOL TRUE # Mask bad pixels 2650 FRINGE BOOL TRUE # Fringe subtraction 2651 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 2652 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 2653 PHOTOM BOOL TRUE # Source identification and photometry 2654 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 2655 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 2663 MASK BOOL FALSE # Mask bad pixels 2664 MASK.BUILD BOOL FALSE # Build internal mask? 2665 MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails 2666 PATTERN.ROW BOOL FALSE # Row pattern correction 2667 PATTERN.CELL BOOL FALSE # Cell pattern correction 2668 FRINGE BOOL FALSE # Fringe subtraction 2669 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 2670 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 2671 PHOTOM BOOL FALSE # Source identification and photometry 2672 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 2673 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 2674 MASK.STATS BOOL FALSE # Calculate Mask statistics. 2675 CROSSTALK.MEASURE BOOL FALSE # Subtract model background? 2676 2656 2677 BACKGROUND BOOL TRUE # Subtract background? 2657 MASK.STATS BOOL TRUE # Calculate Mask statistics. 2678 PATTERN.DEAD.CELLS BOOL TRUE # continuity corrections (see options below) 2679 OVERSCAN.MIN.VALID F32 100.0 # Overscan subtraction 2680 OVERSCAN.MAX.VALID F32 64000.0 # Overscan subtraction 2658 2681 END 2659 2682 -
trunk/ippconfig/recipes/ppSim.config
r41332 r42390 8 8 OBS_MODE STR NONE 9 9 10 BIAS BOOL TRUE10 BIAS BOOL FALSE 11 11 BIAS.LEVEL F32 1000.0 # Bias level (e) 12 12 BIAS.RANGE F32 20.0 # Range of bias values (e) -
trunk/ippconfig/recipes/ppStats.config
r36914 r42390 35 35 HEADER MULTI 36 36 HEADER STR OVER_VAL 37 HEADER STR BACK_VAL 38 HEADER STR BACK_ERR 37 39 HEADER STR APMIFIT 38 40 HEADER STR DAPMIFIT … … 148 150 ANALYSIS STR MASKFRAC_MAX_DYNAMIC 149 151 ANALYSIS STR MASKFRAC_MAX_NPIX 152 END 153 154 # stats for camera-level analysis (astrometry, summary stats) 155 FPCAMERA METADATA 156 HEADER MULTI 157 HEADER STR ZPT_OBS 158 HEADER STR ZPT_ERR 159 160 HEADER STR PSLIB_V 161 HEADER STR MODULE_V 162 HEADER STR PHOT_V 163 HEADER STR FPCAM_V 164 HEADER STR STATS_V 165 HEADER STR IMAGE_V 166 HEADER STR STREAK_V 167 168 HEADER STR NDET # sources->n 169 HEADER STR NDET_EXT 170 HEADER STR NDET_FRC 171 172 ANALYSIS MULTI # metadata blocks to search in chip/cell/readout->analysis 173 ANALYSIS STR PSPHOT.HEADER 150 174 END 151 175 -
trunk/ippconfig/recipes/ppStatsFromMetadata.config
r42100 r42390 455 455 END 456 456 457 FPCAMERA_EXP METADATA 458 ENTRY MULTI 459 TYPE VAL KEYWORD TYPE STATISTIC FLAG 460 ENTRY VAL ZPT_OBS F32 SAMPLE_MEAN -zpt_obs 461 ENTRY VAL ZPT_ERR F32 RMS -zpt_err 462 ENTRY VAL ZPT_UQ F32 UQ -zpt_uq 463 ENTRY VAL ZPT_LQ F32 LQ -zpt_lq 464 ENTRY VAL NDET S32 SUM -n_stars 465 466 ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag 467 468 # Revision values 469 ENTRY VAL FPCAM_V STR CONSTANT -ver_fpcamera 470 END 471 457 472 # values to extract from output metadata and the stats to calculate 458 473 # XXX -bg_mean_stdev should take rms of bg_mean_stdev if bg_mean_stdev != 0 (A) -
trunk/ippconfig/recipes/psastro.config
r42229 r42390 4 4 PSASTRO.SAVE.REFMATCH BOOL FALSE # save refstar matches as table in output smf file 5 5 PSASTRO.SAVE.CFF BOOL FALSE # save a cff file (input for psphotFullForce) 6 7 PSASTRO.SKIP.ASTROMETRY BOOL FALSE 6 8 7 9 # select which WCS style to use on output images. … … 406 408 END 407 409 410 APTEST_V1 METADATA 411 PSASTRO.SKIP.ASTROMETRY BOOL TRUE 412 END 413 -
trunk/ippconfig/recipes/reductionClasses.mdc
r42308 r42390 185 185 STATICSKY_CALIBRATION STR STATICSKY_CAL 186 186 FULLFORCE_PSPHOT STR FULLFORCE_WARP 187 FPCAMERA STR DEFAULT_RECIPE 187 188 END 188 189 … … 385 386 CHIP_PPIMAGE STR APTEST_V1 386 387 CHIP_PSPHOT STR APTEST_V1 387 PSASTRO STR DEFAULT_RECIPE388 PSASTRO STR APTEST_V1 388 389 JPEG_BIN1 STR PPIMAGE_J1 389 390 JPEG_BIN2 STR PPIMAGE_J2 … … 1464 1465 ADDSTAR STR ADDSTAR 1465 1466 PSASTRO STR DEFAULT_RECIPE 1467 FPCAMERA STR DEFAULT_RECIPE 1466 1468 END 1467 1469
Note:
See TracChangeset
for help on using the changeset viewer.
