merge conflicts resolved

rpoleski · Oct 15, 2021 · 8e7b58e · 8e7b58e
2 parents 6b25b91 + 18ac6d0
commit 8e7b58e
Show file tree

Hide file tree

Showing 42 changed files with 278 additions and 185 deletions.
diff --git a/docs/.buildinfo b/docs/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 966a4d38055b40c0f3363ddf416e532a
+config: 16f9e9060382d38467373b4fcc70b206
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/.doctrees/environment.pickle b/docs/.doctrees/environment.pickle
diff --git a/docs/MulensModel.binarylens.html b/docs/MulensModel.binarylens.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>MulensModel.binarylens module &#8212; MulensModel 2.0.0 documentation</title>
+    <title>MulensModel.binarylens module &#8212; MulensModel 2.1.0 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -37,7 +37,7 @@
 <dl class="py class">
 <dt id="MulensModel.binarylens.BinaryLens">
 <em class="property">class </em><code class="sig-prename descclassname">MulensModel.binarylens.</code><code class="sig-name descname">BinaryLens</code><span class="sig-paren">(</span><em class="sig-param"><span class="n">mass_1</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">mass_2</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">separation</span><span class="o">=</span><span class="default_value">None</span></em><span class="sig-paren">)</span><a class="headerlink" href="#MulensModel.binarylens.BinaryLens" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.9)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
+<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.10)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
 <p>The binary lens equation - its solutions, images, parities,
 magnifications, etc.</p>
 <p>The binary lens equation is a 5th order complex polynomial.</p>

diff --git a/docs/MulensModel.caustics.html b/docs/MulensModel.caustics.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>MulensModel.caustics module &#8212; MulensModel 2.0.0 documentation</title>
+    <title>MulensModel.caustics module &#8212; MulensModel 2.1.0 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -37,7 +37,7 @@
 <dl class="py class">
 <dt id="MulensModel.caustics.Caustics">
 <em class="property">class </em><code class="sig-prename descclassname">MulensModel.caustics.</code><code class="sig-name descname">Caustics</code><span class="sig-paren">(</span><em class="sig-param"><span class="n">q</span></em>, <em class="sig-param"><span class="n">s</span></em><span class="sig-paren">)</span><a class="headerlink" href="#MulensModel.caustics.Caustics" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.9)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
+<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.10)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
 <p>Class for the caustic structure corresponding to a given (<em>q</em>, <em>s</em>),
 i.e. mass ratio and separation. Implemented for 2-body lenses only.</p>
 <dl class="simple">
@@ -100,7 +100,7 @@
 <dl class="py class">
 <dt id="MulensModel.caustics.Caustics.CriticalCurve">
 <em class="property">class </em><code class="sig-name descname">CriticalCurve</code><a class="headerlink" href="#MulensModel.caustics.Caustics.CriticalCurve" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.9)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
+<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.10)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
 <p>Internal class of <a class="reference internal" href="#MulensModel.caustics.Caustics" title="MulensModel.caustics.Caustics"><code class="xref py py-class docutils literal notranslate"><span class="pre">Caustics</span></code></a>. Defines the critical
 curve (in the lens plane). Origin is center of mass with
 larger mass on the left (<em>q</em> &lt; 1).</p>

diff --git a/docs/MulensModel.coordinates.html b/docs/MulensModel.coordinates.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>MulensModel.coordinates module &#8212; MulensModel 2.0.0 documentation</title>
+    <title>MulensModel.coordinates module &#8212; MulensModel 2.1.0 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>

diff --git a/docs/MulensModel.event.html b/docs/MulensModel.event.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>MulensModel.event module &#8212; MulensModel 2.0.0 documentation</title>
+    <title>MulensModel.event module &#8212; MulensModel 2.1.0 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -37,7 +37,7 @@
 <dl class="py class">
 <dt id="MulensModel.event.Event">
 <em class="property">class </em><code class="sig-prename descclassname">MulensModel.event.</code><code class="sig-name descname">Event</code><span class="sig-paren">(</span><em class="sig-param"><span class="n">datasets</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">model</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">coords</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">fix_blend_flux</span><span class="o">=</span><span class="default_value">{}</span></em>, <em class="sig-param"><span class="n">fix_source_flux</span><span class="o">=</span><span class="default_value">{}</span></em>, <em class="sig-param"><span class="n">fix_source_flux_ratio</span><span class="o">=</span><span class="default_value">{}</span></em>, <em class="sig-param"><span class="n">data_ref</span><span class="o">=</span><span class="default_value">0</span></em><span class="sig-paren">)</span><a class="headerlink" href="#MulensModel.event.Event" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.9)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
+<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.10)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
 <p>Combines a microlensing model with data. Allows calculating chi^2 and
 making a number of plots.</p>
 <dl>

