tkmatrix 0.8.0__tar.gz → 0.8.2__tar.gz

{tkmatrix-0.8.0/tkmatrix.egg-info → tkmatrix-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkmatrix
-Version: 0.8.0
+Version: 0.8.2
 Summary: ToolKit for Multi-phAse Transits Recovery from Injected eXoplanets
 Home-page: https://github.com/PlanetHunters/tkmatrix
 Author: M. Dévora-Pajares & F.J. Pozuelos

{tkmatrix-0.8.0 → tkmatrix-0.8.2}/setup.py

@@ -2,7 +2,7 @@ import setuptools
 
 with open("README.md", "r") as fh:
     long_description = fh.read()
-version = "0.8.0"
+version = "0.8.2"
 setuptools.setup(
     name="tkmatrix",
     version=version,

{tkmatrix-0.8.0 → tkmatrix-0.8.2}/tkmatrix/custom_algorithms/BlsCustomSearchAlgorithm.py

@@ -20,7 +20,7 @@ class BlsCustomSearchAlgorithm(CustomSearchAlgorithm):
 
     def search(self, time, flux, rstar, rstar_min, rstar_max, mass, mstar_min, mstar_max,
                ab, epoch, period, min_period, max_period, min_snr, cores, transit_template, detrend_method, ws,
-               transits_min_count, signal_selection_mode, run_limit):
+               transits_min_count, signal_selection_mode, run_limit, oversampling):
 
         snr = 1e12
         found_signal = False
@@ -37,7 +37,6 @@ class BlsCustomSearchAlgorithm(CustomSearchAlgorithm):
         periods = []
         t0s = []
         while snr >= min_snr and not found_signal and (run_limit > 0 and run < run_limit):
-            oversampling = 1
             star_info = StarInfo(mass=mass, radius=rstar)
             tls_period_grid, oversampling = LcbuilderHelper.calculate_period_grid(time, min_period, max_period,
                                                                                   oversampling, star_info,
@@ -45,13 +44,14 @@ class BlsCustomSearchAlgorithm(CustomSearchAlgorithm):
             lc = lightkurve.LightCurve(time=time, flux=flux)
             results = lc.to_periodogram(method='bls', period=tls_period_grid)
             max_power_index = np.argmax(results.power)
-            snr = results.snr[max_power_index].value / np.nanmedian(results.snr).value
             sde = results.power[max_power_index].value / np.nanmedian(results.power).value
             t0 = results.transit_time_at_max_power.value
             duration = results.duration_at_max_power.value
             found_period = results.period_at_max_power.value
+            intransit_result = transit_mask(time, found_period, 2 * duration, t0)
+            oot_flux = flux[~intransit_result]
+            snr = results.snr[max_power_index].value / np.nanstd(oot_flux)
             if snr >= min_snr:
-                intransit_result = transit_mask(time, found_period, 2 * duration, t0)
                 time = time[~intransit_result]
                 flux = flux[~intransit_result]
                 time, flux = cleaned_array(time, flux)

{tkmatrix-0.8.0 → tkmatrix-0.8.2}/tkmatrix/custom_algorithms/custom_search.py

@@ -12,7 +12,7 @@ class CustomSearchAlgorithm(ABC):
     def search(self, time, flux, rstar, rstar_min, rstar_max, mass, mstar_min, mstar_max,
                ab, epoch, period, min_period, max_period, min_snr, cores,
                transit_template, detrend_method, ws, transits_min_count,
-               signal_selection_mode, run_limit):
+               signal_selection_mode, run_limit, oversampling):
 
         """
         Searches for a signal with a given epoch and period in the signal given by time and flux.
@@ -38,5 +38,6 @@ class CustomSearchAlgorithm(ABC):
         :param transits_min_count: the minimum number of transits for a signal to be valid
         :param signal_selection_mode: the way for retrieving the signal
         :param run_limit: the number of runs to limit the search
+        :param oversampling: the density of the period grid
         """
         pass

{tkmatrix-0.8.0 → tkmatrix-0.8.2}/tkmatrix/tkmatrix_class.py

@@ -405,7 +405,7 @@ class MATRIX:
         bigger ones.
         """
         assert detrend_ws is not None and isinstance(detrend_ws, (int, float))
-        assert transit_template in ('tls', 'bls')
+        assert transit_template in ('tls', 'bls', 'bls-periodogram')
         assert inject_dir is not None and isinstance(inject_dir, str)
         assert detrend_method == self.DETREND_GP or detrend_method == self.DETREND_BIWEIGHT
         if transit_template == 'tls':
@@ -662,7 +662,7 @@ class MATRIX:
                     .search(time, flux, rstar, rstar_min, rstar_max, mass, mstar_min, mstar_max,
                             ab, epoch, period, min_period, max_period, min_snr, self.cores,
                             transit_template, detrend_method, ws, transits_min_count,
-                            signal_selection_mode, run_limit)
+                            signal_selection_mode, run_limit, oversampling)
         else:
             return self.__tls_search(time, flux, rstar, rstar_min, rstar_max, mass, mstar_min, mstar_max, ab, epoch,
                                      period, min_period, max_period, min_snr, self.cores, transit_template,

{tkmatrix-0.8.0 → tkmatrix-0.8.2/tkmatrix.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkmatrix
-Version: 0.8.0
+Version: 0.8.2
 Summary: ToolKit for Multi-phAse Transits Recovery from Injected eXoplanets
 Home-page: https://github.com/PlanetHunters/tkmatrix
 Author: M. Dévora-Pajares & F.J. Pozuelos