Skip to content

Commit

Permalink
Change order of pos and neg inputs.
Browse files Browse the repository at this point in the history 
Fix linting.
  • Loading branch information
@morriscb
morriscb committed Mar 11, 2021
1 parent 0ced009 commit 8920ccc
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 33 deletions.
37 changes: 19 additions & 18 deletions python/lsst/pipe/tasks/functors.py
View file
Expand Up @@ -1613,10 +1613,10 @@ class LocalDipoleMeanFlux(LocalPhotometry):
LocalDipoleDiffFluxErr
"""
def __init__(self,
instFluxNegCol,
instFluxPosCol,
instFluxNegErrCol,
instFluxNegCol,
instFluxPosErrCol,
instFluxNegErrCol,
photoCalibCol,
photoCalibErrCol,
**kwargs):
Expand All @@ -1634,13 +1634,13 @@ def __init__(self,

@property
def columns(self):
return [self.instFluxNegCol,
self.instFluxPosCol,
return [self.instFluxPosCol,
self.instFluxNegCol,
self.photoCalibCol]

@property
def name(self):
return f'dipMeanFlux_{self.instFluxNegCol}_{self.instFluxPosCol}'
return f'dipMeanFlux_{self.instFluxPosCol}_{self.instFluxNegCol}'

def _func(self, df):
return 0.5 * (np.fabs(self.instFluxToNanojansky(df[self.instFluxNegCol], df[self.photoCalibCol]))
Expand All @@ -1664,16 +1664,16 @@ class LocalDipoleMeanFluxErr(LocalDipoleMeanFlux):

@property
def columns(self):
return [self.instFluxNegCol,
self.instFluxPosCol,
self.instFluxNegErrCol,
return [self.instFluxPosCol,
self.instFluxNegCol,
self.instFluxPosErrCol,
self.instFluxNegErrCol,
self.photoCalibCol,
self.photoCalibErrCol]

@property
def name(self):
return f'dipMeanFluxErr_{self.instFluxNegCol}_{self.instFluxPosCol}'
return f'dipMeanFluxErr_{self.instFluxPosCol}_{self.instFluxNegCol}'

def _func(self, df):
return 0.5 * np.sqrt(
Expand All @@ -1682,6 +1682,7 @@ def _func(self, df):
+ (df[self.instFluxNegErrCol] ** 2 + df[self.instFluxPosErrCol] ** 2)
* df[self.photoCalibCol] ** 2)


class LocalDipoleDiffFlux(LocalDipoleMeanFlux):
"""Compute the absolute difference of dipole fluxes.
Expand All @@ -1701,13 +1702,13 @@ class LocalDipoleDiffFlux(LocalDipoleMeanFlux):

