Merge branch 'master' into issue94

rpoleski · Dec 7, 2023 · c4b1698 · c4b1698
2 parents 72a68ad + de817cc
commit c4b1698
Show file tree

Hide file tree

Showing 76 changed files with 1,036 additions and 102 deletions.
diff --git a/data/expected_example_output/example_01/Ex01_Figure_1.png b/data/expected_example_output/example_01/Ex01_Figure_1.png
diff --git a/data/expected_example_output/example_01/Ex01_Figure_2.png b/data/expected_example_output/example_01/Ex01_Figure_2.png
diff --git a/data/expected_example_output/example_01/Ex01_Figure_3.png b/data/expected_example_output/example_01/Ex01_Figure_3.png
diff --git a/data/expected_example_output/example_01/Ex01_Figure_4.png b/data/expected_example_output/example_01/Ex01_Figure_4.png
diff --git a/data/expected_example_output/example_01/Ex01_Figure_5.png b/data/expected_example_output/example_01/Ex01_Figure_5.png
diff --git a/data/expected_example_output/example_02/Ex02_Figure_1.png b/data/expected_example_output/example_02/Ex02_Figure_1.png
diff --git a/data/expected_example_output/example_02/Ex02_Figure_2.png b/data/expected_example_output/example_02/Ex02_Figure_2.png
diff --git a/data/expected_example_output/example_03/Ex03_Figure_1.png b/data/expected_example_output/example_03/Ex03_Figure_1.png
diff --git a/data/expected_example_output/example_03/Ex03_Figure_2.png b/data/expected_example_output/example_03/Ex03_Figure_2.png
diff --git a/data/expected_example_output/example_04/rE.tab b/data/expected_example_output/example_04/rE.tab
@@ -0,0 +1,10 @@
+# Physical Einstein ring radius in AU (Lens plane).
+# columns = distance in kpc
+# rows = mass in solMass
+        1.00  2.00  3.00  4.00  5.00  6.00  7.00
+  10.0  8.44 11.05 12.36 12.76 12.36 11.05  8.44
+   1.0  2.67  3.50  3.91  4.04  3.91  3.50  2.67
+   0.3  1.46  1.91  2.14  2.21  2.14  1.91  1.46
+   0.1  0.84  1.11  1.24  1.28  1.24  1.11  0.84
+  0.01  0.27  0.35  0.39  0.40  0.39  0.35  0.27
+ 0.001  0.08  0.11  0.12  0.13  0.12  0.11  0.08
diff --git a/data/expected_example_output/example_04/rEtilde.tab b/data/expected_example_output/example_04/rEtilde.tab
@@ -0,0 +1,10 @@
+# Projection of Einstein ring radius in AU (Observer plane).
+# columns = distance in kpc
+# rows = mass in solMass
+        1.00  2.00  3.00  4.00  5.00  6.00  7.00
+  10.0  9.65 14.74 19.77 25.52 32.95 44.21 67.53
+   1.0  3.05  4.66  6.25  8.07 10.42 13.98 21.36
+   0.3  1.67  2.55  3.42  4.42  5.71  7.66 11.70
+   0.1  0.96  1.47  1.98  2.55  3.30  4.42  6.75
+  0.01  0.31  0.47  0.63  0.81  1.04  1.40  2.14
+ 0.001  0.10  0.15  0.20  0.26  0.33  0.44  0.68
diff --git a/data/expected_example_output/example_04/tE.tab b/data/expected_example_output/example_04/tE.tab
@@ -0,0 +1,10 @@
+# Einstein timescale in days for mu_rel =  4.0 mas/yr.
+# columns = distance in kpc
+# rows = mass in solMass
+        1.00  2.00  3.00  4.00  5.00  6.00  7.00
+  10.0 770.8 504.6 376.1 291.3 225.7 168.2 110.1
+   1.0 243.8 159.6 118.9  92.1  71.4  53.2  34.8
+   0.3 133.5  87.4  65.1  50.5  39.1  29.1  19.1
+   0.1  77.1  50.5  37.6  29.1  22.6  16.8  11.0
+  0.01  24.4  16.0  11.9   9.2   7.1   5.3   3.5
+ 0.001   7.7   5.0   3.8   2.9   2.3   1.7   1.1
diff --git a/data/expected_example_output/example_04/thetaE.tab b/data/expected_example_output/example_04/thetaE.tab
@@ -0,0 +1,10 @@
+# Angular Einstein ring radius in milliarcseconds.
+# columns = distance in kpc
+# rows = mass in solMass
+        1.00  2.00  3.00  4.00  5.00  6.00  7.00
+  10.0  8.44  5.53  4.12  3.19  2.47  1.84  1.21
+   1.0  2.67  1.75  1.30  1.01  0.78  0.58  0.38
+   0.3  1.46  0.96  0.71  0.55  0.43  0.32  0.21
+   0.1  0.84  0.55  0.41  0.32  0.25  0.18  0.12
+  0.01  0.27  0.17  0.13  0.10  0.08  0.06  0.04
+ 0.001  0.08  0.06  0.04  0.03  0.02  0.02  0.01
diff --git a/data/expected_example_output/example_05/Ex05_Figure_1.png b/data/expected_example_output/example_05/Ex05_Figure_1.png
diff --git a/data/expected_example_output/example_05/Ex05_Figure_1_zoom.png b/data/expected_example_output/example_05/Ex05_Figure_1_zoom.png
diff --git a/data/expected_example_output/example_05/Ex05_Figure_2.png b/data/expected_example_output/example_05/Ex05_Figure_2.png
diff --git a/data/expected_example_output/example_05/Ex05_Figure_3.png b/data/expected_example_output/example_05/Ex05_Figure_3.png
diff --git a/data/expected_example_output/example_05/Ex05_Figure_3_zoom.png b/data/expected_example_output/example_05/Ex05_Figure_3_zoom.png
diff --git a/data/expected_example_output/example_05/Ex05_Figure_4.png b/data/expected_example_output/example_05/Ex05_Figure_4.png
diff --git a/data/expected_example_output/example_05/Ex05_Figure_5.png b/data/expected_example_output/example_05/Ex05_Figure_5.png
diff --git a/data/expected_example_output/example_05/Ex05_Figure_6.png b/data/expected_example_output/example_05/Ex05_Figure_6.png
diff --git a/data/expected_example_output/example_06/Ex06_Figure_1.png b/data/expected_example_output/example_06/Ex06_Figure_1.png
diff --git a/data/expected_example_output/example_06/Ex06_output.txt b/data/expected_example_output/example_06/Ex06_output.txt
@@ -0,0 +1,10 @@
+Fitted parameters:
+2453630.39088 0.22670 0.23167
+0.49048 0.02013 0.01869
+93.45656 2.19216 2.15444
+0.27419 0.02800 0.03255
+0.10357 0.00732 0.00715
+
+Smallest chi2 model:
+2453630.376707949 0.48814776622836326 93.89323919007633 0.2722480223300758 0.10093639484208665
+946.7504141947664
diff --git a/data/expected_example_output/example_09/Ex09_Figure_1.png b/data/expected_example_output/example_09/Ex09_Figure_1.png
diff --git a/data/expected_example_output/example_09/Ex09_Figure_2.png b/data/expected_example_output/example_09/Ex09_Figure_2.png
diff --git a/data/expected_example_output/example_09/Ex09_output.txt b/data/expected_example_output/example_09/Ex09_output.txt
@@ -0,0 +1,19 @@
+Initial Trial
+    t_0 (HJD)       u_0    t_E (d)
+   5380.00000  0.100000    18.0000
+Chi2 = 32241.84124710082
+
+Best Fit: t_0 =   5379.57091, u_0 = 0.5230, t_E =   17.940
+Chi2 =       427.20
+
+scipy.optimize.minimize result:
+     fun: 427.2038219878052
+     jac: array([-0.03365149, -3.52971227, -0.1673083 ])
+ message: 'Optimization terminated successfully.'
+    nfev: 11
+    nhev: 0
+     nit: 9
+    njev: 28
+  status: 0
+ success: True
+       x: array([5.37957091e+03, 5.22985608e-01, 1.79398771e+01])
diff --git a/data/expected_example_output/example_10/Ex10_Figure_1.png b/data/expected_example_output/example_10/Ex10_Figure_1.png
diff --git a/data/expected_example_output/example_10/Ex10_output.txt b/data/expected_example_output/example_10/Ex10_output.txt
@@ -0,0 +1,24 @@
+Fitted parameters:
+t_0 : 2454656.39908 0.00004 0.00003
+u_0 : 0.00311 0.00014 0.00014
+t_E : 10.78598 0.50061 0.45567
+t_star : 0.05311 0.00010 0.00011
+Fluxes (source and blending):
+flux_s_1 : 16.2724 0.7504 0.7533
+flux_b_1 : 19.4651 0.7343 0.7324
+flux_s_2 : 1.5269 0.0686 0.0675
+flux_b_2 : 13.8875 0.0471 0.0446
+flux_s_3 : 15.9354 0.7181 0.6964
+flux_b_3 : 30.6087 4.3688 3.9172
+
+Smallest chi2 model:
+
+Smallest chi2 model:
+2454656.3990747104 0.003140471938847057 10.687652809215646 0.05310677368499168
+chi2 =  4488.397319300576
+
+Now let's plot the best model
+~/MulensModel/source/MulensModel/utils.py:149: UserWarning: Flux to magnitude conversion approached negative flux
+  UserWarning)
+~/MulensModel/source/MulensModel/utils.py:150: RuntimeWarning: invalid value encountered in log10
+  mag = zeropoint - 2.5 * np.log10(flux)
diff --git a/data/expected_example_output/example_11/Ex11_output.txt b/data/expected_example_output/example_11/Ex11_output.txt
@@ -0,0 +1,24 @@
+First fit. This can take some time...
+Fitted parameters:
+t_0_1: 6100.04856 +0.02384 -0.02442
+u_0_1: 0.20176 +0.00752 -0.00703
+t_0_2: 6140.00048 +0.00054 -0.00053
+u_0_2: 0.01000 +0.00028 -0.00026
+t_E: 24.97848 +0.63846 -0.64421
+
+Smallest chi2 model:
+6100.043548826305 0.2022324038184834 6140.000506813421 0.010020746352062961 24.915197094232358
+chi2 =  1559.6924283831406
+
+Second fit. This can take some time...
+Fitted parameters:
+t_0_1: 6100.04559 +0.02412 -0.02510
+u_0_1: 0.20177 +0.00737 -0.00713
+t_0_2: 6140.00051 +0.00058 -0.00052
+u_0_2: 0.01001 +0.00028 -0.00027
+t_E: 24.95427 +0.66243 -0.63960
+flux_ratio: 0.04960 +0.00073 -0.00075
+
+Smallest chi2 model:
+6100.045603563694 0.20091734861294366 6140.000535868968 0.0099839566576509 25.026575661688916 0.04969677432173234
+chi2 =  1559.7269272614674
diff --git a/data/expected_example_output/example_12/Ex12_Figure_1.png b/data/expected_example_output/example_12/Ex12_Figure_1.png
diff --git a/data/expected_example_output/example_12/Ex12_Figure_2.png b/data/expected_example_output/example_12/Ex12_Figure_2.png
diff --git a/data/expected_example_output/example_12/Ex12_output.txt b/data/expected_example_output/example_12/Ex12_output.txt
@@ -0,0 +1,10 @@
+Fitted parameters:
+t_0 : 2456836.16049 0.06449 0.06147
+u_0 : 0.91317 0.08863 0.06308
+t_E : 23.00179 1.08252 1.36160
+pi_E_N : -0.24558 0.02746 0.03641
+pi_E_E : 0.25284 0.01993 0.01458
+
+Smallest chi2 model:
+2456836.1677156785 0.895675183048813 23.285476727841555 -0.2372979702893409 0.24911302577456898
+4227.374316561218
diff --git a/data/expected_example_output/example_13/Ex13_final_output.txt b/data/expected_example_output/example_13/Ex13_final_output.txt
@@ -0,0 +1,16 @@
+Fitted parameters:
+x_caustic_in 0.23742 +0.52941 -0.08743
+x_caustic_out 0.69196 +0.04097 -0.38811
+t_caustic_in 2452835.23844 +0.02525 -0.02907
+t_caustic_out 2452842.07232 +0.00588 -0.00384
+rho 0.00079 +0.00020 -0.00005
+
+Smallest chi2 model:
+0.14873474431136965 0.735914628389552 2452835.262249646 2452842.079264407 0.0009667058605395652
+1645.8911643006056
+ t_0 = 2452848.01467
+ u_0 = 0.13443
+ t_E = 61.465
+ alpha = 224.40 deg
+
+chi2:  1654.40998416322
diff --git a/data/expected_example_output/example_14/Ex14_Figure_1.png b/data/expected_example_output/example_14/Ex14_Figure_1.png
diff --git a/data/expected_example_output/example_14/Ex14_Figure_2.png b/data/expected_example_output/example_14/Ex14_Figure_2.png
diff --git a/data/expected_example_output/example_15/Ex15_mb192_Figure_1.png b/data/expected_example_output/example_15/Ex15_mb192_Figure_1.png
diff --git a/data/expected_example_output/example_15/Ex15_mb192_Figure_1_zoom.png b/data/expected_example_output/example_15/Ex15_mb192_Figure_1_zoom.png
diff --git a/data/expected_example_output/example_15/Ex15_mb192_final_output.txt b/data/expected_example_output/example_15/Ex15_mb192_final_output.txt
@@ -0,0 +1,14 @@
+Fitted parameters:
+t_0 2454245.43602 +0.01075 -0.02995
+u_0 0.00411 +0.00043 -0.00037
+t_E 69.37776 +6.54139 -5.51903
+t_star 0.06335 +0.00394 -0.00426
+alpha 68.95273 +191.56197 -2.84802
+
+Smallest chi2 model:
+2454245.4465964306 0.003800549975368232 72.81587150268032 0.060030280907769976 66.75127434511563
+1155.9446938367141
+    t_0 (HJD)       u_0    t_E (d)    t_star (d)         s            q alpha (deg)
+2454245.44660  0.003801    72.8159      0.060030   0.88100   0.00015000    66.75127
+default magnification method: point_source_point_lens
+other magnification methods: [2454244.5, 'VBBL', 2454246.0]
diff --git a/data/expected_example_output/example_15/Ex15_ob390_Figure_1.png b/data/expected_example_output/example_15/Ex15_ob390_Figure_1.png
diff --git a/data/expected_example_output/example_15/Ex15_ob390_output.txt b/data/expected_example_output/example_15/Ex15_ob390_output.txt
@@ -0,0 +1,16 @@
+Fitted parameters:
+t_0 2453582.72741 +0.01070 -0.00882
+u_0 0.35692 +0.01148 -0.01025
+t_E 11.07477 +0.22976 -0.27324
+rho 0.02535 +0.00242 -0.00223
+q 0.0000817 +0.0000211 -0.0000144
+s 1.60690 +0.01973 -0.01514
+alpha 337.85901 +0.25341 -0.25698
+
+Smallest chi2 model:
+2453582.7300333385 0.3609002048497102 10.977720551257514 0.02585553956290955 8.480735769711146e-05 1.6136137859944493 337.76376235800285
+562.2741771206458
+    t_0 (HJD)       u_0    t_E (d)     rho         s            q alpha (deg)
+2453582.73003  0.360900    10.9777 0.02586   1.61361   0.00008481   337.76376
+default magnification method: point_source_point_lens
+other magnification methods: [2453591.0, 'VBBL', 2453594.0]
diff --git a/data/expected_example_output/example_17/Ex17_Figure_1.png b/data/expected_example_output/example_17/Ex17_Figure_1.png
diff --git a/data/expected_example_output/example_17/Ex17_Figure_2.png b/data/expected_example_output/example_17/Ex17_Figure_2.png
diff --git a/data/expected_example_output/example_17/Ex17_Figure_3.png b/data/expected_example_output/example_17/Ex17_Figure_3.png
diff --git a/data/expected_example_output/example_18/Ex18_1_Figure_1.png b/data/expected_example_output/example_18/Ex18_1_Figure_1.png
diff --git a/data/expected_example_output/example_18/Ex18_1_output.txt b/data/expected_example_output/example_18/Ex18_1_output.txt
@@ -0,0 +1 @@
+chi^2: 95.93
diff --git a/data/expected_example_output/example_18/Ex18_2_Figure_1.png b/data/expected_example_output/example_18/Ex18_2_Figure_1.png
diff --git a/data/expected_example_output/example_18/Ex18_2_output.txt b/data/expected_example_output/example_18/Ex18_2_output.txt
@@ -0,0 +1 @@
+chi^2: 460.67
diff --git a/data/expected_example_output/example_18/example_18_output_1.dat b/data/expected_example_output/example_18/example_18_output_1.dat
@@ -0,0 +1,100 @@
+6604.8739 14.5103 0.0111
+6609.2565 14.4984 0.0109
+6612.8298 14.4596 0.0106
+6614.3795 14.4748 0.0107
+6615.4354 14.4937 0.0109
+6616.5977 14.4869 0.0108
+6621.9146 14.4791 0.0108
+6628.9009 14.4952 0.0110
+6630.3470 14.4817 0.0108
+6631.6395 14.4700 0.0107
+6634.4512 14.4769 0.0108
+6634.8948 14.4837 0.0109
+6637.0558 14.4715 0.0107
+6638.9184 14.5004 0.0110
+6643.7966 14.4881 0.0109
+6652.3866 14.4692 0.0108
+6658.4125 14.4731 0.0109
+6664.9854 14.4727 0.0109
+6668.9712 14.4396 0.0106
+6669.5665 14.4581 0.0108
+6670.1151 14.4481 0.0107
+6683.4791 14.4466 0.0109
+6701.0664 14.4181 0.0109
+6703.8618 14.4062 0.0109
+6707.2986 14.3946 0.0108
+6708.0721 14.3919 0.0108
+6711.8456 14.3917 0.0110
+6713.7080 14.3710 0.0108
+6713.9927 14.3699 0.0108
+6721.6476 14.3280 0.0108
+6721.6557 14.3256 0.0108
+6726.1744 14.3149 0.0109
+6727.6298 14.2907 0.0108
+6728.0728 14.3110 0.0110
+6734.8482 14.2407 0.0108
+6737.5930 14.2313 0.0109
+6738.2742 14.2072 0.0108
+6739.2676 14.2063 0.0109
+6744.0054 14.1677 0.0110
+6744.7414 14.1577 0.0110
+6753.3205 14.0132 0.0108
+6758.2814 13.9135 0.0107
+6773.9133 13.5151 0.0107
+6783.7705 13.2496 0.0108
+6796.3515 13.2900 0.0108
+6797.6821 13.3345 0.0109
+6811.3912 13.7324 0.0109
+6815.8913 13.8331 0.0108
+6817.7499 13.8926 0.0110
+6819.9393 13.9402 0.0110
+6823.6071 14.0055 0.0109
+6823.7032 13.9633 0.0105
+6824.6531 14.0144 0.0108
+6828.1141 14.0611 0.0108
+6833.0262 14.1453 0.0109
+6833.3441 14.1324 0.0108
+6834.4777 14.1331 0.0106
+6835.0121 14.1594 0.0108
+6840.8818 14.2225 0.0108
+6842.8239 14.2367 0.0108
+6856.6756 14.3421 0.0109
+6859.9128 14.3560 0.0109
+6860.5211 14.3600 0.0109
+6860.6752 14.3821 0.0111
+6864.6159 14.3900 0.0110
+6868.4516 14.3901 0.0109
+6869.9431 14.3875 0.0108
+6873.0021 14.4158 0.0110
+6875.1116 14.4107 0.0109
+6879.0080 14.4317 0.0110
+6880.2203 14.4227 0.0109
+6883.7509 14.4296 0.0109
+6886.1755 14.4412 0.0109
+6888.8120 14.4359 0.0108
+6907.4771 14.4645 0.0109
+6910.7321 14.4599 0.0108
+6911.3041 14.4735 0.0109
+6916.3946 14.4706 0.0109
+6917.0442 14.4867 0.0110
+6918.6684 14.4680 0.0108
+6919.5347 14.4911 0.0111
+6919.9728 14.4620 0.0108
+6930.0837 14.4617 0.0107
+6931.7789 14.4763 0.0108
+6933.5876 14.4759 0.0108
+6934.9602 14.4863 0.0109
+6954.0494 14.4777 0.0108
+6955.9583 14.4756 0.0107
+6957.7111 14.4879 0.0109
+6958.8594 14.5007 0.0110
+6961.3582 14.4990 0.0110
+6964.4489 14.4827 0.0108
+6969.2792 14.4921 0.0109
+6971.9760 14.4972 0.0109
+6978.2672 14.4817 0.0108
+6981.4356 14.5059 0.0110
+6983.0354 14.5013 0.0109
+6987.4259 14.4980 0.0109
+6988.0448 14.4918 0.0108
+6999.2706 14.5013 0.0109