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-38210: Use butler.get() rather than deprecated getDirect() #99

Merged
merged 1 commit into from
Apr 3, 2023
Merged

DM-38210: Use butler.get() rather than deprecated getDirect() #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions tests/fgcmcalTestBase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ def _testFgcmOutputProducts(self, instName, testName,
# The raw zeropoint needs to be modified to know about the wcs jacobian
refs = butler.registry.queryDatasets('camera', dimensions=['instrument'],
collections=...)
camera = butler.getDirect(list(refs)[0])
camera = butler.get(list(refs)[0])
approxPixelAreaFields = fgcmcal.utilities.computeApproxPixelAreaFields(camera)
center = approxPixelAreaFields[testCcd].getBBox().getCenter()
pixAreaCorr = approxPixelAreaFields[testCcd].evaluate(center)
Expand Down Expand Up @@ -724,7 +724,7 @@ def _getMatchedVisitCat(self, butler, srcHandles, photoCals,

matchDelta = None
for srcHandle, photoCal in zip(srcHandles, photoCals):
src = butler.getDirect(srcHandle)
src = butler.get(srcHandle)
src = photoCal.calibrateCatalog(src)

gdSrc, = np.where(np.nan_to_num(src['slot_CalibFlux_flux']) > 0.0)
Expand Down Expand Up @@ -801,7 +801,7 @@ def _testFgcmCalibrateTract(self, instName, testName, visits, tract, skymapName,
collections=outputCollection,
where=whereClause)

repeatabilityCat = butler.getDirect(list(repRefs)[0])
repeatabilityCat = butler.get(list(repRefs)[0])
repeatability = repeatabilityCat['rawRepeatability'][:]
self.assertFloatsAlmostEqual(repeatability, rawRepeatability, atol=4e-6)

Expand All @@ -817,7 +817,7 @@ def _testFgcmCalibrateTract(self, instName, testName, visits, tract, skymapName,

count = 0
for ref in set(refs):
expCat = butler.getDirect(ref)
expCat = butler.get(ref)
test, = np.where((expCat['visit'] > 0) & (expCat['id'] >= 0))
count += test.size

Expand Down
4 changes: 2 additions & 2 deletions tests/test_loadref_hsc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def test_fgcmLoadReference(self):
'refcats/gen2'])
refs = set(butler.registry.queryDatasets(refCatName))
dataIds = [butler.registry.expandDataId(ref.dataId) for ref in refs]
refCats = [butler.getDirectDeferred(ref) for ref in refs]
refCats = [butler.getDeferred(ref) for ref in refs]

refConfig = LoadReferenceObjectsConfig()
refConfig.filterMap = config.filterMap
Expand Down Expand Up @@ -170,7 +170,7 @@ def test_fgcmLoadReferenceOtherFilters(self):
'refcats/gen2'])
refs = set(butler.registry.queryDatasets(refCatName))
dataIds = [butler.registry.expandDataId(ref.dataId) for ref in refs]
refCats = [butler.getDirectDeferred(ref) for ref in refs]
refCats = [butler.getDeferred(ref) for ref in refs]

refConfig = LoadReferenceObjectsConfig()
refConfig.filterMap = config.filterMap
Expand Down