Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-31722: Use lsst.utils.introspection.get_full_type_name instead #391

Merged
merged 2 commits into from
Oct 8, 2021
Merged

DM-31722: Use lsst.utils.introspection.get_full_type_name instead #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7843b4f
Use lsst.utils.introspection.get_full_type_name instead
timj Oct 5, 2021
df5e91b
cached_getter is now in lsst.utils.classes
timj Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/lsst/obs/base/_fitsRawFormatterBase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import lsst.afw.fits
import lsst.afw.geom
import lsst.afw.image
from lsst.utils.classes import cached_getter
from lsst.daf.butler import FileDescriptor
from lsst.daf.butler.core.utils import cached_getter

from .formatters.fitsExposure import FitsImageFormatterBase, standardizeAmplifierParameters
from .makeRawVisitInfoViaObsInfo import MakeRawVisitInfoViaObsInfo
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/obs/base/formatters/fitsExposure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

from lsst.daf.base import PropertySet
from lsst.daf.butler import Formatter
from lsst.daf.butler.core.utils import cached_getter
from lsst.utils.classes import cached_getter
from lsst.afw.cameraGeom import AmplifierGeometryComparison, AmplifierIsolator
from lsst.afw.image import ExposureFitsReader, ImageFitsReader, MaskFitsReader, MaskedImageFitsReader
from lsst.afw.image import ExposureInfo, FilterLabel
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/obs/base/instrument_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
from lsst.obs.base.yamlCamera import makeCamera
from lsst.daf.butler import Registry
from lsst.daf.butler import RegistryConfig
from lsst.daf.butler.core.utils import getFullTypeName
from lsst.utils.introspection import get_full_type_name
from lsst.daf.butler.formatters.yaml import YamlFormatter

from .utils import createInitialSkyWcsFromBoresight
Expand Down Expand Up @@ -82,7 +82,7 @@ def register(self, registry, update=False):
`Registry`.
"""
detector_max = 2
dataId = {"instrument": self.getName(), "class_name": getFullTypeName(DummyCam),
dataId = {"instrument": self.getName(), "class_name": get_full_type_name(DummyCam),
"detector_max": detector_max}
with registry.transaction():
registry.syncDimensionData("instrument", dataId, update=update)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_ingest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import lsst.daf.butler.tests as butlerTests
from lsst.daf.butler import DatasetType, Butler, DataCoordinate, Config
from lsst.daf.butler.registry import ConflictingDefinitionError
from lsst.daf.butler.core.utils import getFullTypeName
from lsst.utils.introspection import get_full_type_name

from lsst.obs.base.ingest_tests import IngestTestBase
from lsst.obs.base.instrument_tests import DummyCam
Expand All @@ -55,7 +55,7 @@ class RawIngestTestCase(IngestTestBase, unittest.TestCase):
"""Test ingest using JSON sidecar files."""

ingestDatasetTypeName = "raw_dict"
rawIngestTask = getFullTypeName(DummyCamRawIngestTask)
rawIngestTask = get_full_type_name(DummyCamRawIngestTask)
curatedCalibrationDatasetTypes = ()
ingestDir = TESTDIR
instrumentClassName = "lsst.obs.base.instrument_tests.DummyCam"
Expand Down