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.

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

DM-39914: Remove deprecated functor/parquetTable interfaces. #882

Merged
merged 2 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 8 additions & 31 deletions python/lsst/pipe/tasks/functors.py
Original file line number Diff line number Diff line change
Expand Up @@ -817,20 +817,10 @@ class Mag(Functor):
"""
_defaultDataset = 'meas'

def __init__(self, col, calib=None, **kwargs):
def __init__(self, col, **kwargs):
self.col = fluxName(col)
self.calib = calib
if calib is not None:
# TO DO: DM-39914 Remove deprecated calib argument in Mag functor.
warnings.warn(
"The 'calib' argument is deprecated, and will be removed after v26.",
FutureWarning,
stacklevel=2,
)
self.fluxMag0 = calib.getFluxMag0()[0]
else:
# TO DO: DM-21955 Replace hard coded photometic calibration values.
self.fluxMag0 = 63095734448.0194
# TO DO: DM-21955 Replace hard coded photometic calibration values.
self.fluxMag0 = 63095734448.0194

super().__init__(**kwargs)

Expand Down Expand Up @@ -860,17 +850,8 @@ class MagErr(Mag):

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
if self.calib is not None:
# TO DO: DM-39914 Remove deprecated calib argument in Mag functor.
self.fluxMag0Err = self.calib.getFluxMag0()[1]
warnings.warn(
"The 'calib' argument is deprecated, and will be removed after v26.",
FutureWarning,
stacklevel=2,
)
else:
# TO DO: DM-21955 Replace hard coded photometic calibration values.
self.fluxMag0Err = 0.
# TO DO: DM-21955 Replace hard coded photometic calibration values.
self.fluxMag0Err = 0.

@property
def columns(self):
Expand Down Expand Up @@ -1472,17 +1453,13 @@ class Photometry(Functor):
# TO DO: DM-21955 Replace hard coded photometic calibration values.
COADD_ZP = 27

def __init__(self, colFlux, colFluxErr=None, calib=None, **kwargs):
def __init__(self, colFlux, colFluxErr=None, **kwargs):
self.vhypot = np.vectorize(self.hypot)
self.col = colFlux
self.colFluxErr = colFluxErr

self.calib = calib
if calib is not None:
self.fluxMag0, self.fluxMag0Err = calib.getFluxMag0()
else:
self.fluxMag0 = 1./np.power(10, -0.4*self.COADD_ZP)
self.fluxMag0Err = 0.
self.fluxMag0 = 1./np.power(10, -0.4*self.COADD_ZP)
self.fluxMag0Err = 0.

super().__init__(**kwargs)

Expand Down
333 changes: 0 additions & 333 deletions python/lsst/pipe/tasks/parquetTable.py

This file was deleted.

Loading
Loading