From 5f8abef4a09dba628395a2f26290b9131ca22712 Mon Sep 17 00:00:00 2001 From: DLafayetteII Date: Wed, 4 Jan 2023 15:22:26 -0600 Subject: [PATCH 1/2] Update _join.py --- WrightTools/data/_join.py | 1 + 1 file changed, 1 insertion(+) diff --git a/WrightTools/data/_join.py b/WrightTools/data/_join.py index 1e16c692..0f2f2bd6 100644 --- a/WrightTools/data/_join.py +++ b/WrightTools/data/_join.py @@ -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 From 26df13b199eefa3d7090f41436bf1542770d66c6 Mon Sep 17 00:00:00 2001 From: DLafayetteII Date: Wed, 4 Jan 2023 15:26:33 -0600 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25b65e98..ad594cc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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