diff --git a/docs/MulensModel.fitdata.html b/docs/MulensModel.fitdata.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>MulensModel.fitdata module &#8212; MulensModel 2.0.0 documentation</title>
+    <title>MulensModel.fitdata module &#8212; MulensModel 2.1.0 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -37,7 +37,7 @@
 <dl class="py class">
 <dt id="MulensModel.fitdata.FitData">
 <em class="property">class </em><code class="sig-prename descclassname">MulensModel.fitdata.</code><code class="sig-name descname">FitData</code><span class="sig-paren">(</span><em class="sig-param"><span class="n">model</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">dataset</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">fix_blend_flux</span><span class="o">=</span><span class="default_value">False</span></em>, <em class="sig-param"><span class="n">fix_source_flux</span><span class="o">=</span><span class="default_value">False</span></em>, <em class="sig-param"><span class="n">fix_source_flux_ratio</span><span class="o">=</span><span class="default_value">False</span></em><span class="sig-paren">)</span><a class="headerlink" href="#MulensModel.fitdata.FitData" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.9)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
+<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.10)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
 <p>Performs a least squares linear fit for given dataset and model to
 determine the source flux(es) and (optionally) blend flux. After creating
 the object, you must run <a class="reference internal" href="#MulensModel.fitdata.FitData.update" title="MulensModel.fitdata.FitData.update"><code class="xref py py-func docutils literal notranslate"><span class="pre">update()</span></code></a> to perform the linear fit for
@@ -146,7 +146,10 @@
 <code class="sig-name descname">get_model_magnitudes</code><span class="sig-paren">(</span><em class="sig-param"><span class="o">**</span><span class="n">kwargs</span></em><span class="sig-paren">)</span><a class="headerlink" href="#MulensModel.fitdata.FitData.get_model_magnitudes" title="Permalink to this definition">¶</a></dt>
 <dd><p>Calculate model in magnitude space</p>
 <dl class="simple">
-<dt>Arguments:</dt><dd><p><a href="#id1"><span class="problematic" id="id2">**</span></a>kwargs: see <a class="reference internal" href="#MulensModel.fitdata.FitData.get_model_fluxes" title="MulensModel.fitdata.FitData.get_model_fluxes"><code class="xref py py-func docutils literal notranslate"><span class="pre">get_model_fluxes()</span></code></a></p>
+<dt>Arguments :</dt><dd><dl class="simple">
+<dt><code class="docutils literal notranslate"><span class="pre">**kwargs</span></code>:</dt><dd><p>see <a class="reference internal" href="#MulensModel.fitdata.FitData.get_model_fluxes" title="MulensModel.fitdata.FitData.get_model_fluxes"><code class="xref py py-func docutils literal notranslate"><span class="pre">get_model_fluxes()</span></code></a></p>
+</dd>
+</dl>
 </dd>
 <dt>Returns :</dt><dd><dl class="simple">
 <dt>model_mag: <em>np.ndarray</em></dt><dd><p>The model magnitude evaluated for each datapoint.</p>
@@ -336,7 +339,7 @@
 <dd><dl class="simple">
 <dt>Returns :</dt><dd><dl class="simple">
 <dt>blend_flux: <em>float</em></dt><dd><p>the fitted blend flux or the value set by
-fix_blend_flux (see <a class="reference external" href="https://docs.python.org/3/reference/lexical_analysis.html#keywords" title="(in Python v3.9)"><span>Keywords</span></a>).</p>
+fix_blend_flux (see <a class="reference external" href="https://docs.python.org/3/reference/lexical_analysis.html#keywords" title="(in Python v3.10)"><span>Keywords</span></a>).</p>
 </dd>
 </dl>
 </dd>
@@ -352,7 +355,7 @@
 <dl class="simple">
 <dt>Returns :</dt><dd><dl class="simple">
 <dt>source_flux_ratio: <em>float</em></dt><dd><p>the ratio of the fitted source fluxes or the value set by
