Skip to content

edited echelle_diagram to make it faster #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

edited echelle_diagram to make it faster #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e50d70d
edited echelle_diagram to make it faster
MaryumSayeed Aug 10, 2023
5330d7e
changed dpi=300 to dpi=100 in plots.py
MaryumSayeed Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions dev/plots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ def plot_estimates(star, filename='search_&_estimate.png', highlight=True, n=0):
path = os.path.join(star.params['path'],filename)
if not star.params['overwrite']:
path = utils._get_next(path)
plt.savefig(path, dpi=300)
plt.savefig(path, dpi=100)
if not star.params['show']:
plt.close()

Expand Down Expand Up @@ -361,7 +361,7 @@ def plot_parameters(star, subfilename='background_only.png', filename='global_fi
path = os.path.join(star.params['path'],subfilename)
if not star.params['overwrite']:
path = utils._get_next(path)
plt.savefig(path, dpi=300)
plt.savefig(path, dpi=100)
if not star.params['show']:
plt.close()
return
Expand Down Expand Up @@ -452,7 +452,7 @@ def plot_parameters(star, subfilename='background_only.png', filename='global_fi
path = os.path.join(star.params['path'],filename)
if not star.params['overwrite']:
path = utils._get_next(path)
plt.savefig(path, dpi=300)
plt.savefig(path, dpi=100)
if not star.params['show']:
plt.close()

Expand Down Expand Up @@ -484,7 +484,7 @@ def plot_samples(star, filename='samples.png'):
path = os.path.join(star.params['path'],filename)
if not star.params['overwrite']:
path = utils._get_next(path)
plt.savefig(path, dpi=300)
plt.savefig(path, dpi=100)
if not star.params['show']:
plt.close()

Expand Down Expand Up @@ -589,7 +589,7 @@ def plot_bgfits(star, filename='bgmodel_fits.png', highlight=True):
path = os.path.join(star.params['path'],filename)
if not star.params['overwrite']:
path = utils._get_next(path)
plt.savefig(path, dpi=300)
plt.savefig(path, dpi=100)
if not star.params['show']:
plt.close()

Expand Down Expand Up @@ -646,7 +646,7 @@ def create_benchmark_plot(filename='comparison.png', variables=['numax','dnu'],
path = os.path.join(os.path.abspath(os.getcwd()), filename)
if not overwrite:
path = utils._get_next(path)
plt.savefig(path, dpi=300, facecolor='white', edgecolor='white')
plt.savefig(path, dpi=100, facecolor='white', edgecolor='white')
if show:
plt.show()
plt.close()
Expand Down Expand Up @@ -707,7 +707,7 @@ def plot_light_curve(star, args, filename='time_series.png', npanels=1):
path = os.path.join(star.params['path'],filename)
if not star.params['overwrite']:
path = utils._get_next(path)
plt.savefig(path, dpi=300)
plt.savefig(path, dpi=100)
if not star.params['show']:
plt.close()

Expand Down Expand Up @@ -753,7 +753,7 @@ def plot_power_spectrum(star, args, filename='power_spectrum.png', npanels=1):
path = os.path.join(star.params['path'],filename)
if not star.params['overwrite']:
path = utils._get_next(path)
plt.savefig(path, dpi=300)
plt.savefig(path, dpi=100)
if not star.params['show']:
plt.close()

Expand Down Expand Up @@ -789,7 +789,7 @@ def plot_1d_ed(star, filename='1d_ed.png', npanels=1):
path = os.path.join(star.params['path'],filename)
if not star.params['overwrite']:
path = utils._get_next(path)
plt.savefig(path, dpi=300)
plt.savefig(path, dpi=100)
if not star.params['show']:
plt.close()

Expand Down
33 changes: 15 additions & 18 deletions dev/target.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1830,26 +1830,23 @@ def echelle_diagram(self, smooth_ech=None, nox=None, noy='0+0', hey=False, npb=1
nx = int(np.ceil(use_dnu/self.params['resolution']/self.params['npb']))
else:
nx = int(self.params['nox'])
x = np.linspace(0.0, 2*use_dnu, 2*nx+1)
yy = np.arange(min(self.frequency),max(self.frequency),use_dnu)
lower = self.params['numax_smoo']-(use_dnu*(ny/2.))+(use_dnu*(nshift+0))
upper = self.params['numax_smoo']+(use_dnu*(ny/2.))+(use_dnu*(nshift+1))
y = yy[(yy >= lower)&(yy <= upper)]
z = np.zeros((ny+1,2*nx))
for i in range(1,ny+1):
y_mask = ((self.frequency >= y[i-1]) & (self.frequency < y[i]))
for j in range(nx):
x_mask = ((self.frequency%(use_dnu) >= x[j]) & (self.frequency%(use_dnu) < x[j+1]))
if smooth_y[x_mask & y_mask] != []:
z[i][j] = np.sum(smooth_y[x_mask & y_mask])
else:
z[i][j] = np.nan
z[0][:nx], z[-1][nx:] = np.nan, np.nan
for k in range(ny):
z[k][nx:] = z[k+1][:nx]

fmin, fmax = self.params['numax_smoo']-(use_dnu*(ny/2.))+(use_dnu*(nshift+0)), self.params['numax_smoo']+(use_dnu*(ny/2.))+(use_dnu*(nshift+1))
fstart = fmin-(fmin%use_dnu)
zoom_freq, zoom_pow = self.zoom_freq, self.zoom_pow

x = np.linspace(0, 2*use_dnu, 2*nx)
z = np.zeros([ny+1, 2*nx])

for istack in range(ny):
z[-istack-1,:] = np.interp(fstart+istack * use_dnu + x, zoom_freq, zoom_pow)

y = fstart + np.arange(0, ny+1, 1)*use_dnu + use_dnu/2

self.ed = np.copy(z)
self.extent = [min(x),max(x),min(y),max(y)]
# make copy of ED to flatten and clip outliers

# make copy of ED to flatten and clip outliers
ed_copy = self.ed.flatten()
if self.params['clip_value'] > 0:
cut = np.nanmedian(ed_copy)+(self.params['clip_value']*np.nanmedian(ed_copy))
Expand Down