diff --git a/docs/python_commands.rst b/docs/python_commands.rst index 28d9d79..42b1d8d 100644 --- a/docs/python_commands.rst +++ b/docs/python_commands.rst @@ -16,11 +16,13 @@ Import the tessilator, logging and numpy module >>> import numpy as np Provide tessilator with the input parameters and store these as variables to be passed to further tasks. +Running the following command will prompt the user for input parameters, one by one. >>> fluxCon, lcCon, makePlots, fileRef, tFile = tessilator.setup_input_parameters() >>> periodFile = tessilator.setup_filenames(fileRef) -Define the aperture radius and the radii of the annulus for background calculation +Define the aperture radius and the radii of the annulus for background calculation, +in pixels. (Each TESS pixel is approximately 21 arcseconds on the sky.) >>> Rad, SkyRad = 1.0, np.array([6.0,8.0]) diff --git a/tessilator/makeplots.py b/tessilator/makeplots.py index 42c2078..2e43ab3 100644 --- a/tessilator/makeplots.py +++ b/tessilator/makeplots.py @@ -296,7 +296,7 @@ def create_plot(im_plot, clean, LS, scc, t_table, name_target, plot_dir, axs[1, 0].text( 0.99, 0.80, - f"Gmag = {float(t_table['Gmag']):.3f}", + f"Gmag = {t_table['Gmag'][0]:.3f}", fontsize=lsize, horizontalalignment="right", transform=axs[1, 0].transAxes, @@ -304,7 +304,7 @@ def create_plot(im_plot, clean, LS, scc, t_table, name_target, plot_dir, axs[1, 0].text( 0.99, 0.70, - f"$\log (f_{{\\rm bg}}/f_{{*}})$ = {float(t_table['log_tot_bg']):.3f}", + f"$\\log (f_{{\\rm bg}}/f_{{*}})$ = {t_table['log_tot_bg'][0]:.3f}", fontsize=lsize, horizontalalignment="right", transform=axs[1, 0].transAxes, @@ -313,54 +313,38 @@ def create_plot(im_plot, clean, LS, scc, t_table, name_target, plot_dir, ax2=axs[1,0].twinx() ax2.set_position([0.05,0.3,0.90,0.2]) ax2.invert_yaxis() -======= - leg = axs[1, 0].legend(loc="lower right") - leg.legendHandles[1]._sizes = [30] - leg.legendHandles[2]._sizes = [30] - leg.legendHandles[3]._sizes = [30] - ax2 = axs[1, 0].twinx() - ax2.set_position([0.05, 0.3, 0.90, 0.2]) - ax2.invert_yaxis() - if not np.all(clean_orig_mag.data == -999.0): - ax2.scatter( - clean_orig_time[clean_orig_mag > -999], - clean_orig_mag[clean_orig_mag > -999], - s=0.3, - alpha=0.3, - color="b", - marker="x", - ) - ax2.set_ylabel("TESS magnitude", c="b", fontsize=fsize) + ax2 = axs[1, 0].twinx() + ax2.set_position([0.05, 0.3, 0.90, 0.2]) + ax2.invert_yaxis() - axs[1, 1].set_xlim([0, 1]) - axs[1, 1].set_xlabel("phase", fontsize=fsize) - axs[1, 1].set_ylabel("normalised flux", fontsize=fsize) - axs[1, 1].plot(LS["phase_fit_x"], LS["phase_fit_y"], c="b") - LS["phase_col"] += 1 - N_cyc = int(max(LS["phase_col"])) - cmap_use = plt.get_cmap("rainbow", N_cyc) - s = axs[1, 1].scatter( - LS["phase_x"], - LS["phase_y"], - c=LS["phase_col"], - cmap=cmap_use, - vmin=0.5, - vmax=N_cyc + 0.5, + if not np.all(clean_orig_mag.data == -999.0): + ax2.scatter( + clean_orig_time[clean_orig_mag > -999], + clean_orig_mag[clean_orig_mag > -999], + s=0.3, + alpha=0.3, + color="b", + marker="x", ) - # axs[1,1].text(0.01, 0.90, f"Amplitude = {LS['amp']:.3f}, " - # f"Scatter = {LS['scatter']:.3f}, " - # f"$\chi^{2}$ = {LS['chisq_phase']:.3f}, " - # "$f_{\\rm dev}$"+ f"= {LS['fdev']:.3f}", - # fontsize=lsize, horizontalalignment='left', - # transform=axs[1,1].transAxes) + ax2.set_ylabel("TESS magnitude", c="b", fontsize=fsize) + axs[1, 1].set_xlim([0, 1]) + axs[1, 1].set_xlabel("phase", fontsize=fsize) + axs[1, 1].set_ylabel("normalised flux", fontsize=fsize) + axs[1, 1].plot(LS["phase_fit_x"], LS["phase_fit_y"], c="b") + LS["phase_col"] += 1 + N_cyc = int(max(LS["phase_col"])) + cmap_use = plt.get_cmap("rainbow", N_cyc) + s = axs[1, 1].scatter( + LS["phase_x"], + LS["phase_y"], + c=LS["phase_col"], + cmap=cmap_use, + vmin=0.5, + vmax=N_cyc + 0.5, + ) -# cbaxes = inset_axes(axs[1,1], width="100%", height="100%", -# bbox_to_anchor=(0.79, 0.92, 0.20, 0.05), -# bbox_transform=axs[1,1].transAxes) -# cbar = plt.colorbar(s, cax=cbaxes, orientation='horizontal', -# label='cycle number') plot_name = '_'.join([name_target, f"{scc[0]:04d}", f"{scc[1]}", f"{scc[2]}", f"{nc}"])+'.png' fig.savefig(f"./{plot_dir}/{plot_name}", bbox_inches="tight")