Changeset 35752
- Timestamp:
- Jul 3, 2013, 1:48:43 PM (13 years ago)
- Location:
- branches/eam_branches/ipp-20130509
- Files:
-
- 14 edited
-
. (modified) (1 prop)
-
ippconfig (modified) (1 prop)
-
ippconfig/gpc1/ppImage.config (modified) (9 diffs)
-
ippconfig/gpc1/psastro.config (modified) (2 diffs)
-
ippconfig/gpc1/psphot.config (modified) (1 diff, 1 prop)
-
ippconfig/megacam/psastro.config (modified) (1 diff)
-
ippconfig/recipes/filerules-split.mdc (modified) (3 diffs)
-
ippconfig/recipes/nightly_science.config (modified) (1 diff)
-
ippconfig/recipes/ppImage.config (modified) (3 diffs)
-
ippconfig/recipes/ppSub.config (modified) (1 prop)
-
ippconfig/recipes/psastro.config (modified) (2 diffs)
-
ippconfig/recipes/psphot.config (modified) (1 prop)
-
ippconfig/recipes/pswarp.config (modified) (2 diffs)
-
ippconfig/recipes/reductionClasses.mdc (modified) (1 diff, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-20130509
-
branches/eam_branches/ipp-20130509/ippconfig
- Property svn:mergeinfo changed
/trunk/ippconfig merged: 35678-35679,35685,35688-35689,35704,35715,35723
- Property svn:mergeinfo changed
-
branches/eam_branches/ipp-20130509/ippconfig/gpc1/ppImage.config
r35531 r35752 21 21 USE.DEBURNED.IMAGE BOOL TRUE # use burntool-repaired image? 22 22 USE.BEST.BURNTOOL BOOL TRUE # require the best burntooled data 23 MASK.BURNTOOL BOOL FALSE 23 MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails 24 24 TILTYSTREAK.APPLY BOOL FALSE # apply the 'tiltystreak' tool 25 25 NOISEMAP BOOL FALSE # Apply read noise map 26 26 27 APPLY.BURNTOOL BOOL TRUE # apply burntool correction in ppImage 28 27 29 # Final detrending options 28 HAS.VIDEO BOOL FALSE # Treat this OTA as if it has video data29 USE.VIDEO.DARK BOOL FALSE# Use a video dark if we have video data?30 USE.VIDEO.MASK BOOL TRUE # Use a video mask if we have video data?31 32 # aditional auxil lary mask applied to corners of all chips in video cells.30 HAS.VIDEO BOOL FALSE # Treat this OTA as if it has video data 31 USE.VIDEO.DARK BOOL TRUE # Use a video dark if we have video data? 32 USE.VIDEO.MASK BOOL FALSE # Use a video mask if we have video data? 33 34 # aditional auxiliary mask applied to corners of all chips in video cells. 33 35 # Is only applied if MASK.AUXMASK and USE.VIDEO.MASK are both true 34 36 AUX.VIDEO.MASK STR neb://any/gpc1/auxmask/mpg.20130506/mask_video_cell_corners.fits … … 153 155 FRINGE.FILTERS STR y.00000 154 156 155 # Standard chip processing (NOTE: when changing this be sure to check whether changes should be applied toCHIP_BGPRESEVE and/or CHIP_AUXMASK 157 # Standard chip processing (NOTE: when changing this be sure to check whether changes should be applied to 158 # CHIP_PRESERVE_BG CHIP_AUXMASK or CHIP_PRESERVE_BG_AUXMASK 156 159 CHIP METADATA 157 160 BASE.FITS BOOL FALSE # Save base detrended image? … … 172 175 MASK.BUILD BOOL TRUE # Build internal mask? 173 176 MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails 174 MASK.AUXMASK BOOL FALSE # augment with more restrictive auxillary mask177 MASK.AUXMASK BOOL FALSE # augment mask with more restrictive auxiliary mask 175 178 PATTERN.ROW BOOL TRUE # Row pattern correction 176 179 PATTERN.CELL BOOL FALSE # Cell pattern correction … … 1224 1227 END 1225 1228 1226 # Standard chip processing + auxil lary mask1229 # Standard chip processing + auxiliary mask 1227 1230 CHIP_AUXMASK METADATA 1228 1231 BASE.FITS BOOL FALSE # Save base detrended image? … … 1243 1246 MASK.BUILD BOOL TRUE # Build internal mask? 1244 1247 MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails 1245 MASK.AUXMASK BOOL TRUE # augment with more restrictive auxillary mask1248 MASK.AUXMASK BOOL TRUE # augment mask with more restrictive auxiliary mask 1246 1249 PATTERN.ROW BOOL TRUE # Row pattern correction 1247 1250 PATTERN.CELL BOOL FALSE # Cell pattern correction … … 1255 1258 BACKGROUND BOOL TRUE # Subtract background? 1256 1259 CROSSTALK.MEASURE BOOL TRUE # Subtract model background? 1257 END 1258 1259 # Standard chip processing without any background removal 1260 NO.COMPRESS BOOL TRUE # turn off image compression 1261 END 1262 1263 # Standard chip processing without background subtraction or pattern correction 1260 1264 CHIP_PRESERVE_BG METADATA 1261 1265 BASE.FITS BOOL FALSE # Save base detrended image? … … 1269 1273 BIAS BOOL FALSE # Bias subtraction 1270 1274 DARK BOOL TRUE # Dark subtraction 1271 NOISEMAP BOOL FALSE1275 NOISEMAP BOOL TRUE 1272 1276 REMNANCE BOOL FALSE # Remnance masking 1273 1277 SHUTTER BOOL FALSE # Shutter correction … … 1276 1280 MASK.BUILD BOOL TRUE # Build internal mask? 1277 1281 MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails 1278 MASK.AUXMASK BOOL TRUE # augment with more restrictive auxillary mask1282 MASK.AUXMASK BOOL FALSE # augment mask with more restrictive auxiliary mask 1279 1283 PATTERN.ROW BOOL FALSE # Row pattern correction 1280 1284 PATTERN.CELL BOOL FALSE # Cell pattern correction 1285 PATTERN.CONTINUITY BOOL TRUE # Cell pattern coorection using edge continuity 1281 1286 FRINGE BOOL TRUE # Fringe subtraction 1282 1287 BIN1.FITS BOOL TRUE # Save 1st binned chip image? … … 1288 1293 CROSSTALK.MEASURE BOOL TRUE # Subtract model background? 1289 1294 END 1295 1296 1297 # Standard chip processing with background removal, but then added back in 1298 CHIP_RESTORE_BG METADATA 1299 BASE.FITS BOOL FALSE # Save base detrended image? 1300 BASE.MASK.FITS BOOL FALSE # Save base detrended image? 1301 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 1302 CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? 1303 CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? 1304 CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? 1305 OVERSCAN BOOL TRUE # Overscan subtraction 1306 NONLIN BOOL TRUE # apply non-linearity correction 1307 BIAS BOOL FALSE # Bias subtraction 1308 DARK BOOL TRUE # Dark subtraction 1309 REMNANCE BOOL FALSE # Remnance masking 1310 SHUTTER BOOL FALSE # Shutter correction 1311 FLAT BOOL TRUE # Flat-field normalisation 1312 MASK BOOL TRUE # Mask bad pixels 1313 MASK.BUILD BOOL TRUE # Build internal mask? 1314 MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails 1315 PATTERN.ROW BOOL FALSE # Row pattern correction 1316 PATTERN.CELL BOOL FALSE # Cell pattern correction 1317 PATTERN.CONTINUITY BOOL FALSE # Cell pattern correction using edge continuity 1318 FRINGE BOOL TRUE # Fringe subtraction 1319 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 1320 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 1321 PHOTOM BOOL TRUE # Source identification and photometry 1322 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 1323 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 1324 BACKGROUND BOOL TRUE # Subtract background? 1325 CROSSTALK.MEASURE BOOL TRUE # Subtract model background? 1326 END 1327 1328 1329 # Standard chip processing without background subtraction, pattern correction, or photometry bug applying auxiliary mask 1330 CHIP_PRESERVE_BG_AUXMASK METADATA 1331 BASE.FITS BOOL FALSE # Save base detrended image? 1332 BASE.MASK.FITS BOOL FALSE # Save base detrended image? 1333 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 1334 CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? 1335 CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? 1336 CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? 1337 OVERSCAN BOOL TRUE # Overscan subtraction 1338 NONLIN BOOL TRUE # apply non-linearity correction 1339 BIAS BOOL FALSE # Bias subtraction 1340 DARK BOOL TRUE # Dark subtraction 1341 NOISEMAP BOOL TRUE 1342 REMNANCE BOOL FALSE # Remnance masking 1343 SHUTTER BOOL FALSE # Shutter correction 1344 FLAT BOOL TRUE # Flat-field normalisation 1345 MASK BOOL TRUE # Mask bad pixels 1346 MASK.BUILD BOOL TRUE # Build internal mask? 1347 MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails 1348 MASK.AUXMASK BOOL TRUE # augment mask with more restrictive auxiliary mask 1349 PATTERN.ROW BOOL FALSE # Row pattern correction 1350 PATTERN.CELL BOOL FALSE # Cell pattern correction 1351 PATTERN.CONTINUITY BOOL FALSE # Cell pattern coorection using edge continuity 1352 FRINGE BOOL TRUE # Fringe subtraction 1353 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 1354 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 1355 PHOTOM BOOL FALSE # Source identification and photometry 1356 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 1357 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 1358 BACKGROUND BOOL FALSE # Subtract background? 1359 CROSSTALK.MEASURE BOOL TRUE # Subtract model background? 1360 NO.COMPRESS BOOL TRUE # turn off image compression 1361 END 1362 1290 1363 1291 1364 # Standard chip processing -
branches/eam_branches/ipp-20130509/ippconfig/gpc1/psastro.config
r35490 r35752 111 111 #PSASTRO.MODEL.BORESITE.X F32 -200.0 112 112 #PSASTRO.MODEL.BORESITE.Y F32 -300.0 113 114 # maximum accepted fwhm_major (moved from camera.config 115 PSASTRO.MAX.ALLOWED.FWHM F32 12 113 116 114 117 # *** make sure the choice of CATDIR (dvo database) contains the photcodes desired below … … 360 363 END 361 364 365 CNP_DATASET METADATA 366 ZERO.POINT.USE.MEAN BOOL TRUE 367 PSASTRO.MAX.ALLOWED.FWHM F32 25 368 END 369 362 370 LAP_ASTRO METADATA 363 371 # PSASTRO.CATDIR STR 3PI.20110505.REFCAT -
branches/eam_branches/ipp-20130509/ippconfig/gpc1/psphot.config
- Property svn:mergeinfo changed
/trunk/ippconfig/gpc1/psphot.config merged: 35688
r35594 r35752 5 5 BACKGROUND.YSAMPLE F32 2.0 # size of background superpixels 6 6 7 SOFTEN.VARIANCE BOOL TRUE # XXX drop? soften the errors for bright pixels8 SOFTEN.VARIANCE.FRACTION F32 0.00 57 SOFTEN.VARIANCE BOOL FALSE # XXX drop? soften the errors for bright pixels 8 SOFTEN.VARIANCE.FRACTION F32 0.000 # CZW 2013-06-20 I've disabled this, as I don't think it's needed. 9 9 10 10 PEAKS_SMOOTH_SIGMA F32 2.5 # smoothing kernel sigma in pixels - Property svn:mergeinfo changed
-
branches/eam_branches/ipp-20130509/ippconfig/megacam/psastro.config
r31674 r35752 50 50 PSASTRO.MAX.ERROR F32 10.0 # max error in pixels 51 51 PSASTRO.MIN.NSTAR S32 10 # min fitted stars in solution 52 53 PSASTRO.MAX.ALLOWED.FWHM F32 25 52 54 53 55 PSASTRO.MOSAIC.MODE BOOL TRUE -
branches/eam_branches/ipp-20130509/ippconfig/recipes/filerules-split.mdc
r35562 r35752 14 14 15 15 PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.MEF 16 PSASTRO.OUTPUT.ORIGINAL STR PSASTRO.OUT.ORIGINAL.CMF.MEF 16 17 # PSASTRO.OUTPUT.SPL STR PSASTRO.OUT.CMF.SPL 17 18 # PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF … … 275 276 PSASTRO.CONFIG OUTPUT {OUTPUT}.psastro.mdc TEXT NONE FPA TRUE NONE 276 277 PSASTRO.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK COMP_MASK CHIP TRUE NONE 278 279 PSASTRO.OUT.ORIGINAL.CMF.MEF OUTPUT {OUTPUT}.smf.original CMF NONE FPA TRUE MEF 277 280 278 281 PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE … … 410 413 PPVIZPATTERN.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE NONE 411 414 412 PPBACKGROUND.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_IMGCHIP TRUE NONE415 PPBACKGROUND.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE 413 416 PPBACKGROUND.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK COMP_MASK CHIP TRUE NONE 414 417 PPBACKGROUND.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits VARIANCE COMP_WT CHIP TRUE NONE -
branches/eam_branches/ipp-20130509/ippconfig/recipes/nightly_science.config
r34800 r35752 281 281 STACKABLE BOOL FALSE 282 282 DIFFABLE BOOL FALSE 283 REDUCTION STR CNP_DATASET 283 284 CHIP S16 800 284 285 WARP S16 800 -
branches/eam_branches/ipp-20130509/ippconfig/recipes/ppImage.config
r35531 r35752 18 18 MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails 19 19 MASK.AUXMASK BOOL FALSE # augment mask with auxillary mask 20 AUX.VIDEO.MASK STR NULL 20 AUX.VIDEO.MASK STR NULL # name of aditional masking for video cells 21 APPLY.BURNTOOL BOOL FALSE # apply burntool coorection 21 22 VARIANCE.BUILD BOOL FALSE # Build internal variance image 22 23 ADDNOISE BOOL FALSE # Add noise to degrade an MD image to a 3pi image? … … 47 48 TILTYSTREAK.BY.CLASS METADATA # apply the 'tiltystreak' tool 48 49 END 50 NO.COMPRESS BOOL FALSE 49 51 50 52 # output data formats to save … … 2139 2141 MASK BOOL TRUE # Mask bad pixels 2140 2142 MASK.BUILD BOOL TRUE # Build internal mask? 2143 PATTERN.ROW BOOL FALSE # Subtract pattern noise 2144 PATTERN.CELL BOOL FALSE # Subtract pattern noise 2145 FRINGE BOOL TRUE # Fringe subtraction 2146 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 2147 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 2148 PHOTOM BOOL TRUE # Source identification and photometry 2149 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 2150 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 2151 BACKGROUND BOOL FALSE # Subtract background? 2152 MASK.STATS BOOL TRUE # Calculate Mask statistics 2153 END 2154 2155 2156 # Standard chip processing with the background able to be readded 2157 CHIP_RESTORE_BG METADATA 2158 BASE.FITS BOOL FALSE # Save base detrended image? 2159 BASE.MASK.FITS BOOL FALSE # Save base detrended image? 2160 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 2161 CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? 2162 CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? 2163 CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? 2164 OVERSCAN BOOL TRUE # Overscan subtraction 2165 NONLIN BOOL FALSE # Overscan subtraction 2166 BIAS BOOL TRUE # Bias subtraction 2167 DARK BOOL TRUE # Dark subtraction 2168 SHUTTER BOOL FALSE # Shutter correction 2169 FLAT BOOL TRUE # Flat-field normalisation 2170 MASK BOOL TRUE # Mask bad pixels 2171 MASK.BUILD BOOL TRUE # Build internal mask? 2172 PATTERN.ROW BOOL FALSE # Subtract pattern noise 2173 PATTERN.CELL BOOL FALSE # Subtract pattern noise 2174 FRINGE BOOL TRUE # Fringe subtraction 2175 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 2176 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 2177 PHOTOM BOOL TRUE # Source identification and photometry 2178 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 2179 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 2180 BACKGROUND BOOL TRUE # Subtract background? 2181 MASK.STATS BOOL TRUE # Calculate Mask statistics 2182 END 2183 2184 # Standard chip processing with auxiliary mask but without any background removal or pattern correction 2185 CHIP_PRESERVE_BG_AUXMASK METADATA 2186 BASE.FITS BOOL FALSE # Save base detrended image? 2187 BASE.MASK.FITS BOOL FALSE # Save base detrended image? 2188 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 2189 CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? 2190 CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? 2191 CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? 2192 OVERSCAN BOOL TRUE # Overscan subtraction 2193 NONLIN BOOL FALSE # Overscan subtraction 2194 BIAS BOOL TRUE # Bias subtraction 2195 DARK BOOL TRUE # Dark subtraction 2196 SHUTTER BOOL FALSE # Shutter correction 2197 FLAT BOOL TRUE # Flat-field normalisation 2198 MASK BOOL TRUE # Mask bad pixels 2199 MASK.BUILD BOOL TRUE # Build internal mask? 2200 MASK.AUXMASK BOOL TRUE # augment mask with more restrictive auxiliary mask 2141 2201 PATTERN.ROW BOOL FALSE # Subtract pattern noise 2142 2202 PATTERN.CELL BOOL FALSE # Subtract pattern noise -
branches/eam_branches/ipp-20130509/ippconfig/recipes/ppSub.config
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/eam_branches/ipp-20130509/ippconfig/recipes/psastro.config
r34966 r35752 179 179 MASKSTAT.ADVISORY U32 0x080 180 180 181 181 # maximum allowed fwhm_major (moved from */camera.config) 182 PSASTRO.MAX.ALLOWED.FWHM F32 0 182 183 183 184 # 2MASS default configuration (use 2MASS_J as ref magnitude) … … 265 266 END 266 267 268 CNP_DATASET METADATA 269 END 270 267 271 SYNTH_CAT METADATA 268 272 END -
branches/eam_branches/ipp-20130509/ippconfig/recipes/psphot.config
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/eam_branches/ipp-20130509/ippconfig/recipes/pswarp.config
r35086 r35752 12 12 PSF BOOL TRUE # Measure PSF for warped image? 13 13 SOURCES BOOL TRUE # Write source list for warped image? 14 15 NO.COMPRESS BOOL FALSE # turn off image compression (if enabled) 14 16 15 17 MASK.STATS BOOL TRUE # calculate mask statistics. … … 27 29 END 28 30 31 WARP_NOCOMPRESS METADATA 32 NO.COMPRESS BOOL TRUE 33 END 34 29 35 #PR recipe for faster processing 30 36 PR METADATA -
branches/eam_branches/ipp-20130509/ippconfig/recipes/reductionClasses.mdc
- Property svn:mergeinfo changed
/trunk/ippconfig/recipes/reductionClasses.mdc merged: 35685
r35594 r35752 1047 1047 END 1048 1048 1049 M31_ DATASET METADATA1049 M31_BG_SUBTRACT METADATA 1050 1050 CHIP_PPIMAGE STR CHIP_AUXMASK 1051 1051 CHIP_PSPHOT STR CHIP 1052 WARP_PSWARP STR WARP 1052 WARP_PSWARP STR WARP_NOCOMPRESS 1053 STACK_PPSTACK STR STACK 1054 STACK_PPSUB STR STACK 1055 STACK_PSPHOT STR STACK 1056 DIFF_PPSUB STR DIFF 1057 DIFF_PSPHOT STR DIFF 1058 JPEG_BIN1 STR PPIMAGE_J1 1059 JPEG_BIN2 STR PPIMAGE_J2 1060 FAKEPHOT STR FAKEPHOT 1061 ADDSTAR STR ADDSTAR 1062 PSASTRO STR DEFAULT_RECIPE 1063 STACKPHOT_PSPHOT STR STACKPHOT 1064 STACKPHOT_PPSUB STR STACKPHOT 1065 STACKPHOT_PPSTACK STR STACKPHOT 1066 STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE 1067 BACKGROUND_PPBACKGROUND STR BACKGROUND 1068 BACKGROUND_PSWARP STR BACKGROUND 1069 PSVIDEOPHOT STR PSVIDEOPHOT 1070 STATICSKY_CALIBRATION STR STATICSKY_CAL 1071 END 1072 1073 M31_BG_PRESERVE METADATA 1074 CHIP_PPIMAGE STR CHIP_PRESERVE_BG_AUXMASK 1075 CHIP_PSPHOT STR CHIP 1076 WARP_PSWARP STR WARP_NOCOMPRESS 1053 1077 STACK_PPSTACK STR STACK 1054 1078 STACK_PPSUB STR STACK - Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
