Changeset 42170
- Timestamp:
- Apr 13, 2022, 12:09:58 PM (4 years ago)
- Location:
- branches/eam_branches/ipp-20220316
- Files:
-
- 5 edited
-
ippScripts/scripts/camera_exp.pl (modified) (4 diffs)
-
ippconfig/gpc2/ppImage.config (modified) (1 diff)
-
ippconfig/recipes/ppImage.config (modified) (2 diffs)
-
ippconfig/recipes/psastro.config (modified) (2 diffs)
-
ippconfig/recipes/reductionClasses.mdc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-20220316/ippScripts/scripts/camera_exp.pl
r41705 r42170 133 133 } 134 134 135 ## option to skip the astrometry analysis (but still do the jpegs) 136 ## if not defined in the config file, default is to not skip 137 my $skip_astrom = 0; 138 $skip_astrom = metadataLookupBool($recipeData, 'PSASTRO.SKIP.ASTROMETRY'); 139 print "skip astrom: $skip_astrom\n"; 140 if ($skip_astrom) { print "skip the astrom\n"; } 141 135 142 my $cmdflags; 136 143 … … 183 190 ($expFWHM) = $cmdflags =~ /-fwhm_major (\d+)/; 184 191 185 if ($expFWHM > $maxFWHM) { 192 if (not defined $expFWHM) { 193 print "FWHM not measured (no photometry?), Setting quality to 4077\n"; 194 $cmdflags .= " -quality 4077 "; # This corresponds to PSASTRO_ERR_DATA 195 $skip_astrom = 1; 196 } elsif ($expFWHM > $maxFWHM) { 186 197 print "Setting quality to 4007 due to large FWHM: exposure: $expFWHM maximum: $maxFWHM\n"; 187 198 $cmdflags .= " -quality 4007 "; # This corresponds to PSASTRO_ERR_DATA 188 $no_op = 1;189 }190 }191 }192 199 # $no_op = 1; 200 $skip_astrom = 1; # skip astrometry, but make the jpegs 201 } 202 } 203 } 193 204 194 205 my $do_masks; # Produce masks? … … 297 308 my $jpeg1 = prepare_output("PPIMAGE.JPEG1", $outroot, undef, 1) if $do_jpegs; 298 309 my $jpeg2 = prepare_output("PPIMAGE.JPEG2", $outroot, undef, 1) if $do_jpegs; 299 my $fpaObjects = prepare_output("PSASTRO.OUTPUT", $outroot, undef, 1) if !$bkg_only;310 my $fpaObjects = prepare_output("PSASTRO.OUTPUT", $outroot, undef, 1) if (!$bkg_only && !$skip_astrom); 300 311 301 312 my $configuration; … … 342 353 } 343 354 344 if (!$bkg_only ) {355 if (!$bkg_only && !$skip_astrom) { 345 356 # run psastro on the chipObjects, producing fpaObjects 346 357 my $command; -
branches/eam_branches/ipp-20220316/ippconfig/gpc2/ppImage.config
r42169 r42170 1827 1827 # test recipes 1828 1828 # currently : default CHIP recipe 1829 APTEST_V1 METADATA1830 BASE.FITS BOOL FALSE # Save base detrended image?1831 BASE.MASK.FITS BOOL FALSE # Save base detrended image?1832 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image?1833 CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image?1834 CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image?1835 CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image?1836 OVERSCAN BOOL TRUE # Overscan subtraction1837 NONLIN BOOL FALSE # apply non-linearity correction1838 BIAS BOOL FALSE # Bias subtraction1839 DARK BOOL TRUE # Dark subtraction1840 REMNANCE BOOL FALSE # Remnance masking1841 SHUTTER BOOL FALSE # Shutter correction1842 FLAT BOOL TRUE # Flat-field normalisation1843 MASK BOOL TRUE # Mask bad pixels1844 MASK.BUILD BOOL TRUE # Build internal mask?1845 MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails1846 PATTERN.ROW BOOL FALSE # Row pattern correction1847 PATTERN.CELL BOOL FALSE # Cell pattern correction1848 FRINGE BOOL FALSE # Fringe subtraction1849 BIN1.FITS BOOL TRUE # Save 1st binned chip image?1850 BIN2.FITS BOOL TRUE # Save 2nd binned chip image?1851 PHOTOM BOOL TRUE # Source identification and photometry1852 ASTROM.CHIP BOOL FALSE # Astrometry per chip?1853 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic?1854 BACKGROUND BOOL TRUE # Subtract background?1855 CROSSTALK.MEASURE BOOL FALSE # Subtract model background?1856 1857 DETREND.CONSTRAINTS METADATA1858 DARK METADATA1859 DETTYPE STR DARK1860 EXPTIME STR FPA.EXPOSURE1861 END1862 FLAT METADATA1863 DETTYPE STR FLAT_PREMASK1864 FILTER STR FPA.FILTERID1865 END1866 MASK METADATA1867 DETTYPE STR MASK1868 END1869 END1870 END1829 # APTEST_V1 METADATA 1830 # BASE.FITS BOOL FALSE # Save base detrended image? 1831 # BASE.MASK.FITS BOOL FALSE # Save base detrended image? 1832 # BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 1833 # CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? 1834 # CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? 1835 # CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? 1836 # OVERSCAN BOOL TRUE # Overscan subtraction 1837 # NONLIN BOOL FALSE # apply non-linearity correction 1838 # BIAS BOOL FALSE # Bias subtraction 1839 # DARK BOOL TRUE # Dark subtraction 1840 # REMNANCE BOOL FALSE # Remnance masking 1841 # SHUTTER BOOL FALSE # Shutter correction 1842 # FLAT BOOL TRUE # Flat-field normalisation 1843 # MASK BOOL TRUE # Mask bad pixels 1844 # MASK.BUILD BOOL TRUE # Build internal mask? 1845 # MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails 1846 # PATTERN.ROW BOOL FALSE # Row pattern correction 1847 # PATTERN.CELL BOOL FALSE # Cell pattern correction 1848 # FRINGE BOOL FALSE # Fringe subtraction 1849 # BIN1.FITS BOOL TRUE # Save 1st binned chip image? 1850 # BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 1851 # PHOTOM BOOL TRUE # Source identification and photometry 1852 # ASTROM.CHIP BOOL FALSE # Astrometry per chip? 1853 # ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 1854 # BACKGROUND BOOL TRUE # Subtract background? 1855 # CROSSTALK.MEASURE BOOL FALSE # Subtract model background? 1856 # 1857 # DETREND.CONSTRAINTS METADATA 1858 # DARK METADATA 1859 # DETTYPE STR DARK 1860 # EXPTIME STR FPA.EXPOSURE 1861 # END 1862 # FLAT METADATA 1863 # DETTYPE STR FLAT_PREMASK 1864 # FILTER STR FPA.FILTERID 1865 # END 1866 # MASK METADATA 1867 # DETTYPE STR MASK 1868 # END 1869 # END 1870 # END 1871 1871 1872 1872 # test recipes -
branches/eam_branches/ipp-20220316/ippconfig/recipes/ppImage.config
r42169 r42170 104 104 OVERSCAN.MIN.VALID F32 0.0 # minimum valid overscan value 105 105 OVERSCAN.MAX.VALID F32 65536.0 # maximum valid overscan value 106 #OVERSCAN.MIN.VALID F32 100.0 # minimum valid overscan value 107 #OVERSCAN.MAX.VALID F32 64000.0 # maximum valid overscan value 106 108 107 109 # Pattern Row subtraction options … … 2579 2581 OVERSCAN BOOL TRUE # Overscan subtraction 2580 2582 NONLIN BOOL FALSE # Non-linearity correction; not implemented 2581 BIAS BOOL TRUE # Bias subtraction 2582 DARK BOOL TRUE # Dark subtraction 2583 SHUTTER BOOL FALSE # Shutter correction 2584 FLAT BOOL TRUE # Flat-field normalisation 2585 MASK BOOL TRUE # Mask bad pixels 2586 FRINGE BOOL TRUE # Fringe subtraction 2587 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 2588 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 2589 PHOTOM BOOL TRUE # Source identification and photometry 2590 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 2591 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 2592 BACKGROUND BOOL TRUE # Subtract background? 2593 MASK.STATS BOOL TRUE # Calculate Mask statistics. 2583 BIAS BOOL FALSE # Bias subtraction 2584 DARK BOOL FALSE # Dark subtraction 2585 REMNANCE BOOL FALSE # Remnance masking 2586 SHUTTER BOOL FALSE # Shutter correction 2587 FLAT BOOL FALSE # Flat-field normalisation 2588 MASK BOOL FALSE # Mask bad pixels 2589 MASK.BUILD BOOL TRUE # Build internal mask? 2590 MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails 2591 PATTERN.ROW BOOL FALSE # Row pattern correction 2592 PATTERN.CELL BOOL FALSE # Cell pattern correction 2593 FRINGE BOOL FALSE # Fringe subtraction 2594 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 2595 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 2596 PHOTOM BOOL FALSE # Source identification and photometry 2597 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 2598 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 2599 BACKGROUND BOOL FALSE # Subtract background? 2600 MASK.STATS BOOL FALSE # Calculate Mask statistics. 2601 CROSSTALK.MEASURE BOOL FALSE # Subtract model background? 2602 2603 OVERSCAN.MIN.VALID F32 100.0 # Overscan subtraction 2604 OVERSCAN.MAX.VALID F32 64000.0 # Overscan subtraction 2605 # OVERSCAN.MIN.VALID F32 0.0 # Overscan subtraction 2594 2606 END 2595 2607 -
branches/eam_branches/ipp-20220316/ippconfig/recipes/psastro.config
r42109 r42170 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. … … 405 407 END 406 408 409 APTEST_V1 METADATA 410 PSASTRO.SKIP.ASTROMETRY BOOL TRUE 411 END 412 -
branches/eam_branches/ipp-20220316/ippconfig/recipes/reductionClasses.mdc
r42109 r42170 385 385 CHIP_PPIMAGE STR APTEST_V1 386 386 CHIP_PSPHOT STR APTEST_V1 387 PSASTRO STR DEFAULT_RECIPE387 PSASTRO STR APTEST_V1 388 388 JPEG_BIN1 STR PPIMAGE_J1 389 389 JPEG_BIN2 STR PPIMAGE_J2
Note:
See TracChangeset
for help on using the changeset viewer.
