Merge branch 'master' into issue94

rpoleski · Sep 21, 2023 · a92f1e2 · a92f1e2
2 parents 5206195 + 537e33c
commit a92f1e2
Show file tree

Hide file tree

Showing 83 changed files with 29,580 additions and 450 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,7 @@ examples/example_16/*_out.yaml
 
 # Temporary tasks:
 DEV
+sandbox
 
 # Latex files:
 *.aux

diff --git a/README.md b/README.md
@@ -6,16 +6,16 @@
 
 [**Detailed documentation: https://rpoleski.github.io/MulensModel/**](https://rpoleski.github.io/MulensModel/)
 
-[Latest release: 2.16.0](https://github.com/rpoleski/MulensModel/releases/latest) and we're working on further developing the code.
+[Latest release: 2.18.0](https://github.com/rpoleski/MulensModel/releases/latest) and we're working on further developing the code.
 
-MulensModel can generate a microlensing light curve for a given set of microlensing parameters, fit that light curve to some data, and return a chi2 value. That chi2 can then be input into an arbitrary likelihood function to find the best-fit parameters.
+MulensModel can generate a microlensing light curve for a given set of microlensing parameters, fit that light curve to some data, and return a chi2 value. That chi2 (and its gradient in some cases) can then be input into an arbitrary likelihood function to find the best-fit parameters.
 
 If you want to learn more about microlensing, please visit [Microlensing Source website](http://microlensing-source.org/).
 
 Currently, MulensModel supports:
-* Lens Systems: point lens or binary lens. **New: shear and convergence allowed for both point and binary lenses.**
-* Source Stars: single source or binary source. **Xallarap effect is currently developed:** [see this branch](https://github.com/rpoleski/MulensModel/tree/xal).
-* Effects: finite source (1-parameter), parallax (satellite & annual), binary lens orbital motion, different parametrizations of microlensing models.
+* Lens Systems: point lens or binary lens. Shear and convergence allowed for both point and binary lenses.
+* Source Stars: single source or binary source.
+* Effects: finite source (1-parameter), parallax (satellite & annual), binary lens orbital motion, **xallarap effect (new)**, different parametrizations of microlensing models.
 
 Need more? Open [an issue](https://github.com/rpoleski/MulensModel/issues), start [a discussion](https://github.com/rpoleski/MulensModel/discussions), or send us an e-mail. 
 
@@ -62,4 +62,4 @@ If you want to contribute to MulensModel, then please see [this file](CONTRIBUTI
 ![example workflow](https://github.com/rpoleski/MulensModel/actions/workflows/python-app.yml/badge.svg)
 [![Coverage Status](https://codecov.io/gh/rpoleski/MulensModel/branch/master/graph/badge.svg)](https://codecov.io/gh/rpoleski/MulensModel)
 
-file revised May 2023
+file revised Sep 2023
diff --git a/data/ephemeris_files/Spitzer_ephemeris_03.dat b/data/ephemeris_files/Spitzer_ephemeris_03.dat
diff --git a/data/interpolation_table_b0b1_v2.dat b/data/interpolation_table_b0b1_v2.dat
diff --git a/data/interpolation_table_b0b1_v3.dat b/data/interpolation_table_b0b1_v3.dat
diff --git a/data/unit_test_files/fspl_derivs/FSPL_par_Obs_1_I.pho b/data/unit_test_files/fspl_derivs/FSPL_par_Obs_1_I.pho
diff --git a/data/unit_test_files/fspl_derivs/FSPL_par_Obs_2_V.pho b/data/unit_test_files/fspl_derivs/FSPL_par_Obs_2_V.pho
diff --git a/data/unit_test_files/fspl_derivs/fort.51 b/data/unit_test_files/fspl_derivs/fort.51
@@ -0,0 +1,22 @@
+ # iloop
+           1
+ # kfix
+           0           0           0           0           1           1           1           1           1           0           0           1           0           0           1
+ # fac
+   6.9517844759712374E-310
+ # chi2
+   43656.106808088371        41617.548317147863     
+ # a
+1697.19995  0.00600 25.00000  0.00600  0.44000  0.72000  0.26000  0.00000  0.00000  1.30000  0.00000  0.00000  1.00000  0.00000  0.00000
+ # da
+  -0.16742 -0.00513 -0.35970 -0.01185 -0.00000  0.00000  0.00000  0.00000 -0.00000 -0.05162  0.05209  0.00000  0.97447  6.62949 -0.00000
+ # s
+   0.00116  0.00018  0.06967  0.00042  0.00000  0.00000  0.00000  0.00000  0.00000  0.00510  0.00501  0.00000  0.01241  0.21769  0.00000
+ # b
+   1452559.2702565189       -42052585.731593072        10168.277862678386        16481694.851143530       -7875.4666498928609       -240.00806617545294        0.0000000000000000       -2321.7295645386312        4026.9709363025108        300007.50397523580        7449.7905344266292        11174.685801640022        18628.862617083625        287.55506727938376        431.33260091907539       -42052585.731593072        2963766366.4843707       -217883.89243239909       -1219950626.5562000        546708.53568090010        37948.471240397826        0.0000000000000000        40473.672238949715       -95574.905040360711       -11556307.719752440       -129243.24262147414       -193864.86393221081       -900040.53972177766       -7765.0030495507972       -11647.504574326191        10168.277862678386       -217883.89243239909        4157.0565127729133        67799.011215081002       -35.942713819575381       -1.9917704988675129        0.0000000000000000       -24.740166953871867       -594.79462284637350        125928.46520247255        71199.349566211284        106799.02434931714        813.74306158688398        41.436394145796740        62.154591218695131        16481694.851143530       -1219950626.5562000        67799.011215081002        508960147.21080232       -224219.10813560549       -17368.874704163609        0.0000000000000000       -15880.904719964456        40730.063887890959        4323790.0028604390        41900.261577891455        62850.392366836932        345874.71024027938        2502.8868080949019        3754.3302121423544       -7875.4666498928609        546708.53568090010       -35.942713819575381       -224219.10813560549        10000000272564332.        0.0000000000000000        0.0000000000000000        7.8283647375372745       -17.939078778771563       -2182.5586216171005       -23.835985860702799       -35.753978791054202        0.0000000000000000        0.0000000000000000        0.0000000000000000       -240.00806617545294        37948.471240397826       -1.9917704988675129       -17368.874704163609        0.0000000000000000        10000000272564232.        0.0000000000000000        7.0614405906178753E-003  -1.1939972953400613        0.0000000000000000        0.0000000000000000        0.0000000000000000       -173.29047722312370       -1.3861737538690266       -2.0792606308035393        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        10000000272564224.        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000       -2321.7295645386312        40473.672238949715       -24.740166953871867       -15880.904719964456        7.8283647375372745        7.0614405906178753E-003   0.0000000000000000        10000000272564350.       -345.94141510973151       -2606.6959915673942       -2229.1397643473965       -3343.7096465211098       -10.172216504730050       -7.7008884173377732E-003  -1.1551332626007172E-002   4026.9709363025108       -95574.905040360711       -594.79462284637350        40730.063887890959       -17.939078778771563       -1.1939972953400613        0.0000000000000000       -345.94141510973151        10000000272565726.       -68469.795537713566       -63707.505401166512       -95561.258101749612        23.764725154745559       0.13895270729906040       0.20842906094858843        300007.50397523580       -11556307.719752440        125928.46520247255        4323790.0028604390       -2182.5586216171005        0.0000000000000000        0.0000000000000000       -2606.6959915673942       -68469.795537713566        17963933.619604886        16506393.881362269        24759590.822043426        0.0000000000000000        0.0000000000000000        0.0000000000000000        7449.7905344266292       -129243.24262147414        71199.349566211284        41900.261577891455       -23.835985860702799        0.0000000000000000        0.0000000000000000       -2229.1397643473965       -63707.505401166512        16506393.881362269        15849212.529412489        23773818.794118743        0.0000000000000000        0.0000000000000000        0.0000000000000000        11174.685801640022       -193864.86393221081        106799.02434931714        62850.392366836932       -35.753978791054202        0.0000000000000000        0.0000000000000000       -3343.7096465211098       -95561.258101749612        24759590.822043426        23773818.794118743        10000000308224952.        0.0000000000000000        0.0000000000000000        0.0000000000000000        18628.862617083625       -900040.53972177766        813.74306158688398        345874.71024027938        0.0000000000000000       -173.29047722312370        0.0000000000000000       -10.172216504730050        23.764725154745559        0.0000000000000000        0.0000000000000000        0.0000000000000000        23721.251083524512        1071.4566410180337        1607.1849615270503        287.55506727938376       -7765.0030495507972        41.436394145796740        2502.8868080949019        0.0000000000000000       -1.3861737538690266        0.0000000000000000       -7.7008884173377732E-003  0.13895270729906040        0.0000000000000000        0.0000000000000000        0.0000000000000000        1071.4566410180337        69.976276642043018        104.96441496306456        431.33260091907539       -11647.504574326191        62.154591218695131        3754.3302121423544        0.0000000000000000       -2.0792606308035393        0.0000000000000000       -1.1551332626007172E-002  0.20842906094858843        0.0000000000000000        0.0000000000000000        0.0000000000000000        1607.1849615270503        104.96441496306456        10000000272564382.     
+ # c
+   1.3566966869589738E-006   7.5556571672843744E-008   8.6556252814726710E-006   1.4299598822076275E-007   9.2753936366053924E-021  -1.7179147087026462E-020   0.0000000000000000        2.2623035880847228E-019  -3.0309951853467615E-019  -7.6795654462165401E-007   7.6051632203639752E-007   1.1070265561612456E-030  -7.9420957573707776E-007   4.7297808522169628E-006  -9.8982907525214650E-035   7.5556571672843744E-008   3.3778612632555413E-008  -3.2070328133750436E-006   7.6538977729239957E-008  -2.6115610326611647E-020   1.1167418997408812E-020   0.0000000000000000        5.4451688170093157E-021  -6.3332511730487213E-020   2.6151520208723956E-007  -2.5791429700830027E-007  -3.7563740777094076E-031   3.2075265176003307E-007  -2.3120510769602027E-006  -1.7164840999338873E-035   8.6556252814726726E-006  -3.2070328133750436E-006   4.8533663425568575E-003  -5.5478586786835328E-006   7.0947301056094590E-019  -4.4187776325668908E-019   0.0000000000000000        3.2379418603088304E-018   6.5549974883072638E-017  -3.4497840981916408E-004   3.3746449314963912E-004   4.8439553358995831E-028  -2.4498364705475417E-004   6.8419514419784189E-004  -1.4004371347686730E-032   1.4299598822076278E-007   7.6538977729239957E-008  -5.5478586786835320E-006   1.7722888214719312E-007  -1.7123659924921575E-020   2.9189190899546557E-020   0.0000000000000000        1.0627943284503024E-020  -1.2083281728320697E-019   4.6707453598010479E-007  -4.6143058532875056E-007  -6.7377970332762233E-031   5.7979776984326714E-007  -4.0259725476406649E-006  -5.1463831589296752E-035   9.2753936366061417E-021  -2.6115610326611193E-020   7.0947301056092164E-019  -1.7123659924922150E-020   9.9999997274357800E-017   3.7349365384609409E-032   0.0000000000000000       -4.9711921327737644E-034   8.7991123639758387E-033  -6.2946552223449633E-020   6.2347784421670808E-020   9.2090848672654537E-044  -2.1041626550818670E-018   2.9474626952259811E-017  -1.2643129038749597E-046  -1.7179147087026441E-020   1.1167418997408826E-020  -4.4187776325669004E-019   2.9189190899546539E-020   3.7349365384609415E-032   9.9999997274357812E-017   0.0000000000000000       -3.2156123764820282E-034  -2.9761114797999641E-033   3.9472352069717042E-020  -3.9102038694254420E-020  -5.7023845961553143E-044   2.0882465056487227E-018  -2.9466281148552209E-017   1.2758907619319657E-046   0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        9.9999997274357837E-017   0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        2.2623035880847228E-019   5.4451688170093292E-021   3.2379418603088154E-018   1.0627943284502965E-020  -4.9711921327738662E-034  -3.2156123764820590E-034   0.0000000000000000        9.9999997274356616E-017   3.5148694390225191E-030  -2.4388493384535447E-019   2.5342637416115487E-019   4.7555244218292338E-043  -2.4722756055056499E-019   1.1735776264307096E-018  -1.0778680707388524E-047  -3.0309951853467654E-019  -6.3332511730487297E-020   6.5549974883072638E-017  -1.2083281728320704E-019   8.7991123639759112E-033  -2.9761114797999973E-033   0.0000000000000000        3.5148694390225191E-030   9.9999997274346521E-017  -4.2678422732768867E-018   4.5522423210904616E-018   4.1202993697239306E-042  -2.9954969666471546E-018   5.3919240977199625E-018  -1.3490595851756201E-046  -7.6795654462165433E-007   2.6151520208723935E-007  -3.4497840981916414E-004   4.6707453598010463E-007  -6.2946552223450909E-020   3.9472352069717042E-020   0.0000000000000000       -2.4388493384535577E-019  -4.2678422732768882E-018   2.5965476303420939E-005  -2.5491120798292102E-005  -3.6818771286169560E-029   1.8236132150791523E-005  -5.9478759017371485E-005   1.0066519899400499E-033   7.6051632203639805E-007  -2.5791429700830016E-007   3.3746449314963928E-004  -4.6143058532875056E-007   6.2347784421671181E-020  -3.9102038694254354E-020   0.0000000000000000        2.5342637416115612E-019   4.5522423210904655E-018  -2.5491120798292115E-005   2.5093963622508344E-005  -1.4999999591150065E-016  -1.7890291090054506E-005   5.8860981855647624E-005  -9.8543803215215433E-034   7.8886090522101181E-031  -2.9582283945787943E-031   6.0584517520973707E-028  -7.8886090522101181E-031   1.1210387714598537E-043  -5.6051938572992683E-044   0.0000000000000000        4.4841550858394146E-043   4.3047888824058380E-042  -2.5243548967072378E-029  -1.4999999591149611E-016   9.9999997274357837E-017  -3.1554436208840472E-029   7.5730646901217133E-029  -1.2744735289059618E-057  -7.9420957573707755E-007   3.2075265176003360E-007  -2.4498364705475423E-004   5.7979776984326862E-007  -2.1041626550818678E-018   2.0882465056487223E-018   0.0000000000000000       -2.4722756055056576E-019  -2.9954969666471557E-018   1.8236132150791527E-005  -1.7890291090054506E-005  -2.5808084383317684E-029   1.5412059137700598E-004  -2.1966649763125600E-003   1.1218641716429977E-032   4.7297808522169561E-006  -2.3120510769602150E-006   6.8419514419784232E-004  -4.0259725476406946E-006   2.9474626952259823E-017  -2.9466281148552203E-017   0.0000000000000000        1.1735776264307102E-018   5.3919240977199632E-018  -5.9478759017371567E-005   5.8860981855647719E-005   8.6198881391404608E-029  -2.1966649763125608E-003   4.7388118572267990E-002  -1.4999999591153698E-016  -1.2037062152420224E-034  -3.0092655381050560E-036  -2.3111159332646830E-032  -4.2129717533470784E-035  -1.7516230804060213E-046   1.3137173103045160E-046   0.0000000000000000       -1.6421466378806450E-047  -1.7516230804060213E-046   1.3481509610710651E-033  -9.6296497219361793E-034  -1.4337827200192070E-057   1.2325951644078309E-032  -1.4999999591153703E-016   9.9999997274357837E-017
+ # d
+  -221242.05217570518        6016909.3761669500       -4606.2285362349985       -2417579.9788300116        1256.3209660576365       -84.602877773393445        0.0000000000000000        390.01293937503948       -325.79069881466000       -154885.59415009656       -53152.940381374079       -79729.410572061126        27330.598633253205        1455.1784199065148        2182.7676298597717     
+ # da
+ -0.16741716216663019       -5.1343330555306699E-003 -0.35970441347175175       -1.1847938194242579E-002  -3.6070898449261303E-015   4.1610170077570251E-015   0.0000000000000000        3.5890177435002797E-016  -1.1362150326039173E-014  -5.1621096478278422E-002   5.2091926085710824E-002   9.5399778214387846E-026  0.97447134732033236        6.6294905810788256       -1.0097419586828951E-028