diff --git a/data/unit_test_files/ob140939_Spitzer_ref_v1.dat b/data/unit_test_files/ob140939_Spitzer_ref_v1.dat deleted file mode 100644 index 7f19a6e2..00000000 --- a/data/unit_test_files/ob140939_Spitzer_ref_v1.dat +++ /dev/null @@ -1,31 +0,0 @@ -6814.07844 15.042 0.001 -.023 -19.345 1.296867 -6815.03086 15.039 0.001 -.005 -4.165 1.319118 -6815.82782 15.016 0.001 -.009 -7.327 1.338840 -6816.77402 15.028 0.001 0.026 22.175 1.363561 -6817.58341 14.974 0.001 -.009 -7.510 1.385807 -6818.73166 14.932 0.001 -.021 -18.234 1.419008 -6819.53932 14.909 0.001 -.023 -22.244 1.443407 -6820.52634 14.889 0.001 -.018 -17.159 1.474199 -6821.48308 14.870 0.001 -.011 -10.516 1.504800 -6822.65891 14.856 0.001 0.005 4.743 1.542872 -6823.46861 14.810 0.001 -.020 -19.788 1.568959 -6824.70223 14.790 0.001 -.011 -10.841 1.607595 -6825.49204 14.774 0.001 -.009 -9.173 1.631038 -6827.09946 14.745 0.001 -.008 -7.411 1.673595 -6827.80323 14.740 0.001 -.001 -0.745 1.689287 -6828.52669 14.723 0.001 -.008 -7.725 1.703094 -6830.38779 14.720 0.001 0.005 4.732 1.725830 -6831.42212 14.721 0.001 0.009 8.424 1.729580 -6832.59984 14.703 0.001 -.012 -11.978 1.725776 -6834.21402 14.729 0.001 0.001 0.721 1.707229 -6835.29855 14.737 0.001 -.006 -5.597 1.687135 -6836.28071 14.762 0.001 0.003 2.840 1.664593 -6836.97713 14.774 0.001 0.002 2.114 1.646579 -6838.16978 14.809 0.001 0.012 11.890 1.612799 -6839.03530 14.844 0.001 0.027 26.868 1.586662 -6839.94137 14.841 0.001 0.002 2.256 1.558468 -6841.10244 14.877 0.001 0.010 9.571 1.521886 -6842.17330 14.924 0.001 0.030 25.773 1.488392 -6843.58489 14.948 0.001 0.018 15.543 1.445505 -6844.44113 14.973 0.001 0.021 17.904 1.420521 -6845.70596 15.007 0.001 0.024 21.116 1.385358 diff --git a/data/unit_test_files/ob140939_Spitzer_ref_v2.dat b/data/unit_test_files/ob140939_Spitzer_ref_v2.dat new file mode 100644 index 00000000..24f7a71d --- /dev/null +++ b/data/unit_test_files/ob140939_Spitzer_ref_v2.dat @@ -0,0 +1,31 @@ +6814.07844 15.042 0.001 -0.023 -19.345 1.296867 -0.7731 0.7371 +6815.03086 15.039 0.001 -0.005 -4.165 1.319117 -0.7277 0.7329 +6815.82782 15.016 0.001 -0.009 -7.327 1.338840 -0.6898 0.7294 +6816.77402 15.028 0.001 0.026 22.175 1.363561 -0.6449 0.7253 +6817.58341 14.974 0.001 -0.009 -7.510 1.385806 -0.6064 0.7219 +6818.73166 14.932 0.001 -0.021 -18.234 1.419008 -0.5520 0.7171 +6819.53932 14.909 0.001 -0.023 -22.244 1.443406 -0.5138 0.7138 +6820.52634 14.889 0.001 -0.018 -17.159 1.474198 -0.4671 0.7098 +6821.48308 14.870 0.001 -0.011 -10.516 1.504799 -0.4220 0.7060 +6822.65891 14.856 0.001 0.005 4.743 1.542871 -0.3666 0.7014 +6823.46861 14.810 0.001 -0.020 -19.788 1.568958 -0.3285 0.6983 +6824.70223 14.790 0.001 -0.011 -10.841 1.607594 -0.2705 0.6937 +6825.49204 14.774 0.001 -0.009 -9.173 1.631038 -0.2335 0.6908 +6827.09946 14.745 0.001 -0.008 -7.411 1.673595 -0.1582 0.6850 +6827.80323 14.740 0.001 -0.001 -0.745 1.689287 -0.1253 0.6825 +6828.52669 14.723 0.001 -0.008 -7.725 1.703095 -0.0915 0.6800 +6830.38779 14.720 0.001 0.005 4.732 1.725832 -0.0047 0.6737 +6831.42212 14.721 0.001 0.009 8.424 1.729582 0.0434 0.6703 +6832.59984 14.703 0.001 -0.012 -11.978 1.725780 0.0982 0.6666 +6834.21402 14.729 0.001 0.001 0.721 1.707234 0.1730 0.6616 +6835.29855 14.737 0.001 -0.006 -5.597 1.687140 0.2232 0.6583 +6836.28071 14.762 0.001 0.003 2.840 1.664599 0.2686 0.6554 +6836.97713 14.774 0.001 0.002 2.114 1.646585 0.3007 0.6534 +6838.16978 14.809 0.001 0.012 11.890 1.612805 0.3557 0.6501 +6839.03530 14.844 0.001 0.027 26.868 1.586669 0.3956 0.6477 +6839.94137 14.841 0.001 0.002 2.256 1.558475 0.4372 0.6453 +6841.10244 14.877 0.001 0.010 9.571 1.521894 0.4905 0.6423 +6842.17330 14.924 0.001 0.030 25.773 1.488399 0.5396 0.6396 +6843.58489 14.948 0.001 0.018 15.543 1.445512 0.6042 0.6361 +6844.44113 14.973 0.001 0.021 17.904 1.420527 0.6434 0.6341 +6845.70596 15.007 0.001 0.024 21.116 1.385364 0.7011 0.6311 diff --git a/source/MulensModel/tests/test_FitData.py b/source/MulensModel/tests/test_FitData.py index b220b690..248e8411 100644 --- a/source/MulensModel/tests/test_FitData.py +++ b/source/MulensModel/tests/test_FitData.py @@ -15,7 +15,7 @@ SAMPLE_FILE_02_REF = join(dir_2, 'ob140939_OGLE_ref_v2.dat') # HJD' SAMPLE_FILE_03 = join(dir_1, 'ob140939_Spitzer.dat') # HJD' SAMPLE_FILE_03_EPH = join(dir_3, 'Spitzer_ephemeris_01.dat') # UTC -SAMPLE_FILE_03_REF = join(dir_2, 'ob140939_Spitzer_ref_v1.dat') # HJD' +SAMPLE_FILE_03_REF = join(dir_2, 'ob140939_Spitzer_ref_v2.dat') # HJD' SAMPLE_FILE_04_WF = join(mm.DATA_PATH, 'WFIRST_1827.dat') SAMPLE_FILE_FSPL_51 = join(dir_4, 'fort.51') SAMPLE_FILE_FSPL_61 = join(dir_4, 'fort.61') @@ -1028,8 +1028,8 @@ 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=4) - np.testing.assert_almost_equal(ratio_y, 1., decimal=4) + np.testing.assert_almost_equal(ratio_x, 1., decimal=2) + np.testing.assert_almost_equal(ratio_y, 1., decimal=2) # Tests to add: # diff --git a/source/MulensModel/tests/test_Model.py b/source/MulensModel/tests/test_Model.py index 783ad810..a70e4ccd 100644 --- a/source/MulensModel/tests/test_Model.py +++ b/source/MulensModel/tests/test_Model.py @@ -12,7 +12,7 @@ dir_3 = os.path.join(mm.DATA_PATH, 'ephemeris_files') SAMPLE_FILE_02_REF = os.path.join(dir_2, 'ob140939_OGLE_ref_v2.dat') # HJD' SAMPLE_FILE_03_EPH = os.path.join(dir_3, 'Spitzer_ephemeris_01.dat') # UTC -SAMPLE_FILE_03_REF = os.path.join(dir_2, 'ob140939_Spitzer_ref_v1.dat') # HJD' +SAMPLE_FILE_03_REF = os.path.join(dir_2, 'ob140939_Spitzer_ref_v2.dat') # HJD' def test_n_lenses(): diff --git a/source/MulensModel/tests/test_Model_Parallax.py b/source/MulensModel/tests/test_Model_Parallax.py index a18516e0..6772991b 100644 --- a/source/MulensModel/tests/test_Model_Parallax.py +++ b/source/MulensModel/tests/test_Model_Parallax.py @@ -15,7 +15,7 @@ SAMPLE_FILE_02_REF = os.path.join(dir_2, 'ob140939_OGLE_ref_v2.dat') # HJD' SAMPLE_FILE_03 = os.path.join(dir_1, 'ob140939_Spitzer.dat') # HJD' SAMPLE_FILE_03_EPH = os.path.join(dir_3, 'Spitzer_ephemeris_01.dat') # UTC -SAMPLE_FILE_03_REF = os.path.join(dir_2, 'ob140939_Spitzer_ref_v1.dat') # HJD' +SAMPLE_FILE_03_REF = os.path.join(dir_2, 'ob140939_Spitzer_ref_v2.dat') # HJD' SAMPLE_FILE_04_EPH = os.path.join(dir_3, 'Spitzer_ephemeris_03.dat') # UTC SAMPLE_FILE_04_REF = os.path.join(dir_2, 'gets_70.dat')