bug fixes, issues 38 & 39

README.md

@@ -136,7 +136,7 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduc
 
 We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/BlackHolePerturbationToolkit/FastEMRIWaveforms/tags).
 
-Current Version: 1.4.0
+Current Version: 1.4.1
 
 ## Authors
 

docs/html/README.html

@@ -382,7 +382,7 @@ <h2>Versioning<a class="headerlink" href="#versioning" title="Permalink to this
 <p>We use <a class="reference external" href="http://semver.org/">SemVer</a> for versioning. For the versions
 available, see the <a class="reference external" href="https://github.com/BlackHolePerturbationToolkit/FastEMRIWaveforms/tags">tags on this
 repository</a>.</p>
-<p>Current Version: 1.4.0</p>
+<p>Current Version: 1.4.1</p>
 </div>
 <div class="section" id="authors">
 <h2>Authors<a class="headerlink" href="#authors" title="Permalink to this headline">¶</a></h2>

docs/html/_sources/README.rst.txt

@@ -199,7 +199,7 @@ We use `SemVer <http://semver.org/>`__ for versioning. For the versions
 available, see the `tags on this
 repository <https://github.com/BlackHolePerturbationToolkit/FastEMRIWaveforms/tags>`__.
 
-Current Version: 1.4.0
+Current Version: 1.4.1
 
 Authors
 -------

docs/html/_sources/general/docs_main.rst.txt

@@ -34,6 +34,7 @@ Package TODOs
 Change Log
 ===========
 
+- 1.4.1: Bug fixes.
 - 1.4.0: Ability to access OMP threads. Set CUDA device. Change fundamental frequency files to "utility". Initial error handler. Trajectory overhaul. get_at_t function updates.
 - 1.3.7: Fixed get_at_t functions. Added new GPU architecture. Removed oldest architecture. Fixed issue #30 & #32.
 - 1.3.6: Fixed Y0 < 0.0 in new AAK.

docs/html/general/docs_main.html

@@ -238,6 +238,7 @@ <h1>Package TODOs<a class="headerlink" href="#package-todos" title="Permalink to
 <div class="section" id="change-log">
 <h1>Change Log<a class="headerlink" href="#change-log" title="Permalink to this headline">¶</a></h1>
 <ul class="simple">
+<li><p>1.4.1: Bug fixes.</p></li>
 <li><p>1.4.0: Ability to access OMP threads. Set CUDA device. Change fundamental frequency files to “utility”. Initial error handler. Trajectory overhaul. get_at_t function updates.</p></li>
 <li><p>1.3.7: Fixed get_at_t functions. Added new GPU architecture. Removed oldest architecture. Fixed issue #30 &amp; #32.</p></li>
 <li><p>1.3.6: Fixed Y0 &lt; 0.0 in new AAK.</p></li>

docs/html/index.html

@@ -390,7 +390,7 @@ <h2>Versioning<a class="headerlink" href="#versioning" title="Permalink to this
 <p>We use <a class="reference external" href="http://semver.org/">SemVer</a> for versioning. For the versions
 available, see the <a class="reference external" href="https://github.com/BlackHolePerturbationToolkit/FastEMRIWaveforms/tags">tags on this
 repository</a>.</p>
-<p>Current Version: 1.4.0</p>
+<p>Current Version: 1.4.1</p>
 </div>
 <div class="section" id="authors">
 <h2>Authors<a class="headerlink" href="#authors" title="Permalink to this headline">¶</a></h2>

docs/html/user/util.html

@@ -821,7 +821,7 @@
 
 <dl class="py function">
 <dt id="few.utils.utility.get_p_at_t">
-<code class="sig-prename descclassname">few.utils.utility.</code><code class="sig-name descname">get_p_at_t</code><span class="sig-paren">(</span><em class="sig-param"><span class="n">traj_module</span></em>, <em class="sig-param"><span class="n">t_out</span></em>, <em class="sig-param"><span class="n">traj_args</span></em>, <em class="sig-param"><span class="n">index_of_p</span><span class="o">=</span><span class="default_value">3</span></em>, <em class="sig-param"><span class="n">index_of_a</span><span class="o">=</span><span class="default_value">2</span></em>, <em class="sig-param"><span class="n">index_of_e</span><span class="o">=</span><span class="default_value">4</span></em>, <em class="sig-param"><span class="n">index_of_x</span><span class="o">=</span><span class="default_value">5</span></em>, <em class="sig-param"><span class="n">kerr_separatrix</span><span class="o">=</span><span class="default_value">True</span></em>, <em class="sig-param"><span class="n">bounds</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="o">**</span><span class="n">kwargs</span></em><span class="sig-paren">)</span><a class="headerlink" href="#few.utils.utility.get_p_at_t" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">few.utils.utility.</code><code class="sig-name descname">get_p_at_t</code><span class="sig-paren">(</span><em class="sig-param"><span class="n">traj_module</span></em>, <em class="sig-param"><span class="n">t_out</span></em>, <em class="sig-param"><span class="n">traj_args</span></em>, <em class="sig-param"><span class="n">index_of_p</span><span class="o">=</span><span class="default_value">3</span></em>, <em class="sig-param"><span class="n">index_of_a</span><span class="o">=</span><span class="default_value">2</span></em>, <em class="sig-param"><span class="n">index_of_e</span><span class="o">=</span><span class="default_value">4</span></em>, <em class="sig-param"><span class="n">index_of_x</span><span class="o">=</span><span class="default_value">5</span></em>, <em class="sig-param"><span class="n">bounds</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="o">**</span><span class="n">kwargs</span></em><span class="sig-paren">)</span><a class="headerlink" href="#few.utils.utility.get_p_at_t" title="Permalink to this definition">¶</a></dt>
 <dd><p>Find the value of p that will give a specific length inspiral using Brent’s method.</p>
 <p>If you want to generate an inspiral that is a specific length, you
 can adjust p accordingly. This function tells you what that value of p
