dedebenui/scgenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed concserved_quantity from PlotRange

Browse Source
This commit is contained in:
Benoît Sierro
2023-10-13 10:57:59 +02:00
parent c35b7ce6e5
commit f9b75efd6a
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/scgenerator/const.py
View File

@@ -38,6 +38,7 @@ MANDATORY_PARAMETERS = {
"ifft", "ifft",
"w0", "w0",
"spec_0", "spec_0",
"c_to_a_factor",
"field_0", "field_0",
"mean_power", "mean_power",
"input_transmission", "input_transmission",

9
src/scgenerator/physics/units.py
View File

@@ -382,15 +382,10 @@ class PlotRange(tuple):
left: float = property(itemgetter(0)) left: float = property(itemgetter(0))
right: float = property(itemgetter(1)) right: float = property(itemgetter(1))
unit: Callable[[float], float] = property(itemgetter(2)) unit: Callable[[float], float] = property(itemgetter(2))
conserved_quantity: bool = property(itemgetter(3))
__slots__ = [] __slots__ = []
@property def __new__(cls, left, right, unit):
def must_correct_wl(self) -> bool: return tuple.__new__(cls, (left, right, get_unit(unit)))
return self.unit.type == "WL" and self.conserved_quantity
def __new__(cls, left, right, unit, conserved_quantity=True):
return tuple.__new__(cls, (left, right, get_unit(unit), conserved_quantity))
def __iter__(self): def __iter__(self):
yield self.left yield self.left

7
src/scgenerator/plotting.py
View File

@@ -572,8 +572,6 @@ def transform_mean_values_1d(
values = abs2(values) values = abs2(values)
new_axis, ind, ext = sort_axis(x_axis, plt_range) new_axis, ind, ext = sort_axis(x_axis, plt_range)
values = values[:, ind] values = values[:, ind]
if plt_range.unit.type == "WL" and plt_range.conserved_quantity:
values = np.apply_along_axis(units.to_WL, -1, values, new_axis)
if isinstance(spacing, (float, np.floating)): if isinstance(spacing, (float, np.floating)):
tmp_axis = np.linspace(*span(new_axis), int(len(new_axis) / spacing)) tmp_axis = np.linspace(*span(new_axis), int(len(new_axis) / spacing))
@@ -790,8 +788,6 @@ def transform_1D_values(
values = abs2(values) values = abs2(values)
new_axis, ind, ext = sort_axis(x_axis, plt_range) new_axis, ind, ext = sort_axis(x_axis, plt_range)
values = values[ind] values = values[ind]
if plt_range.unit.type == "WL" and plt_range.conserved_quantity:
values = units.to_WL(values, units.m_rads(plt_range.unit(new_axis)))
if isinstance(spacing, (float, np.floating)): if isinstance(spacing, (float, np.floating)):
tmp_axis = np.linspace(*span(new_axis), int(len(new_axis) / spacing)) tmp_axis = np.linspace(*span(new_axis), int(len(new_axis) / spacing))
@@ -891,9 +887,6 @@ def plot_spectrogram(
new_t = t_range.unit.inv(new_t) new_t = t_range.unit.inv(new_t)
if w_range.must_correct_wl:
spec = np.apply_along_axis(units.to_WL, 1, spec, new_w)
if time_axis == 1: if time_axis == 1:
spec = spec.T spec = spec.T
x_axis = new_t x_axis = new_t