Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/issue94' into issue94
Browse files Browse the repository at this point in the history
  • Loading branch information
jenniferyee committed Dec 7, 2023
2 parents 6e0e134 + dae6f0c commit 72a68ad
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion source/MulensModel/tests/test_FitData.py
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ def test_get_trajectory_1L2S_satellite_parallax():
ratio_x = trajectory.x / ref_Spitzer[6]
ratio_y = trajectory.y / ref_Spitzer[7]
np.testing.assert_almost_equal(ratio_x, 1., decimal=2)
np.testing.assert_almost_equal(ratio_y, 1., decimal=2)
np.testing.assert_almost_equal(ratio_y, 1., decimal=3)

# Tests to add:
#
Expand Down
12 changes: 6 additions & 6 deletions source/MulensModel/tests/test_Model.py
Original file line number Diff line number Diff line change
Expand Up @@ -805,8 +805,8 @@ def test_1L1S(self):
x = (times - t_0) / t_E
ratio_x = trajectory.x / x
ratio_y = trajectory.y / y
np.testing.assert_almost_equal(ratio_x, [1.] * len(ratio_x), decimal=4)
np.testing.assert_almost_equal(ratio_y, [1.] * len(ratio_y), decimal=4)
np.testing.assert_almost_equal(ratio_x, 1.)
np.testing.assert_almost_equal(ratio_y, 1.)

def test_1L1S_annual_parallax(self):
"""case with annual parallax"""
Expand All @@ -815,8 +815,8 @@ def test_1L1S_annual_parallax(self):

ratio_x = trajectory.x / self.ref_OGLE[6]
ratio_y = trajectory.y / self.ref_OGLE[7]
np.testing.assert_almost_equal(ratio_x, [1.] * len(ratio_x), decimal=2)
np.testing.assert_almost_equal(ratio_y, [1.] * len(ratio_y), decimal=2)
np.testing.assert_almost_equal(ratio_x, [1.] * len(ratio_x), decimal=3)
np.testing.assert_almost_equal(ratio_y, [1.] * len(ratio_y), decimal=3)

def test_1L1S_satellite_parallax_1(self):
"""Case with satellite parallax (check test_Model_Parallax.py)"""
Expand All @@ -830,7 +830,7 @@ def test_1L1S_satellite_parallax_1(self):
ratio_x = trajectory.x / self.ref_Spitzer[6]
ratio_y = trajectory.y / self.ref_Spitzer[7]
np.testing.assert_almost_equal(ratio_x, [1.] * len(ratio_x), decimal=2)
np.testing.assert_almost_equal(ratio_y, [1.] * len(ratio_y), decimal=2)
np.testing.assert_almost_equal(ratio_y, [1.] * len(ratio_y), decimal=3)

def test_1L1S_satellite_parallax_2(self):
"""Case with satellite parallax (check test_Model_Parallax.py)"""
Expand All @@ -842,7 +842,7 @@ def test_1L1S_satellite_parallax_2(self):
ratio_x = trajectory.x / self.ref_Spitzer[6]
ratio_y = trajectory.y / self.ref_Spitzer[7]
np.testing.assert_almost_equal(ratio_x, [1.] * len(ratio_x), decimal=2)
np.testing.assert_almost_equal(ratio_y, [1.] * len(ratio_y), decimal=2)
np.testing.assert_almost_equal(ratio_y, [1.] * len(ratio_y), decimal=3)

def test_1L2S(self):
"""Binary source trajectories"""
Expand Down
2 changes: 1 addition & 1 deletion source/MulensModel/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.18.0"
__version__ = "2.19.0"

0 comments on commit 72a68ad

Please sign in to comment.