@@ -844,9 +844,6 @@
 <li><p><strong>index_of_a</strong> (<em>int</em><em>, </em><em>optional</em>) – Index of a in provided <code class="code docutils literal notranslate"><span class="pre">traj_module</span></code> arguments. Default is 2.</p></li>
 <li><p><strong>index_of_e</strong> (<em>int</em><em>, </em><em>optional</em>) – Index of e0 in provided <code class="code docutils literal notranslate"><span class="pre">traj_module</span></code> arguments. Default is 4.</p></li>
 <li><p><strong>index_of_x</strong> (<em>int</em><em>, </em><em>optional</em>) – Index of x0 in provided <code class="code docutils literal notranslate"><span class="pre">traj_module</span></code> arguments. Default is 5.</p></li>
-<li><p><strong>kerr_separatrix</strong> (<em>bool</em><em>, </em><em>optional</em>) – If True, the default lower bound of the root-finding will be
-(approximately) the Kerr separatrix. If False, uses the Schwarzchild separatrix 6 + 2e.
-Defaults to True.</p></li>
 <li><p><strong>bounds</strong> (<em>list</em><em>, </em><em>optional</em>) – Minimum and maximum values of p over which brentq will search for a root.
 If not given, will be set to [separatrix + 0.101, 50]. To supply only one of these two limits, set the
 other limit to None.</p></li>

docs/source/README.rst

@@ -199,7 +199,7 @@ We use `SemVer <http://semver.org/>`__ for versioning. For the versions
 available, see the `tags on this
 repository <https://github.com/BlackHolePerturbationToolkit/FastEMRIWaveforms/tags>`__.
 
-Current Version: 1.4.0
+Current Version: 1.4.1
 
 Authors
 -------

docs/source/general/docs_main.rst

@@ -34,6 +34,7 @@ Package TODOs
 Change Log
 ===========
 
+- 1.4.1: Bug fixes.
 - 1.4.0: Ability to access OMP threads. Set CUDA device. Change fundamental frequency files to "utility". Initial error handler. Trajectory overhaul. get_at_t function updates.
 - 1.3.7: Fixed get_at_t functions. Added new GPU architecture. Removed oldest architecture. Fixed issue #30 & #32.
 - 1.3.6: Fixed Y0 < 0.0 in new AAK.

few/utils/utility.py

@@ -576,7 +576,6 @@ def get_p_at_t(
     index_of_a=2,
     index_of_e=4,
     index_of_x=5,
-    kerr_separatrix=True,
     bounds=None,
     **kwargs,
 ):
@@ -603,9 +602,6 @@ def get_p_at_t(
         index_of_a (int, optional): Index of a in provided :code:`traj_module` arguments. Default is 2.
         index_of_e (int, optional): Index of e0 in provided :code:`traj_module` arguments. Default is 4.
         index_of_x (int, optional): Index of x0 in provided :code:`traj_module` arguments. Default is 5.
-        kerr_separatrix (bool, optional): If True, the default lower bound of the root-finding will be
-            (approximately) the Kerr separatrix. If False, uses the Schwarzchild separatrix 6 + 2e.
-            Defaults to True.
         bounds (list, optional): Minimum and maximum values of p over which brentq will search for a root.
             If not given, will be set to [separatrix + 0.101, 50]. To supply only one of these two limits, set the
             other limit to None.
@@ -624,20 +620,26 @@ def get_p_at_t(
     if index_of_x > index_of_p:
         index_of_x -= 1
 
+    if "traj_kwargs" in kwargs and "enforce_schwarz_sep" in kwargs["traj_kwargs"]:
+        enforce_schwarz_sep = kwargs["traj_kwargs"]["enforce_schwarz_sep"]
+
+    else:
+        enforce_schwarz_sep = False
+
     # fix bounds
     if bounds is None:
-        if kerr_separatrix:
+        if not enforce_schwarz_sep:
             p_sep = get_separatrix(
-                traj_args[index_of_a], traj_args[index_of_e], traj_args[index_of_Y]
+                traj_args[index_of_a], traj_args[index_of_e], traj_args[index_of_x]
             )  # should be fairly close.
         else:
             p_sep = 6 + 2 * traj_args[index_of_e]
         bounds = [p_sep + 0.101, 16.0 + 2 * traj_args[index_of_e]]
 
     elif bounds[0] is None:
-        if kerr_separatrix:
+        if not enforce_schwarz_sep:
             p_sep = get_separatrix(
-                traj_args[index_of_a], traj_args[index_of_e], traj_args[index_of_Y]
+                traj_args[index_of_a], traj_args[index_of_e], traj_args[index_of_x]
             )  # should be fairly close.
         else:
             p_sep = 6 + 2 * traj_args[index_of_e]
@@ -718,6 +720,7 @@ def get_mu_at_t(
     "1.3.6": 3981654,
     "1.3.7": 3981654,
     "1.4.0": 3981654,
+    "1.4.1": 3981654,
 }
 
 

src/ode_base.cc

@@ -46,7 +46,7 @@ void pn5(double* pdot, double* edot, double* Ydot,
 
     Nv = 7;
     ne = 10;
-    *Ydot = -epsilon * dYdt8H_5PNe10 (a, p, e, Y, Nv, ne);
+    *Ydot = epsilon * dYdt8H_5PNe10 (a, p, e, Y, Nv, ne);
 
     // convert to proper inclination input to fundamental frequencies
     double xI = Y_to_xI(a, p, e, Y);