Skip to content
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

Jump to bottom

1110 join single point error #1111

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

1110 join single point error #1111

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
5f8abef
Update _join.py
DLafayetteII Jan 4, 2023
26df13b
Update CHANGELOG.md
DLafayetteII Jan 4, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
## [Unreleased]

## Changed
- Fixed join method to work with data of shape (1,)
- `Axis`: space character ("\s") in expressions are culled.
- fixed `interact2D` bug: channel/axes can now be specified with non-zero index arguments

Expand Down
1 change: 1 addition & 0 deletions WrightTools/data/_join.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ def combine(data, out, item_name, new_idx, transpose, slice_):
slice_.append(slice(None))
# If p is scalar, a new axis must be added, no transpose needed
else:
transpose.append(np.argmax(data[variable_name].shape))
slice_.append(np.newaxis)
# Triple subscripting needed because newaxis only applys to numpy array
# New axis added so that subtracting p will broadcast
Expand Down