tkmatrix 0.8.7__tar.gz → 0.9.0__tar.gz

{tkmatrix-0.8.7/tkmatrix.egg-info → tkmatrix-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkmatrix
-Version: 0.8.7
+Version: 0.9.0
 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.7 → tkmatrix-0.9.0}/setup.py

@@ -2,7 +2,7 @@ import setuptools
 
 with open("README.md", "r") as fh:
     long_description = fh.read()
-version = "0.8.7"
+version = "0.9.0"
 setuptools.setup(
     name="tkmatrix",
     version=version,
@@ -25,7 +25,7 @@ setuptools.setup(
                         'configparser==5.0.1',
                         "corner==2.1.0",
                         "ellc==1.8.5",
-                        "lcbuilder==0.16.2",
+                        "lcbuilder==0.18.0",
                         "mock==4.0.3",
                         'pyparsing==2.4.7', # Matplotlib dependency
                         "seaborn==0.11.1",

{tkmatrix-0.8.7 → tkmatrix-0.9.0}/tkmatrix/__main__.py

@@ -144,8 +144,7 @@ if __name__ == '__main__':
             ir.recovery_rv(inject_dir, rv['INITIAL_MASK'] if 'INITIAL_MASK' in rv else None,
                            rv['SNR_THRESHOLD'], rv['RUN_LIMIT'],
                            rv['MAX_PERIOD_SEARCH'], rv['OVERSAMPLING'] if 'OVERSAMPLING' in rv else 1)
-            ir.plot_results(target, inject_dir, period_grid, mass_grid, period_grid_geom=rv["PERIOD_GRID_GEOM"],
-                            radius_grid_geom=rv["MASS_GRID_GEOM"], is_rv=True)
+            ir.plot_results(target, inject_dir, is_rv=True)
     inject_dir, period_grid, radius_grid = ir.inject(matrix_user_properties["PHASES"],
                            matrix_user_properties["MIN_PERIOD"], matrix_user_properties["MAX_PERIOD"],
                            matrix_user_properties["STEPS_PERIOD"],
@@ -163,6 +162,5 @@ if __name__ == '__main__':
                 custom_search, matrix_user_properties["MAX_PERIOD_SEARCH"], matrix_user_properties["OVERSAMPLING"],
                 matrix_user_properties["SIGNAL_SELECTION_MODE"],
                 use_search_cache=matrix_user_properties["USE_SEARCH_CACHE"])
-    ir.plot_results(target, inject_dir, period_grid, radius_grid, period_grid_geom=matrix_user_properties["PERIOD_GRID_GEOM"],
-                    radius_grid_geom=matrix_user_properties["RADIUS_GRID_GEOM"])
+    ir.plot_results(target, inject_dir)
     print("Execution time: " + str(datetime.datetime.now() - start_time))

{tkmatrix-0.8.7 → tkmatrix-0.9.0}/tkmatrix/tkmatrix_class.py

@@ -497,8 +497,7 @@ class MATRIX:
                     os.remove(inject_dir + file)
 
     @staticmethod
-    def plot_results(object_id, inject_dir, period_grid=None, radius_grid=None, binning=1, xticks=None, yticks=None,
-                     period_grid_geom="lin", radius_grid_geom="lin", is_rv=False, planets_df=None):
+    def plot_results(object_id, inject_dir, binning=1, xticks=None, yticks=None, is_rv=False, planets_df=None):
         """
         Generates a heat map with the found/not found results for the period/radius grids
 
@@ -509,8 +508,6 @@ class MATRIX:
         :param binning: the binning to be applied to the grids
         :param xticks: the fixed ticks to be used for the period grid
         :param yticks: the fixed ticks to be used for the radius grid
-        :param period_grid_geom: [lin|log]
-        :param radius_grid_geom: [lin|log]
         :param is_rv: whether to load the rv results or the photometry ones
         :param planets_df: pandas dataframe with radius, period, name, radius_err_up, radius_err_bottom
         """
@@ -521,33 +518,10 @@ class MATRIX:
                          usecols=['period', column, 'found', 'sde'])
         min_period = df["period"].min()
         max_period = df["period"].max()
-        min_rad = df[column].min()
-        max_rad = df[column].max()
         phases = len(df[df["period"] == df["period"].min()][df[column] == df[column].min()])
         phases_str = "phase" if phases == 1 else "phases"
-        bin_nums = int(np.ceil(len(df["period"].unique()) / binning))
-        if period_grid is None:
-            if period_grid_geom == 'lin':
-                step_period = (max_period - min_period) / (len(df["period"].unique()) - 1)
-                step_period = step_period * binning
-                if step_period <= 0:
-                    step_period = 0.1
-                period_grid = np.linspace(min_period, max_period, bin_nums)\
-                    if max_period - min_period > 0 else np.full((1), min_period)
-            else:
-                period_grid = np.logspace(np.log10(min_period), np.log10(max_period), bin_nums)
-        if radius_grid is None:
-            bin_nums = int(np.ceil(len(df[column].unique()) / binning))
-            if radius_grid_geom == 'lin':
-                step_radius = (max_rad - min_rad) / (len(df[column].unique()) - 1)
-                step_radius = step_radius * binning
-                if step_radius <= 0:
-                    step_radius = 0.1
-                radius_grid = np.round(np.linspace(min_rad, max_rad, bin_nums), 2)\
-                    if max_rad - min_rad > 0 else np.full((1), min_rad)
-            else:
-                radius_grid = np.round(np.logspace(np.log10(min_rad), np.log10(max_rad), 2), bin_nums)
-        f = len(period_grid) / len(radius_grid)
+        period_grid = df['period'].unique()
+        radius_grid = df[column].unique()
         bins = [period_grid, radius_grid]
         h1, x, y = np.histogram2d(df['period'][df['found'] == 1], df[column][df['found'] == 1], bins=bins)
         h2, x, y = np.histogram2d(df['period'][df['found'] == 0], df[column][df['found'] == 0], bins=bins)
@@ -573,15 +547,14 @@ class MATRIX:
         ax.tick_params(axis='both', which='major', labelsize=14)
         if planets_df is not None:
             for index, row in planets_df.iterrows():
-                ax.errorbar([row['period']], [row['radius']],
-                            yerr=[np.full(1, row['radius_err_bottom']), np.full(1, row['radius_err_up'])],
+                ax.errorbar([row['period']], [row[column]],
+                            yerr=[np.full(1, row[column + '_err_bottom']), np.full(1, row[column + '_err_up'])],
                             fmt='o', color='firebrick', markersize=12)
         plt.savefig(inject_dir + '/inj-rec' + ('-rv' if is_rv else '') + '.png', bbox_inches='tight', dpi=200)
         plt.close()
 
     @staticmethod
-    def plot_diff(object_id, inject_dir1, inject_dir2, output_dir, binning=1, xticks=None, yticks=None,
-                  period_grid_geom="lin", radius_grid_geom="lin"):
+    def plot_diff(object_id, inject_dir1, inject_dir2, output_dir, binning=1, xticks=None, yticks=None):
         """
         Plots the difference between two results directories.
 
@@ -592,8 +565,6 @@ class MATRIX:
         :param binning: the binning to be applied to both axes
         :param xticks: the fixed ticks for the period bar
         :param yticks: the fixed ticks for the radius bar
-        :param period_grid_geom: [lin|log]
-        :param radius_grid_geom: [ling|log]
         """
         df1 = pd.read_csv(inject_dir1 + '/a_tls_report.csv', float_precision='round_trip', sep=',',
                          usecols=['period', 'radius', 'found', 'sde'])
@@ -601,31 +572,10 @@ class MATRIX:
                          usecols=['period', 'radius', 'found', 'sde'])
         min_period = df1["period"].min()
         max_period = df1["period"].max()
-        min_rad = df1["radius"].min()
-        max_rad = df1["radius"].max()
         phases = len(df1[df1["period"] == df1["period"].min()][df1["radius"] == df1["radius"].min()])
         phases_str = "phase" if phases == 1 else "phases"
-        bin_nums = int(np.ceil(len(df1["period"].unique()) / binning))
-        if period_grid_geom == 'lin':
-            step_period = (max_period - min_period) / (len(df1["period"].unique()) - 1)
-            step_period = step_period * binning
-            if step_period <= 0:
-                step_period = 0.1
-            period_grid = np.linspace(min_period, max_period, bin_nums)\
-                if max_period - min_period > 0 else np.full((1), min_period)
-        else:
-            period_grid = np.logspace(np.log10(min_period), np.log10(max_period), bin_nums)
-        bin_nums = int(np.ceil(len(df1["radius"].unique()) / binning))
-        if radius_grid_geom == 'lin':
-            step_radius = (max_rad - min_rad) / (len(df1["radius"].unique()) - 1)
-            step_radius = step_radius * binning
-            if step_radius <= 0:
-                step_radius = 0.1
-            radius_grid = np.round(np.linspace(min_rad, max_rad, bin_nums), 2)\
-                if max_rad - min_rad > 0 else np.full((1), min_rad)
-        else:
-            radius_grid = np.round(np.logspace(np.log10(min_rad), np.log10(max_rad), 2), bin_nums)
-        f = len(period_grid) / len(radius_grid)
+        period_grid = df1['period'].unique()
+        radius_grid = df1['radius'].unique()
         bins = [period_grid, radius_grid]
         h11, x1, y1 = np.histogram2d(df1['period'][df1['found'] == 1], df1['radius'][df1['found'] == 1], bins=bins)
         h12, x1, y1 = np.histogram2d(df1['period'][df1['found'] == 0], df1['radius'][df1['found'] == 0], bins=bins)

{tkmatrix-0.8.7 → tkmatrix-0.9.0/tkmatrix.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkmatrix
-Version: 0.8.7
+Version: 0.9.0
 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.7 → tkmatrix-0.9.0}/tkmatrix.egg-info/requires.txt

@@ -3,7 +3,7 @@ beautifulsoup4==4.9.3
 configparser==5.0.1
 corner==2.1.0
 ellc==1.8.5
-lcbuilder==0.16.2
+lcbuilder==0.18.0
 mock==4.0.3
 pyparsing==2.4.7
 seaborn==0.11.1