Index: /branches/eam_branches/ipp-20220316/ippScripts/scripts/camera_exp.pl =================================================================== --- /branches/eam_branches/ipp-20220316/ippScripts/scripts/camera_exp.pl (revision 42169) +++ /branches/eam_branches/ipp-20220316/ippScripts/scripts/camera_exp.pl (revision 42170) @@ -133,4 +133,11 @@ } +## option to skip the astrometry analysis (but still do the jpegs) +## if not defined in the config file, default is to not skip +my $skip_astrom = 0; +$skip_astrom = metadataLookupBool($recipeData, 'PSASTRO.SKIP.ASTROMETRY'); +print "skip astrom: $skip_astrom\n"; +if ($skip_astrom) { print "skip the astrom\n"; } + my $cmdflags; @@ -183,12 +190,16 @@ ($expFWHM) = $cmdflags =~ /-fwhm_major (\d+)/; - if ($expFWHM > $maxFWHM) { + if (not defined $expFWHM) { + print "FWHM not measured (no photometry?), Setting quality to 4077\n"; + $cmdflags .= " -quality 4077 "; # This corresponds to PSASTRO_ERR_DATA + $skip_astrom = 1; + } elsif ($expFWHM > $maxFWHM) { print "Setting quality to 4007 due to large FWHM: exposure: $expFWHM maximum: $maxFWHM\n"; $cmdflags .= " -quality 4007 "; # This corresponds to PSASTRO_ERR_DATA - $no_op = 1; - } - } -} - + # $no_op = 1; + $skip_astrom = 1; # skip astrometry, but make the jpegs + } + } +} my $do_masks; # Produce masks? @@ -297,5 +308,5 @@ my $jpeg1 = prepare_output("PPIMAGE.JPEG1", $outroot, undef, 1) if $do_jpegs; my $jpeg2 = prepare_output("PPIMAGE.JPEG2", $outroot, undef, 1) if $do_jpegs; -my $fpaObjects = prepare_output("PSASTRO.OUTPUT", $outroot, undef, 1) if !$bkg_only; +my $fpaObjects = prepare_output("PSASTRO.OUTPUT", $outroot, undef, 1) if (!$bkg_only && !$skip_astrom); my $configuration; @@ -342,5 +353,5 @@ } - if (!$bkg_only) { + if (!$bkg_only && !$skip_astrom) { # run psastro on the chipObjects, producing fpaObjects my $command; Index: /branches/eam_branches/ipp-20220316/ippconfig/gpc2/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20220316/ippconfig/gpc2/ppImage.config (revision 42169) +++ /branches/eam_branches/ipp-20220316/ippconfig/gpc2/ppImage.config (revision 42170) @@ -1827,46 +1827,46 @@ # test recipes # currently : default CHIP recipe -APTEST_V1 METADATA - BASE.FITS BOOL FALSE # Save base detrended image? - BASE.MASK.FITS BOOL FALSE # Save base detrended image? - BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? - CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? - CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? - CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? - OVERSCAN BOOL TRUE # Overscan subtraction - NONLIN BOOL FALSE # apply non-linearity correction - BIAS BOOL FALSE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - REMNANCE BOOL FALSE # Remnance masking - SHUTTER BOOL FALSE # Shutter correction - FLAT BOOL TRUE # Flat-field normalisation - MASK BOOL TRUE # Mask bad pixels - MASK.BUILD BOOL TRUE # Build internal mask? - MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails - PATTERN.ROW BOOL FALSE # Row pattern correction - PATTERN.CELL BOOL FALSE # Cell pattern correction - FRINGE BOOL FALSE # Fringe subtraction - BIN1.FITS BOOL TRUE # Save 1st binned chip image? - BIN2.FITS BOOL TRUE # Save 2nd binned chip image? - PHOTOM BOOL TRUE # Source identification and photometry - ASTROM.CHIP BOOL FALSE # Astrometry per chip? - ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? - BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL FALSE # Subtract model background? - - DETREND.CONSTRAINTS METADATA - DARK METADATA - DETTYPE STR DARK - EXPTIME STR FPA.EXPOSURE - END - FLAT METADATA - DETTYPE STR FLAT_PREMASK - FILTER STR FPA.FILTERID - END - MASK METADATA - DETTYPE STR MASK - END - END -END +# APTEST_V1 METADATA +# BASE.FITS BOOL FALSE # Save base detrended image? +# BASE.MASK.FITS BOOL FALSE # Save base detrended image? +# BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? +# CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? +# CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? +# CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? +# OVERSCAN BOOL TRUE # Overscan subtraction +# NONLIN BOOL FALSE # apply non-linearity correction +# BIAS BOOL FALSE # Bias subtraction +# DARK BOOL TRUE # Dark subtraction +# REMNANCE BOOL FALSE # Remnance masking +# SHUTTER BOOL FALSE # Shutter correction +# FLAT BOOL TRUE # Flat-field normalisation +# MASK BOOL TRUE # Mask bad pixels +# MASK.BUILD BOOL TRUE # Build internal mask? +# MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails +# PATTERN.ROW BOOL FALSE # Row pattern correction +# PATTERN.CELL BOOL FALSE # Cell pattern correction +# FRINGE BOOL FALSE # Fringe subtraction +# BIN1.FITS BOOL TRUE # Save 1st binned chip image? +# BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +# PHOTOM BOOL TRUE # Source identification and photometry +# ASTROM.CHIP BOOL FALSE # Astrometry per chip? +# ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +# BACKGROUND BOOL TRUE # Subtract background? +# CROSSTALK.MEASURE BOOL FALSE # Subtract model background? +# +# DETREND.CONSTRAINTS METADATA +# DARK METADATA +# DETTYPE STR DARK +# EXPTIME STR FPA.EXPOSURE +# END +# FLAT METADATA +# DETTYPE STR FLAT_PREMASK +# FILTER STR FPA.FILTERID +# END +# MASK METADATA +# DETTYPE STR MASK +# END +# END +# END # test recipes Index: /branches/eam_branches/ipp-20220316/ippconfig/recipes/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20220316/ippconfig/recipes/ppImage.config (revision 42169) +++ /branches/eam_branches/ipp-20220316/ippconfig/recipes/ppImage.config (revision 42170) @@ -104,4 +104,6 @@ OVERSCAN.MIN.VALID F32 0.0 # minimum valid overscan value OVERSCAN.MAX.VALID F32 65536.0 # maximum valid overscan value +#OVERSCAN.MIN.VALID F32 100.0 # minimum valid overscan value +#OVERSCAN.MAX.VALID F32 64000.0 # maximum valid overscan value # Pattern Row subtraction options @@ -2579,17 +2581,27 @@ OVERSCAN BOOL TRUE # Overscan subtraction NONLIN BOOL FALSE # Non-linearity correction; not implemented - BIAS BOOL TRUE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - SHUTTER BOOL FALSE # Shutter correction - FLAT BOOL TRUE # Flat-field normalisation - MASK BOOL TRUE # Mask bad pixels - FRINGE BOOL TRUE # Fringe subtraction - BIN1.FITS BOOL TRUE # Save 1st binned chip image? - BIN2.FITS BOOL TRUE # Save 2nd binned chip image? - PHOTOM BOOL TRUE # Source identification and photometry - ASTROM.CHIP BOOL FALSE # Astrometry per chip? - ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? - BACKGROUND BOOL TRUE # Subtract background? - MASK.STATS BOOL TRUE # Calculate Mask statistics. + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + REMNANCE BOOL FALSE # Remnance masking + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails + PATTERN.ROW BOOL FALSE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL FALSE # Subtract background? + MASK.STATS BOOL FALSE # Calculate Mask statistics. + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? + + OVERSCAN.MIN.VALID F32 100.0 # Overscan subtraction + OVERSCAN.MAX.VALID F32 64000.0 # Overscan subtraction +# OVERSCAN.MIN.VALID F32 0.0 # Overscan subtraction END Index: /branches/eam_branches/ipp-20220316/ippconfig/recipes/psastro.config =================================================================== --- /branches/eam_branches/ipp-20220316/ippconfig/recipes/psastro.config (revision 42169) +++ /branches/eam_branches/ipp-20220316/ippconfig/recipes/psastro.config (revision 42170) @@ -4,4 +4,6 @@ PSASTRO.SAVE.REFMATCH BOOL FALSE # save refstar matches as table in output smf file PSASTRO.SAVE.CFF BOOL FALSE # save a cff file (input for psphotFullForce) + +PSASTRO.SKIP.ASTROMETRY BOOL FALSE # select which WCS style to use on output images. @@ -405,2 +407,6 @@ END +APTEST_V1 METADATA + PSASTRO.SKIP.ASTROMETRY BOOL TRUE +END + Index: /branches/eam_branches/ipp-20220316/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /branches/eam_branches/ipp-20220316/ippconfig/recipes/reductionClasses.mdc (revision 42169) +++ /branches/eam_branches/ipp-20220316/ippconfig/recipes/reductionClasses.mdc (revision 42170) @@ -385,5 +385,5 @@ CHIP_PPIMAGE STR APTEST_V1 CHIP_PSPHOT STR APTEST_V1 - PSASTRO STR DEFAULT_RECIPE + PSASTRO STR APTEST_V1 JPEG_BIN1 STR PPIMAGE_J1 JPEG_BIN2 STR PPIMAGE_J2