@property
def columns(self):
return [self.instFluxNegCol,
self.instFluxPosCol,
return [self.instFluxPosCol,
self.instFluxNegCol,
self.photoCalibCol]

@property
def name(self):
return f'dipDiffFlux_{self.instFluxNegCol}_{self.instFluxPosCol}'
return f'dipDiffFlux_{self.instFluxPosCol}_{self.instFluxNegCol}'

def _func(self, df):
return (np.fabs(self.instFluxToNanojansky(df[self.instFluxPosCol], df[self.photoCalibCol]))
Expand All @@ -1731,20 +1732,20 @@ class LocalDipoleDiffFluxErr(LocalDipoleMeanFlux):

@property
def columns(self):
return [self.instFluxNegCol,
self.instFluxPosCol,
self.instFluxNegErrCol,
return [self.instFluxPosCol,
self.instFluxNegCol,
self.instFluxPosErrCol,
self.instFluxNegErrCol,
self.photoCalibCol,
self.photoCalibErrCol]

@property
def name(self):
return f'dipDiffFluxErr_{self.instFluxNegCol}_{self.instFluxPosCol}'
return f'dipDiffFluxErr_{self.instFluxPosCol}_{self.instFluxNegCol}'

def _func(self, df):
return np.sqrt(
((np.fabs(df[self.instFluxPosCol]) - np.fabs(df[self.instFluxNegCol]))
* df[self.photoCalibErrCol]) ** 2
+ (df[self.instFluxPosErrCol] ** 2 + df[self.instFluxNegErrCol] ** 2)
* df[self.photoCalibCol] ** 2)
+ (df[self.instFluxPosErrCol] ** 2 + df[self.instFluxNegErrCol] ** 2)
* df[self.photoCalibCol] ** 2)
28 changes: 13 additions & 15 deletions tests/test_functors.py
View file
Expand Up @@ -542,7 +542,7 @@ def testDipPhotometry(self):
fluxErr = 10
calib = 10
calibErr = 1

# compute expected values.
absMean = 0.5 * (fluxPos - fluxNeg) * calib
absDiff = (fluxNeg + fluxPos) * calib
Expand All @@ -562,8 +562,8 @@ def testDipPhotometry(self):
parq = self.simulateMultiParquet(self.dataDict)
func = LocalDipoleMeanFlux("ip_diffim_DipoleFluxPos_instFlux",
"ip_diffim_DipoleFluxNeg_instFlux",
"ip_diffim_DipoleFluxPeg_instFluxErr",
"ip_diffim_DipoleFluxNos_instFluxErr",
"ip_diffim_DipoleFluxPos_instFluxErr",
"ip_diffim_DipoleFluxNeg_instFluxErr",
"base_LocalPhotoCalib",
"base_LocalPhotoCalibErr")
val = self._funcVal(func, parq)
Expand All @@ -572,10 +572,10 @@ def testDipPhotometry(self):
atol=1e-13,
rtol=0))

func = LocalDipoleMeanFluxErr("ip_diffim_DipoleFluxPeg_instFlux",
"ip_diffim_DipoleFluxNos_instFlux",
"ip_diffim_DipoleFluxPeg_instFluxErr",
"ip_diffim_DipoleFluxNos_instFluxErr",
func = LocalDipoleMeanFluxErr("ip_diffim_DipoleFluxPos_instFlux",
"ip_diffim_DipoleFluxNeg_instFlux",
"ip_diffim_DipoleFluxPos_instFluxErr",
"ip_diffim_DipoleFluxNeg_instFluxErr",
"base_LocalPhotoCalib",
"base_LocalPhotoCalibErr")
val = self._funcVal(func, parq)
Expand All @@ -584,10 +584,10 @@ def testDipPhotometry(self):
atol=1e-13,
rtol=0))

func = LocalDipoleDiffFlux("ip_diffim_DipoleFluxNeg_instFlux",
"ip_diffim_DipoleFluxPos_instFlux",
"ip_diffim_DipoleFluxNeg_instFluxErr",
func = LocalDipoleDiffFlux("ip_diffim_DipoleFluxPos_instFlux",
"ip_diffim_DipoleFluxNeg_instFlux",
"ip_diffim_DipoleFluxPos_instFluxErr",
"ip_diffim_DipoleFluxNeg_instFluxErr",
"base_LocalPhotoCalib",
"base_LocalPhotoCalibErr")
val = self._funcVal(func, parq)
Expand All @@ -596,10 +596,10 @@ def testDipPhotometry(self):
atol=1e-13,
rtol=0))

func = LocalDipoleDiffFluxErr("ip_diffim_DipoleFluxNeg_instFlux",
"ip_diffim_DipoleFluxPos_instFlux",
"ip_diffim_DipoleFluxNeg_instFluxErr",
func = LocalDipoleDiffFluxErr("ip_diffim_DipoleFluxPos_instFlux",
"ip_diffim_DipoleFluxNeg_instFlux",
"ip_diffim_DipoleFluxPos_instFluxErr",
"ip_diffim_DipoleFluxNeg_instFluxErr",
"base_LocalPhotoCalib",
"base_LocalPhotoCalibErr")
val = self._funcVal(func, parq)
Expand All @@ -609,8 +609,6 @@ def testDipPhotometry(self):
atol=1e-13,
rtol=0))



def testConvertPixelToArcseconds(self):
"""Test calculations of the pixel scale and conversions of pixel to
arcseconds.
Expand Down

0 comments on commit 8920ccc

Please sign in to comment.