Skip to content

Commit

Permalink
Merge pull request #13 from lsst/tickets/DM-10737
Browse files Browse the repository at this point in the history
DM-10737: Use new-style reference catalogs by default.
  • Loading branch information
TallJimbo committed Jun 2, 2017
2 parents 3d4e9fa + 3fa819d commit f1d3500
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions python/lsst/meas/mosaic/mosaicTask.py
Expand Up @@ -37,7 +37,7 @@
import lsst.pipe.base as pipeBase

from lsst.log import Log
from lsst.meas.astrom import LoadAstrometryNetObjectsTask, LoadAstrometryNetObjectsConfig
from lsst.meas.algorithms import LoadIndexedReferenceObjectsTask
from lsst.meas.base.forcedPhotCcd import PerTractCcdDataIdContainer
from lsst.pipe.tasks.colorterms import ColortermLibrary
from . import utils as mosaicUtils
Expand Down Expand Up @@ -150,7 +150,7 @@ class MosaicConfig(pexConfig.Config):
default=True)
loadAstrom = pexConfig.ConfigurableField(
doc="Configuration for astrometry reference object loading",
target=LoadAstrometryNetObjectsTask)
target=LoadIndexedReferenceObjectsTask)
doColorTerms = pexConfig.Field(
doc="Apply color terms as part of solution?",
dtype=bool,
Expand All @@ -172,6 +172,7 @@ class MosaicConfig(pexConfig.Config):
dtype=ColortermLibrary)
photoCatName = pexConfig.Field(
doc="Name of photometric reference catalog; used to select a color term dict in colorterm library.",
default="ps1_pv3_3pi_20170110",
dtype=str,
optional=True)
includeSaturated = pexConfig.Field(
Expand Down Expand Up @@ -214,6 +215,10 @@ class MosaicConfig(pexConfig.Config):
optional=True)
allowMixedFilters = pexConfig.Field(dtype=bool, default=False, doc="Allow multiple filters in input?")

def setDefaults(self):
self.loadAstrom.ref_dataset_name = "ps1_pv3_3pi_20170110"


class SourceReader(object):
""" Object to read source catalog.
"""
Expand Down

0 comments on commit f1d3500

Please sign in to comment.