-fix_source_flux_ratio (see <a class="reference external" href="https://docs.python.org/3/reference/lexical_analysis.html#keywords" title="(in Python v3.9)"><span>Keywords</span></a>).</p>
+fix_source_flux_ratio (see <a class="reference external" href="https://docs.python.org/3/reference/lexical_analysis.html#keywords" title="(in Python v3.10)"><span>Keywords</span></a>).</p>
 </dd>
 </dl>
 </dd>

diff --git a/docs/MulensModel.horizons.html b/docs/MulensModel.horizons.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>MulensModel.horizons module &#8212; MulensModel 2.0.0 documentation</title>
+    <title>MulensModel.horizons module &#8212; MulensModel 2.1.0 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -37,7 +37,7 @@
 <dl class="py class">
 <dt id="MulensModel.horizons.Horizons">
 <em class="property">class </em><code class="sig-prename descclassname">MulensModel.horizons.</code><code class="sig-name descname">Horizons</code><span class="sig-paren">(</span><em class="sig-param"><span class="n">file_name</span></em><span class="sig-paren">)</span><a class="headerlink" href="#MulensModel.horizons.Horizons" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.9)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
+<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.10)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
 <p>An Object to read and hold the standard JPL Horizons output,
 i.e. satellite ephemerides.</p>
 <dl class="simple">

diff --git a/docs/MulensModel.html b/docs/MulensModel.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>MulensModel package &#8212; MulensModel 2.0.0 documentation</title>
+    <title>MulensModel package &#8212; MulensModel 2.1.0 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -72,7 +72,6 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 <li class="toctree-l1"><a class="reference internal" href="MulensModel.uniformcausticsampling.html">MulensModel.uniformcausticsampling module</a></li>
 <li class="toctree-l1"><a class="reference internal" href="MulensModel.utils.html">MulensModel.utils module</a></li>
 <li class="toctree-l1"><a class="reference internal" href="MulensModel.version.html">MulensModel.version module</a></li>
-<li class="toctree-l1"><a class="reference internal" href="MulensModel.x.html">MulensModel.x module</a></li>
 </ul>
 </div>
 </div>

diff --git a/docs/MulensModel.limbdarkeningcoeffs.html b/docs/MulensModel.limbdarkeningcoeffs.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>MulensModel.limbdarkeningcoeffs module &#8212; MulensModel 2.0.0 documentation</title>
+    <title>MulensModel.limbdarkeningcoeffs module &#8212; MulensModel 2.1.0 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -37,7 +37,7 @@
 <dl class="py class">
 <dt id="MulensModel.limbdarkeningcoeffs.LimbDarkeningCoeffs">
 <em class="property">class </em><code class="sig-prename descclassname">MulensModel.limbdarkeningcoeffs.</code><code class="sig-name descname">LimbDarkeningCoeffs</code><a class="headerlink" href="#MulensModel.limbdarkeningcoeffs.LimbDarkeningCoeffs" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.9)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
+<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.10)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
 <p>Linear limb-darkening parameters. Both <em>gamma</em> and <em>u</em> conventions
 can be used.  The <em>u</em> convention is more frequently used in
 studies other than microlensing.  It has fixed flux at the center.

diff --git a/docs/MulensModel.magnificationcurve.html b/docs/MulensModel.magnificationcurve.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>MulensModel.magnificationcurve module &#8212; MulensModel 2.0.0 documentation</title>
+    <title>MulensModel.magnificationcurve module &#8212; MulensModel 2.1.0 documentation</title>
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -37,7 +37,7 @@
 <dl class="py class">
 <dt id="MulensModel.magnificationcurve.MagnificationCurve">
 <em class="property">class </em><code class="sig-prename descclassname">MulensModel.magnificationcurve.</code><code class="sig-name descname">MagnificationCurve</code><span class="sig-paren">(</span><em class="sig-param"><span class="n">times</span></em>, <em class="sig-param"><span class="n">parameters</span></em>, <em class="sig-param"><span class="n">parallax</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">coords</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">satellite_skycoord</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">gamma</span><span class="o">=</span><span class="default_value">0.0</span></em><span class="sig-paren">)</span><a class="headerlink" href="#MulensModel.magnificationcurve.MagnificationCurve" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.9)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
+<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.10)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
 <p>The magnification curve calculated from the model light curve.</p>
 <p>The key function is <a class="reference internal" href="#MulensModel.magnificationcurve.MagnificationCurve.set_magnification_methods" title="MulensModel.magnificationcurve.MagnificationCurve.set_magnification_methods"><code class="xref py py-func docutils literal notranslate"><span class="pre">set_magnification_methods()</span></code></a>, which
 specifies the method used to calculate the finite source