From 687798f8f0e6fe47c0f336674ef25442d3ef92c9 Mon Sep 17 00:00:00 2001 From: Brianna Smart Date: Fri, 10 Oct 2025 14:07:18 -0700 Subject: [PATCH 1/3] Add ConvertDetectorAngleErrToPositionAngleErr Functor Test position angle error prop Fix Fix functor Test new functor Without debuging Logging for testing --- python/lsst/pipe/tasks/functors.py | 96 ++++++++++++++++++++++++++++++ tests/test_functors.py | 66 +++++++++++++++++++- 2 files changed, 161 insertions(+), 1 deletion(-) diff --git a/python/lsst/pipe/tasks/functors.py b/python/lsst/pipe/tasks/functors.py index d1c1cfd69..1c25cb104 100644 --- a/python/lsst/pipe/tasks/functors.py +++ b/python/lsst/pipe/tasks/functors.py @@ -1394,6 +1394,55 @@ def getPositionAngleFromDetectorAngle(self, theta, cd11, cd12, cd21, cd22): # Position angle of vector from (RA1, Dec1) to (RA2, Dec2) return np.rad2deg(self.computePositionAngle(ra1, dec1, ra2, dec2)) + def getPositionAngleErrFromDetectorAngleErr(self, theta, theta_err, cd11, cd12, cd21, cd22): + """Compute position angle error (E of N) from detector angle error. + + Parameters + ---------- + theta : `float` + detector angle [radian] + theta_err : `float` + detector angle err [radian] + cd11 : `float` + [1, 1] element of the local Wcs affine transform. + cd12 : `float` + [1, 2] element of the local Wcs affine transform. + cd21 : `float` + [2, 1] element of the local Wcs affine transform. + cd22 : `float` + [2, 2] element of the local Wcs affine transform. + Returns + ------- + Position Angle Error: `~pandas.Series` + Position angle error in degrees + """ + # Need to compute abs(dPA/dtheta)*theta_Err to get propogated errors + + # Get unit direction + dx = np.cos(theta) + dy = np.sin(theta) + + # Transform it using WCS? + u = dx * cd11 + dy * cd12 + v = dx * cd21 + dy * cd22 + # Now we are computing the tangent + ratio = u / v + + # Get derivative of theta + du_dtheta = -np.sin(theta) * cd11 + np.cos(theta) * cd12 + dv_dtheta = -np.sin(theta) * cd21 + np.cos(theta) * cd22 + + # Get derivative of tangent + d_ratio_dtheta = (v * du_dtheta - u * dv_dtheta) / v ** 2 + dPA_dtheta = (1 / (1 + ratio ** 2)) * d_ratio_dtheta + + pa_err = np.rad2deg(np.abs(dPA_dtheta) * theta_err) + + logging.info("PA Error: %s" % pa_err) + logging.info("theta_err: %s" % theta_err) + + return pa_err + class ComputePixelScale(LocalWcs): """Compute the local pixel scale from the stored CDMatrix. @@ -1554,6 +1603,53 @@ def _func(self, df): ) +class ConvertDetectorAngleErrToPositionAngleErr(LocalWcs): + """Compute a position angle error from a detector angle error and the + stored CDMatrix. + + Returns + ------- + position angle error : degrees + """ + + name = "PositionAngleErr" + + def __init__( + self, + theta_col, + theta_err_col, + colCD_1_1, + colCD_1_2, + colCD_2_1, + colCD_2_2, + **kwargs + ): + self.theta_col = theta_col + self.theta_err_col = theta_err_col + super().__init__(colCD_1_1, colCD_1_2, colCD_2_1, colCD_2_2, **kwargs) + + @property + def columns(self): + return [ + self.theta_col, + self.theta_err_col, + self.colCD_1_1, + self.colCD_1_2, + self.colCD_2_1, + self.colCD_2_2 + ] + + def _func(self, df): + return self.getPositionAngleErrFromDetectorAngleErr( + df[self.theta_col], + df[self.theta_err_col], + df[self.colCD_1_1], + df[self.colCD_1_2], + df[self.colCD_2_1], + df[self.colCD_2_2] + ) + + class ReferenceBand(Functor): """Return the band used to seed multiband forced photometry. diff --git a/tests/test_functors.py b/tests/test_functors.py index a99907954..b847f0c19 100644 --- a/tests/test_functors.py +++ b/tests/test_functors.py @@ -54,7 +54,7 @@ CorrelationIuuSky, CorrelationIvvSky, CorrelationIuvSky, SemimajorAxisFromCorrelation, SemiminorAxisFromCorrelation, PositionAngleFromCorrelation - ) + PositionAngleFromMoments, ConvertDetectorAngleErrToPositionAngleErr) ROOT = os.path.abspath(os.path.dirname(__file__)) @@ -763,6 +763,70 @@ def testConvertDetectorAngleToPositionAngle(self): np.testing.assert_allclose(coord_diff, 0, rtol=0, atol=5e-6) + # Test position angle error propogation + def testConvertDetectorAngleErrToPositionAngleErr(self): + """Test conversion of position angle err in detector degrees to + position angle erron sky + """ + dipoleSep = 10 + ixx = 10 + testPixelDeltas = np.random.uniform(-100, 100, size=(self.nRecords, 2)) + # testConvertPixelToArcSecond uses a meas_base LocalWcsPlugin + # but we're using a simple WCS as our example, so this doesn't really matter + # and we'll just use the WCS directly + for dec in np.linspace(-90, 90, 10): + for theta in (-45, 0, 90): + for x, y in zip(np.random.uniform(2 * 1109.99981456774, size=10), + np.random.uniform(2 * 560.018167811613, size=10)): + wcs = self._makeWcs(dec=dec, theta=theta) + cd_matrix = wcs.getCdMatrix() + + self.dataDict["dipoleSep"] = np.full(self.nRecords, dipoleSep) + self.dataDict["ixx"] = np.full(self.nRecords, ixx) + self.dataDict["slot_Centroid_x"] = np.full(self.nRecords, x) + self.dataDict["slot_Centroid_y"] = np.full(self.nRecords, y) + self.dataDict["someCentroid_x"] = x + testPixelDeltas[:, 0] + self.dataDict["someCentroid_y"] = y + testPixelDeltas[:, 1] + self.dataDict["orientation"] = np.arctan2( + self.dataDict["someCentroid_y"] - self.dataDict["slot_Centroid_y"], + self.dataDict["someCentroid_x"] - self.dataDict["slot_Centroid_x"], + ) + self.dataDict["orientation_err"] = np.arctan2( + self.dataDict["someCentroid_y"] - self.dataDict[ "slot_Centroid_y"], + self.dataDict["someCentroid_x"] - self.dataDict["slot_Centroid_x"], + )*.001 + + self.dataDict["base_LocalWcs_CDMatrix_1_1"] = np.full(self.nRecords, + cd_matrix[0, 0]) + self.dataDict["base_LocalWcs_CDMatrix_1_2"] = np.full(self.nRecords, + cd_matrix[0, 1]) + self.dataDict["base_LocalWcs_CDMatrix_2_1"] = np.full(self.nRecords, + cd_matrix[1, 0]) + self.dataDict["base_LocalWcs_CDMatrix_2_2"] = np.full(self.nRecords, + cd_matrix[1, 1]) + df = self.getMultiIndexDataFrame(self.dataDict) + + # Test detector angle to position angle conversion + func = ConvertDetectorAngleErrToPositionAngleErr( + "orientation", + "orientation_err", + "base_LocalWcs_CDMatrix_1_1", + "base_LocalWcs_CDMatrix_1_2", + "base_LocalWcs_CDMatrix_2_1", + "base_LocalWcs_CDMatrix_2_2" + ) + + func_pa = ConvertDetectorAngleToPositionAngle( + "orientation", + "base_LocalWcs_CDMatrix_1_1", + "base_LocalWcs_CDMatrix_1_2", + "base_LocalWcs_CDMatrix_2_1", + "base_LocalWcs_CDMatrix_2_2" + ) + val = self._funcVal(func, df) + val_pa = self._funcVal(func_pa, df) + + def testConvertPixelToArcseconds(self): """Test calculations of the pixel scale, conversions of pixel to arcseconds. From dfbd201acd9f3e0d281125c1d96ca44b39c89fe8 Mon Sep 17 00:00:00 2001 From: Brianna Smart Date: Wed, 4 Feb 2026 09:27:13 -0800 Subject: [PATCH 2/3] Test Fix Test Fixes --- python/lsst/pipe/tasks/functors.py | 47 ++++---- tests/test_functors.py | 174 ++++++++++++++++++----------- 2 files changed, 134 insertions(+), 87 deletions(-) diff --git a/python/lsst/pipe/tasks/functors.py b/python/lsst/pipe/tasks/functors.py index 1c25cb104..f411f546a 100644 --- a/python/lsst/pipe/tasks/functors.py +++ b/python/lsst/pipe/tasks/functors.py @@ -28,6 +28,7 @@ "ComputePixelScale", "ConvertPixelToArcseconds", "ConvertPixelSqToArcsecondsSq", "ConvertDetectorAngleToPositionAngle", + "ConvertDetectorAngleErrToPositionAngleErr," "ReferenceBand", "Photometry", "NanoJansky", "NanoJanskyErr", "LocalPhotometry", "LocalNanojansky", "LocalNanojanskyErr", "LocalDipoleMeanFlux", @@ -1394,7 +1395,8 @@ def getPositionAngleFromDetectorAngle(self, theta, cd11, cd12, cd21, cd22): # Position angle of vector from (RA1, Dec1) to (RA2, Dec2) return np.rad2deg(self.computePositionAngle(ra1, dec1, ra2, dec2)) - def getPositionAngleErrFromDetectorAngleErr(self, theta, theta_err, cd11, cd12, cd21, cd22): + def getPositionAngleErrFromDetectorAngleErr(self, theta, theta_err, cd11, + cd12, cd21, cd22): """Compute position angle error (E of N) from detector angle error. Parameters @@ -1417,24 +1419,36 @@ def getPositionAngleErrFromDetectorAngleErr(self, theta, theta_err, cd11, cd12, Position angle error in degrees """ # Need to compute abs(dPA/dtheta)*theta_Err to get propogated errors - - # Get unit direction + # Unit vector in (x, y) along da dx = np.cos(theta) dy = np.sin(theta) - - # Transform it using WCS? u = dx * cd11 + dy * cd12 v = dx * cd21 + dy * cd22 - # Now we are computing the tangent - ratio = u / v - # Get derivative of theta + # Derivative of position angle wrt detector angle du_dtheta = -np.sin(theta) * cd11 + np.cos(theta) * cd12 dv_dtheta = -np.sin(theta) * cd21 + np.cos(theta) * cd22 - # Get derivative of tangent - d_ratio_dtheta = (v * du_dtheta - u * dv_dtheta) / v ** 2 - dPA_dtheta = (1 / (1 + ratio ** 2)) * d_ratio_dtheta + # Precomputing sin/cos values + sin_u = np.sin(u) + cos_u = np.cos(u) + sin_v = np.sin(v) + cos_v = np.cos(v) + + # PA is atan2(Y, X), for great circle + pa_y = sin_u * cos_v + pa_x = sin_v + + # We need dPA/dtheta for error propogation. + # X' = cos(v) * v' + dX_dtheta = cos_v * dv_dtheta + # Y' = (cos(u)*cos(v))*u' + (sin(u)*(-sin(v)))*v' + dY_dtheta = (cos_u * cos_v) * du_dtheta - (sin_u * sin_v) * dv_dtheta + + denom = pa_x * pa_x + pa_y * pa_y + + dPA_dtheta = (pa_x * dY_dtheta - pa_y * dX_dtheta) / denom + dPA_dtheta = np.where(denom == 0, np.nan, dPA_dtheta) pa_err = np.rad2deg(np.abs(dPA_dtheta) * theta_err) @@ -1443,7 +1457,6 @@ def getPositionAngleErrFromDetectorAngleErr(self, theta, theta_err, cd11, cd12, return pa_err - class ComputePixelScale(LocalWcs): """Compute the local pixel scale from the stored CDMatrix. """ @@ -2088,14 +2101,7 @@ def _func(self, df): class MomentsBase(Functor): - """Base class for functors that use shape moments and localWCS - - Attributes - ---------- - is_covariance : bool - Whether the shape columns are terms of a covariance matrix. If False, - they will be assumed to be terms of a correlation matrix instead. - """ + """Base class for functors that use shape moments and localWCS""" is_covariance: bool = True @@ -2211,7 +2217,6 @@ def sky_uv(self, df): CD_2_2 = df[self.colCD_2_2] return ((CD_1_1 * i_xx + CD_1_2 * i_xy) * CD_2_1 + (CD_1_1 * i_xy + CD_1_2 * i_yy) * CD_2_2) - def get_g1(self, df): """ Calculate shear-type ellipticity parameter G1. diff --git a/tests/test_functors.py b/tests/test_functors.py index b847f0c19..ab1b275cb 100644 --- a/tests/test_functors.py +++ b/tests/test_functors.py @@ -53,8 +53,9 @@ MomentsG1Sky, MomentsG2Sky, MomentsTraceSky, CorrelationIuuSky, CorrelationIvvSky, CorrelationIuvSky, SemimajorAxisFromCorrelation, SemiminorAxisFromCorrelation, - PositionAngleFromCorrelation - PositionAngleFromMoments, ConvertDetectorAngleErrToPositionAngleErr) + PositionAngleFromCorrelation, + PositionAngleFromMoments, + ConvertDetectorAngleErrToPositionAngleErr) ROOT = os.path.abspath(os.path.dirname(__file__)) @@ -763,70 +764,6 @@ def testConvertDetectorAngleToPositionAngle(self): np.testing.assert_allclose(coord_diff, 0, rtol=0, atol=5e-6) - # Test position angle error propogation - def testConvertDetectorAngleErrToPositionAngleErr(self): - """Test conversion of position angle err in detector degrees to - position angle erron sky - """ - dipoleSep = 10 - ixx = 10 - testPixelDeltas = np.random.uniform(-100, 100, size=(self.nRecords, 2)) - # testConvertPixelToArcSecond uses a meas_base LocalWcsPlugin - # but we're using a simple WCS as our example, so this doesn't really matter - # and we'll just use the WCS directly - for dec in np.linspace(-90, 90, 10): - for theta in (-45, 0, 90): - for x, y in zip(np.random.uniform(2 * 1109.99981456774, size=10), - np.random.uniform(2 * 560.018167811613, size=10)): - wcs = self._makeWcs(dec=dec, theta=theta) - cd_matrix = wcs.getCdMatrix() - - self.dataDict["dipoleSep"] = np.full(self.nRecords, dipoleSep) - self.dataDict["ixx"] = np.full(self.nRecords, ixx) - self.dataDict["slot_Centroid_x"] = np.full(self.nRecords, x) - self.dataDict["slot_Centroid_y"] = np.full(self.nRecords, y) - self.dataDict["someCentroid_x"] = x + testPixelDeltas[:, 0] - self.dataDict["someCentroid_y"] = y + testPixelDeltas[:, 1] - self.dataDict["orientation"] = np.arctan2( - self.dataDict["someCentroid_y"] - self.dataDict["slot_Centroid_y"], - self.dataDict["someCentroid_x"] - self.dataDict["slot_Centroid_x"], - ) - self.dataDict["orientation_err"] = np.arctan2( - self.dataDict["someCentroid_y"] - self.dataDict[ "slot_Centroid_y"], - self.dataDict["someCentroid_x"] - self.dataDict["slot_Centroid_x"], - )*.001 - - self.dataDict["base_LocalWcs_CDMatrix_1_1"] = np.full(self.nRecords, - cd_matrix[0, 0]) - self.dataDict["base_LocalWcs_CDMatrix_1_2"] = np.full(self.nRecords, - cd_matrix[0, 1]) - self.dataDict["base_LocalWcs_CDMatrix_2_1"] = np.full(self.nRecords, - cd_matrix[1, 0]) - self.dataDict["base_LocalWcs_CDMatrix_2_2"] = np.full(self.nRecords, - cd_matrix[1, 1]) - df = self.getMultiIndexDataFrame(self.dataDict) - - # Test detector angle to position angle conversion - func = ConvertDetectorAngleErrToPositionAngleErr( - "orientation", - "orientation_err", - "base_LocalWcs_CDMatrix_1_1", - "base_LocalWcs_CDMatrix_1_2", - "base_LocalWcs_CDMatrix_2_1", - "base_LocalWcs_CDMatrix_2_2" - ) - - func_pa = ConvertDetectorAngleToPositionAngle( - "orientation", - "base_LocalWcs_CDMatrix_1_1", - "base_LocalWcs_CDMatrix_1_2", - "base_LocalWcs_CDMatrix_2_1", - "base_LocalWcs_CDMatrix_2_2" - ) - val = self._funcVal(func, df) - val_pa = self._funcVal(func_pa, df) - - def testConvertPixelToArcseconds(self): """Test calculations of the pixel scale, conversions of pixel to arcseconds. @@ -924,6 +861,111 @@ def testConvertPixelToArcseconds(self): atol=1e-16, rtol=1e-16)) + def testConvertDetectorAngleErrToPositionAngleErr(self): + """Test conversion of position angle err in detector degrees to + position angle err on sky. + + Requires a similar setup to testConvertDetectorAngleToPositionAngle. + """ + import pydevd_pycharm + pydevd_pycharm.settrace('localhost', port=8888, stdout_to_server=True, + stderr_to_server=True) + dipoleSep = 10 + ixx = 10 + testPixelDeltas = np.random.uniform(-100, 100, size=(self.nRecords, 2)) + + for dec in np.linspace(-80, 80, 10): + for theta in (-35, 0, 90): + for x, y in zip( + np.random.uniform(2 * 1109.99981456774, size=10), + np.random.uniform(2 * 560.018167811613, size=10)): + wcs = self._makeWcs(dec=dec, theta=theta) + cd_matrix = wcs.getCdMatrix() + + self.dataDict["dipoleSep"] = np.full(self.nRecords, + dipoleSep) + self.dataDict["ixx"] = np.full(self.nRecords, ixx) + self.dataDict["slot_Centroid_x"] = np.full(self.nRecords, + x) + self.dataDict["slot_Centroid_y"] = np.full(self.nRecords, + y) + self.dataDict["someCentroid_x"] = x + testPixelDeltas[:, 0] + self.dataDict["someCentroid_y"] = y + testPixelDeltas[:, 1] + self.dataDict["orientation"] = np.arctan2( + self.dataDict["someCentroid_y"] - self.dataDict[ + "slot_Centroid_y"], + self.dataDict["someCentroid_x"] - self.dataDict[ + "slot_Centroid_x"], + ) + self.dataDict["orientation_err"] = np.arctan2( + self.dataDict["someCentroid_y"] - self.dataDict[ + "slot_Centroid_y"], + self.dataDict["someCentroid_x"] - self.dataDict[ + "slot_Centroid_x"], + ) * .001 + + self.dataDict["base_LocalWcs_CDMatrix_1_1"] = np.full( + self.nRecords, + cd_matrix[0, 0]) + self.dataDict["base_LocalWcs_CDMatrix_1_2"] = np.full( + self.nRecords, + cd_matrix[0, 1]) + self.dataDict["base_LocalWcs_CDMatrix_2_1"] = np.full( + self.nRecords, + cd_matrix[1, 0]) + self.dataDict["base_LocalWcs_CDMatrix_2_2"] = np.full( + self.nRecords, + cd_matrix[1, 1]) + df = self.getMultiIndexDataFrame(self.dataDict) + + # Test detector angle err to position angle err conversion + func = ConvertDetectorAngleErrToPositionAngleErr( + "orientation", + "orientation_err", + "base_LocalWcs_CDMatrix_1_1", + "base_LocalWcs_CDMatrix_1_2", + "base_LocalWcs_CDMatrix_2_1", + "base_LocalWcs_CDMatrix_2_2" + ) + val = self._funcVal(func, df) + + # Numerical derivative of the same PA function so a + # compariosn can be made + step = 1.0e-7 # radians. Bigger? Smaller? + pa_plus_deg = func.getPositionAngleFromDetectorAngle( + df[("meas", "g", "orientation")] + step, + df[("meas", "g", "base_LocalWcs_CDMatrix_1_1")], + df[("meas", "g", "base_LocalWcs_CDMatrix_1_2")], + df[("meas", "g", "base_LocalWcs_CDMatrix_2_1")], + df[("meas", "g", "base_LocalWcs_CDMatrix_2_2")], + ) + pa_minus_deg = func.getPositionAngleFromDetectorAngle( + df[("meas", "g", "orientation")] - step, + df[("meas", "g", "base_LocalWcs_CDMatrix_1_1")], + df[("meas", "g", "base_LocalWcs_CDMatrix_1_2")], + df[("meas", "g", "base_LocalWcs_CDMatrix_2_1")], + df[("meas", "g", "base_LocalWcs_CDMatrix_2_2")], + ) + + pa_plus = np.deg2rad(pa_plus_deg.to_numpy()) + pa_minus = np.deg2rad(pa_minus_deg.to_numpy()) + + # From example: smallest signed angular difference in + # (-pi, +pi] + dpa = np.angle(np.exp(1j * (pa_plus - pa_minus))) + dpa_dtheta = dpa / (2.0 * step) + + theta_err = df[("meas", "g", "orientation_err")].to_numpy() + expected_pa_err_deg = np.rad2deg( + np.abs(dpa_dtheta) * theta_err) + + np.testing.assert_allclose( + val.to_numpy(), + expected_pa_err_deg, + rtol=0, + atol=5e-6, + ) + def _makeWcs(self, dec=53.1595451514076, theta=0): """Create a wcs from real CFHT values, rotated by an optional theta. From 2be8d66f6e2eed9146418a0a54277077f426e9bc Mon Sep 17 00:00:00 2001 From: Brianna Smart Date: Wed, 4 Feb 2026 12:13:44 -0800 Subject: [PATCH 3/3] Fix unit tests --- tests/test_functors.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/test_functors.py b/tests/test_functors.py index ab1b275cb..b8e2a93ca 100644 --- a/tests/test_functors.py +++ b/tests/test_functors.py @@ -867,13 +867,11 @@ def testConvertDetectorAngleErrToPositionAngleErr(self): Requires a similar setup to testConvertDetectorAngleToPositionAngle. """ - import pydevd_pycharm - pydevd_pycharm.settrace('localhost', port=8888, stdout_to_server=True, - stderr_to_server=True) dipoleSep = 10 ixx = 10 testPixelDeltas = np.random.uniform(-100, 100, size=(self.nRecords, 2)) + for dec in np.linspace(-80, 80, 10): for theta in (-35, 0, 90): for x, y in zip( @@ -902,7 +900,7 @@ def testConvertDetectorAngleErrToPositionAngleErr(self): "slot_Centroid_y"], self.dataDict["someCentroid_x"] - self.dataDict[ "slot_Centroid_x"], - ) * .001 + ) * 0.001 self.dataDict["base_LocalWcs_CDMatrix_1_1"] = np.full( self.nRecords, @@ -931,7 +929,7 @@ def testConvertDetectorAngleErrToPositionAngleErr(self): # Numerical derivative of the same PA function so a # compariosn can be made - step = 1.0e-7 # radians. Bigger? Smaller? + step = self.dataDict["orientation_err"] # radians. Bigger? Smaller? pa_plus_deg = func.getPositionAngleFromDetectorAngle( df[("meas", "g", "orientation")] + step, df[("meas", "g", "base_LocalWcs_CDMatrix_1_1")], @@ -963,7 +961,7 @@ def testConvertDetectorAngleErrToPositionAngleErr(self): val.to_numpy(), expected_pa_err_deg, rtol=0, - atol=5e-6, + atol=1e-6, ) def _makeWcs(self, dec=53.1595451514076, theta=0):