PyTransit 2.6.19__tar.gz → 2.7.0__tar.gz

{pytransit-2.6.19 → pytransit-2.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyTransit
-Version: 2.6.19
+Version: 2.7.0
 Summary: Fast and painless exoplanet transit light curve modelling.
 Author-email: Hannu Parviainen <hpparvi@gmail.com>
 License: GPLv2

{pytransit-2.6.19 → pytransit-2.7.0}/PyTransit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyTransit
-Version: 2.6.19
+Version: 2.7.0
 Summary: Fast and painless exoplanet transit light curve modelling.
 Author-email: Hannu Parviainen <hpparvi@gmail.com>
 License: GPLv2

{pytransit-2.6.19 → pytransit-2.7.0}/PyTransit.egg-info/SOURCES.txt

@@ -95,7 +95,9 @@ pytransit/models/opencl/qpower2.cl
 pytransit/models/roadrunner/__init__.py
 pytransit/models/roadrunner/common.py
 pytransit/models/roadrunner/ecintersection.py
+pytransit/models/roadrunner/esmodel.py
 pytransit/models/roadrunner/model.py
+pytransit/models/roadrunner/model_ecspec.py
 pytransit/models/roadrunner/model_full.py
 pytransit/models/roadrunner/model_simple.py
 pytransit/models/roadrunner/model_trspec.py

{pytransit-2.6.19 → pytransit-2.7.0}/pytransit/__init__.py

@@ -41,7 +41,7 @@ Date
 
 """
 
-__version__ = '2.6.19'
+__version__ = '2.7.0'
 
 # Generic
 # -------
@@ -59,7 +59,7 @@ from .models.general import GeneralModel
 from .models.osmodel import OblateStarModel
 from .models.gdmodel import GravityDarkenedModel
 
-from .models import RoadRunnerModel, OblatePlanetModel, TransmissionSpectroscopyModel
+from .models import RoadRunnerModel, OblatePlanetModel, TransmissionSpectroscopyModel, EclipseSpectroscopyModel, ESModel
 
 TSModel = TransmissionSpectroscopyModel
 OPModel = OblatePlanetModel

{pytransit-2.6.19 → pytransit-2.7.0}/pytransit/models/__init__.py

@@ -14,11 +14,13 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from .transitmodel import TransitModel
+from .transitmodel import TransitModel  # noqa
 from .roadrunner.rrmodel import RoadRunnerModel
 from .roadrunner.opmodel import OblatePlanetModel
 from .roadrunner.tsmodel import TransmissionSpectroscopyModel
+from .roadrunner.esmodel import EclipseSpectroscopyModel
 
 RRModel = RoadRunnerModel
 OPModel = OblatePlanetModel
 TSModel = TransmissionSpectroscopyModel
+ESModel = EclipseSpectroscopyModel

pytransit-2.7.0/pytransit/models/roadrunner/esmodel.py

@@ -0,0 +1,88 @@
+#  PyTransit: fast and easy exoplanet transit modelling in Python.
+#  Copyright (C) 2010-2019  Hannu Parviainen
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+from typing import Union, List, Optional
+
+from numpy import ndarray, atleast_1d
+from numba import njit
+
+from ..transitmodel import TransitModel
+from .model_ecspec import esmodel
+
+__all__ = ['EclipseSpectroscopyModel']
+
+
+class EclipseSpectroscopyModel(TransitModel):
+
+    def __init__(self, parallel: bool = False):
+        self.parallel = parallel
+        self.model = njit(parallel=parallel, fastmath=False)(esmodel)
+        super().__init__()
+
+    def evaluate(self, f: ndarray, k: Union[float, ndarray], t0: Union[float, ndarray], p: Union[float, ndarray],
+                 a: Union[float, ndarray], i: Union[float, ndarray], e: Union[float, ndarray] = 0.0,
+                 w: Union[float, ndarray] = 0.0) -> ndarray:
+        """Evaluate the transit model for a set of scalar or vector parameters.
+
+        Parameters
+        ----------
+        f
+            Flux ratios either as a 1D vector or 2D array
+        k
+            Radius ratio either as a single float or a 1D vector.
+        t0
+            Transit center(s) as a float or a 1D vector.
+        p
+            Orbital period(s) as a float or a 1D vector.
+        a
+            Orbital semi-major axis (axes) divided by the stellar radius as a float or a 1D vector.
+        i
+            Orbital inclination(s) as a float or a 1D vector.
+        e : optional
+            Orbital eccentricity as a float or a 1D vector.
+        w : optional
+            Argument of periastron as a float or a 1D vector.
+
+        Notes
+        -----
+        The model can be evaluated either for one set of parameters or for many sets of parameters simultaneously. In
+        the first case, the orbital parameters should all be given as floats. In the second case, the orbital parameters
+        should be given as a 1D array-like.
+
+        Returns
+        -------
+        ndarray
+            Modelled flux either as a 3D ndarray.
+        """
+        k, t0, p, a, i, e, w = map(atleast_1d, (k, t0, p, a, i, e, w))
+        return self.model(self.time, k, t0, p, a, i, e, w, f, self.nsamples[0], self.exptimes[0])
+
+    def __call__(self, f: ndarray, k: Union[float, ndarray], t0: Union[float, ndarray], p: Union[float, ndarray],
+                 a: Union[float, ndarray], i: Union[float, ndarray], e: Union[float, ndarray] = 0.0,
+                 w: Union[float, ndarray] = 0.0) -> ndarray:
+        return self.evaluate(f, k, t0, p, a, i, e, w)

pytransit-2.7.0/pytransit/models/roadrunner/model_ecspec.py

@@ -0,0 +1,60 @@
+from math import fabs, floor
+
+from meepmeep.utils import d_from_pkaiews, eclipse_phase
+from meepmeep.xy.position import solve_xy_p5s, pd_t15sc
+from numpy import zeros, ndarray, isnan, nan, pi
+
+from .common import circle_circle_intersection_area_kite as ccia
+
+__all__ = ['esmodel']
+
+
+def esmodel(times: ndarray, k: ndarray, t0: ndarray, p: ndarray, a: ndarray, i: ndarray, e: ndarray, w: ndarray,
+            fratio: ndarray, nsamples: int, exptime: float) -> ndarray:
+    if k.ndim != 1:
+        raise ValueError(" The radius ratio must be given as an 1D array with shape (npv)")
+
+    if fratio.ndim != 2:
+        raise ValueError(" The flux ratio must be given as a 2D array with shape (npv, npb)")
+
+    npt = times.size
+    npv = fratio.shape[0]
+    npb = fratio.shape[1]
+
+    flux = zeros((npv, npb, npt))  # Model flux
+    xyc = zeros((2, 5))  # Taylor series coefficients for the (x, y) position
+
+    for ipv in range(npv):
+        if isnan(a[ipv]) or (a[ipv] <= 1.0) or (e[ipv] < 0.0):
+            flux[ipv, :, :] = nan
+            continue
+
+        # -----------------------------------------------------#
+        # Calculate the Taylor series expansions for the orbit #
+        # -----------------------------------------------------#
+        eclipse_shift = eclipse_phase(p[ipv], i[ipv], e[ipv], w[ipv])
+        xyc[:, :] = solve_xy_p5s(eclipse_shift, p[ipv], a[ipv], i[ipv], e[ipv], w[ipv])
+        te = t0[ipv] + eclipse_shift
+
+        # --------------------------------#
+        # Calculate the half-window width #
+        # --------------------------------#
+        hww = 0.5 * d_from_pkaiews(p[ipv], k[ipv], a[ipv], i[ipv], e[ipv], w[ipv], -1, 14)
+        hww = 0.0015 + exptime + hww
+
+        # --------------------------#
+        # Calculate the light curve #
+        # --------------------------#
+        for ipt in range(npt):
+            epoch = floor((times[ipt] - te + 0.5 * p[ipv]) / p[ipv])
+            tc = times[ipt] - (te + epoch * p[ipv])
+            if fabs(tc) > hww:
+                flux[ipv, :, ipt] = 1.0
+            else:
+                for isample in range(1, nsamples + 1):
+                    time_offset = exptime * ((isample - 0.5) / nsamples - 0.5)
+                    z = pd_t15sc(tc + time_offset, xyc)
+                    flux[ipv, :, ipt] += 1.0 - (fratio[ipv, :] * ccia(1.0, k[ipv], z)[0] / pi) / (
+                                1.0 + fratio[ipv, :] * k[ipv] ** 2)
+                flux[ipv, :, ipt] /= nsamples
+    return flux