Skip to content

Commit c2bc8d5

Browse files
committed
Reverse add to_xarray since it can't hold spectrograms with time dependent
energy table Signed-off-by: Alexis Jeandet <[email protected]>
1 parent ddea1bd commit c2bc8d5

File tree

3 files changed

+3
-20
lines changed

3 files changed

+3
-20
lines changed

pyistp/_impl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,5 +103,5 @@ def _update_data_vars_lis(self):
103103
if (var_type == 'data' or param_type == 'data') and not self.cdf.is_char(var):
104104
self.data_variables.append(var)
105105

106-
def data_variable(self, var_name):
106+
def data_variable(self, var_name) -> DataVariable:
107107
return _load_data_var(self.cdf, var_name)

pyistp/data_variable.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from xarray import DataArray
2-
31

42
class DataVariable:
53
__slots__ = ("name", "values", 'attributes', 'axes', 'labels')
@@ -13,21 +11,6 @@ def __init__(self, name, values, attributes, axes, labels=None):
1311

1412
def __len__(self):
1513
return len(self.values)
16-
17-
def to_xarray(self) -> DataArray:
18-
axes = {ax.name: ax.values for ax in self.axes}
19-
dims = [ax.name for ax in self.axes]
20-
if len(self.values.shape) == 2 and len(axes) == 1:
21-
axes['components'] = self.labels
22-
dims.append('components')
23-
return DataArray(
24-
data=self.values,
25-
dims=dims,
26-
coords=axes,
27-
name=self.name,
28-
attrs=self.attributes
29-
)
30-
3114
def __repr__(self):
3215
return f"""DataVariable: {self.name}
3316
Attributes:

pyistp/loader.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from typing import List
2-
2+
from .data_variable import DataVariable
33

44
class ISTPLoader:
55

@@ -16,5 +16,5 @@ def attribute(self, key):
1616
def data_variables(self) -> List[str]:
1717
return self._impl.data_variables
1818

19-
def data_variable(self, var_name) -> List[str]:
19+
def data_variable(self, var_name) -> DataVariable:
2020
return self._impl.data_variable(var_name)

0 commit comments

Comments
 (0)