Merge branch 'master' into ddkohler-patch-1

.github/workflows/python-test.yml

@@ -1,6 +1,9 @@
 name: test python
 
-on: [push, pull_request]
+on:
+  pull_request:
+    types: [opened, reopened]
+  push:
 
 jobs:
   build:

CHANGELOG.md

@@ -6,7 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 ## [Unreleased]
 
 ### Fixed
-- wt5 explore : fixed but where data will not load interactively if directory is not cwd
+- wt5 explore : fixed bug where data will not load interactively if directory is not cwd
+- constants in chopped data will inherit the units of the original data
+
+## Changed
+- artists now gets turbo colormap straight from matplotlib
 
 ## [3.5.2]
 

WrightTools/artists/_colors.py

@@ -12,8 +12,6 @@
 import matplotlib.colors as mplcolors
 import matplotlib.gridspec as grd
 
-from ._turbo import turbo
-
 
 # --- define -------------------------------------------------------------------------------------
 
@@ -438,7 +436,6 @@ def __getitem__(self, key):
 colormaps["skyebar1"] = mplcolors.LinearSegmentedColormap.from_list("skyebar", skyebar)
 colormaps["skyebar2"] = mplcolors.LinearSegmentedColormap.from_list("skyebar dark", skyebar_d)
 colormaps["skyebar3"] = mplcolors.LinearSegmentedColormap.from_list("skyebar inverted", skyebar_i)
-colormaps["turbo"] = turbo
 colormaps["wright"] = mplcolors.LinearSegmentedColormap.from_list("wright", wright)
 
 

WrightTools/data/_data.py

@@ -596,6 +596,11 @@ def _from_slice(self, idx, name=None, parent=None) -> Data:
 
         for const in list(self.constant_expressions) + constants:
             out.create_constant(const, verbose=False)
+            if const in self.constant_expressions:
+                dest_units = self.constants[self.constant_expressions.index(const)].units
+            else:
+                dest_units = self.axes[self.axis_expressions.index(const)].units
+            out.constants[out.constant_expressions.index(const)].convert(dest_units)
         for j, units in enumerate(new_axis_units):
             out.axes[j].convert(units)
 
@@ -1263,10 +1268,14 @@ def level(self, channel, axis, npts, *, verbose=True):
     def map_variable(
         self, variable, points, input_units="same", *, name=None, parent=None, verbose=True
     ) -> "Data":
-        """Map points of an axis to new points using linear interpolation.
+        """
+        Map points of an axis to new points using linear interpolation.
 
         Out-of-bounds points are written nan.
 
+        Non-mapped variables are kept in the data object only if they are
+        orthogonal to the mapped variable (see `kit.orthogonal`).
+
         Parameters
         ----------
         variable : string

tests/data/chop.py

@@ -111,8 +111,10 @@ def test_3D_to_2D_units():
         assert d.w2.size == 11
         assert d.axis_expressions == ("wm", "w2")
         assert d.units == ("eV", "eV")
-    data.close()
+        w1 = d.constants[d.constant_names.index("w1")]
+        assert w1.units == "eV"
     chop.close()
+    data.close()
 
 
 def test_parent():