Skip to content

Commit

Permalink
Fix to work after camGeom changes in DM-5922
Browse files Browse the repository at this point in the history
Remove yamlCamera.py and change import to obs_base.
Change config/processCcd.py so that the refObjLoader
uses the same pixel offset as the matcher.
Also, set execute bit for the run_all script.
  • Loading branch information
mfisherlevine committed Sep 23, 2017
1 parent a2b0895 commit eb5808e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 186 deletions.
7 changes: 5 additions & 2 deletions config/processCcd.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from lsst.meas.algorithms import LoadIndexedReferenceObjectsTask
from lsst.meas.astrom import MatchPessimisticBTask

PIXEL_MARGIN = 2000 # to ensure they're linked, as per DM-11356

config.isr.doFlat=False # TODO: change for release/when we have flats
config.isr.doLinearize=False
config.isr.doDefect=False # TODO: make defect list and enable
Expand All @@ -19,6 +21,7 @@
for refObjLoader in (config.calibrate.astromRefObjLoader,
config.calibrate.photoRefObjLoader,
config.charImage.refObjLoader):
refObjLoader.pixelMargin = PIXEL_MARGIN
refObjLoader.filterMap = {'RONCHI200+z': 'phot_g_mean_mag',
'NONE+SEMROCK': 'phot_g_mean_mag',
'NONE+RONCHI200': 'phot_g_mean_mag',
Expand Down Expand Up @@ -62,8 +65,8 @@
# Carefully tuned for matchPessimisticB; less than 2000 is too little for some visits
# but more than 2000 has so many sources to match against that it runs _very_ slowly
# for current dataset, an offset of 2000pix matches all direct visits
config.calibrate.astrometry.matcher.maxOffsetPix=2000
config.calibrate.photoCal.matcher.maxOffsetPix=2000
config.calibrate.astrometry.matcher.maxOffsetPix=PIXEL_MARGIN
config.calibrate.photoCal.matcher.maxOffsetPix=PIXEL_MARGIN
config.calibrate.astrometry.wcsFitter.order=2 # prevent overfitting as we don't have many stars

# we don't need these, and sometimes the correction can't be measured - this prevents failure
Expand Down
2 changes: 1 addition & 1 deletion policy/camera.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

name : "ctio0m9"
plateScale : 16.0 # plate scale, in arcseconds on sky/mm
radialCoeffs : [0.0, 1.0, 0.0, 1.0] # radial distortion coefficients (c_0 + c_1 r + c_2 r^2 + ...)
radialCoeffs : [0.0, 1.0] # radial distortion coefficients (c_0 + c_1 r + c_2 r^2 + ...)

#
# A single amplifier ("segment" to the camera team)
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/obs/ctio0m9/ctio0m9.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#
import os.path
import lsst.utils as utils
from yamlCamera import YamlCamera
from lsst.obs.base.yamlCamera import YamlCamera

class Ctio0m9(YamlCamera):
"""The Imager on the CTIO 0.9m (ctio0m9)
Expand Down
182 changes: 0 additions & 182 deletions python/lsst/obs/ctio0m9/yamlCamera.py

This file was deleted.

Empty file modified scripts/run_all_pre_march2017.sh
100644 → 100755
Empty file.

0 comments on commit eb5808e

Please sign in to comment.