Skip to content

Commit c8ca940

Browse files
committed
fix names
1 parent 4b0dd6d commit c8ca940

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

WrightTools/data/_data.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1935,7 +1935,7 @@ def split(
19351935
# axis ------------------------------------------------------------------------------------
19361936
old_expr = self.axis_expressions
19371937
old_units = self.units
1938-
out = wt_collection.Collection(name=f"{self.name}_split", parent=parent)
1938+
out = wt_collection.Collection(name=f"{self.natural_name}_split", parent=parent)
19391939
if isinstance(expression, int):
19401940
if units is None:
19411941
units = self._axes[expression].units
@@ -1969,11 +1969,8 @@ def split(
19691969
omasks.append(None)
19701970
cuts.append(None)
19711971
for i in range(len(positions) - 1):
1972-
out.create_data(f"{self.name}_{i:0>3}")
1972+
out.create_data(f"{self.natural_name}_{i:0>3}")
19731973

1974-
if inherit_attrs:
1975-
for d in out.values():
1976-
{d.attrs[k]: self.attrs[k] for k in self.attrs.keys() if k not in d.attrs.keys()}
19771974
for var in self.variables:
19781975
for i, (imask, omask, cut) in enumerate(zip(masks, omasks, cuts)):
19791976
if omask is None:
@@ -2047,6 +2044,10 @@ def split(
20472044
for ax, u in zip(self.axes, old_units):
20482045
ax.convert(u)
20492046

2047+
if inherit_attrs:
2048+
for d in out.values():
2049+
{d.attrs[k]: self.attrs[k] for k in self.attrs.keys() if k not in d.attrs.keys()}
2050+
20502051
return out
20512052

20522053
def transform(self, *axes, verbose=True):

tests/data/split.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def test_split_parent():
122122
a = wt.data.from_PyCMDS(p)
123123
parent = wt.Collection()
124124
split = a.split(1, [1500], parent=parent)
125-
assert "split" in parent
125+
assert f"{a.natural_name}_split" in parent
126126
assert split.filepath == parent.filepath
127127
assert len(split) == 2
128128
a.close()

0 commit comments

Comments
 (0)