Skip to content

Commit

Permalink
Merge pull request #27 from lsst/tickets/DM-10242
Browse files Browse the repository at this point in the history
DM-10242: Stop using astrometry_net by default
  • Loading branch information
parejkoj committed Feb 25, 2019
2 parents 4d337fe + 9087bcd commit 805f171
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
4 changes: 3 additions & 1 deletion bin/demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@ set -e
setup --nolocks -v -k -r ./astrometry_net_data astrometry_net_data

rm -rf output detected-sources.txt output_small detected-sources_small.txt
# Reconfigure to use the a.net reference catalog
CONFIG=config/processCcd.py
# The following config overrides are necessary for the demo to run, until new 'truth' values are computed
# based on the new stack default of growing footprints and running the deblender. See issue 4801
processCcd.py input --id run=4192 filter=$FILTER_SET_4192 camcol=4 field=300 --id run=6377 filter=$FILTER_SET_6377 camcol=4 field=399 --output output$SIZE_EXT
processCcd.py input --id run=4192 filter=$FILTER_SET_4192 camcol=4 field=300 --id run=6377 filter=$FILTER_SET_6377 camcol=4 field=399 --output output$SIZE_EXT --configfile=$CONFIG

# We need to explicitly run Python here as the command to allow
# the library load path environment to be passed to export-results
Expand Down
6 changes: 6 additions & 0 deletions config/processCcd.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Configure astrometry.net reference loader, now that it is no longer the default.
# This file can be removed as part of DM-18036.
from lsst.meas.extensions.astrometryNet import LoadAstrometryNetObjectsTask
config.calibrate.astromRefObjLoader.retarget(LoadAstrometryNetObjectsTask)
config.calibrate.photoRefObjLoader.retarget(LoadAstrometryNetObjectsTask)
config.charImage.refObjLoader.retarget(LoadAstrometryNetObjectsTask)
1 change: 1 addition & 0 deletions ups/lsst_dm_stack_demo.table
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ setupRequired(python)
setupRequired(utils)
setupRequired(sconsUtils)
setupRequired(obs_sdss)
setupRequired(meas_extensions_astrometryNet)

envPrepend(PATH, ${PRODUCT_DIR}/bin)

0 comments on commit 805f171

Please sign in to comment.