Skip to content
Snippets Groups Projects
Commit 36e86afe authored by Christian Darsow-Fromm's avatar Christian Darsow-Fromm
Browse files

Merge branch 'develop'

parents 43bcdb48 619c31a5
No related branches found
No related tags found
No related merge requests found
Pipeline #4099 canceled
from .servo_design import ServoDesign from .servo_design import ServoDesign
from .gaussian_beam import fit_beam_data, GaussianBeam from .gaussian_beam import fit_beam_data, GaussianBeam
from ..conversion import db from ..conversion import db
from . import phase from . import phase, cavity
...@@ -80,8 +80,8 @@ def scope(traces, title='Oscilloscope View'): ...@@ -80,8 +80,8 @@ def scope(traces, title='Oscilloscope View'):
from mpl_toolkits.axes_grid1 import host_subplot from mpl_toolkits.axes_grid1 import host_subplot
import mpl_toolkits.axisartist as AA import mpl_toolkits.axisartist as AA
traces = DataContainer( # then you can also conviniently put in a single column, which would otherwise be a series
traces) # then you can also conviniently put in a single column, which would otherwise be a series traces = DataContainer(traces)
offset = 50 offset = 50
Ntraces = len(traces.columns) Ntraces = len(traces.columns)
if Ntraces > 4: if Ntraces > 4:
...@@ -91,7 +91,7 @@ def scope(traces, title='Oscilloscope View'): ...@@ -91,7 +91,7 @@ def scope(traces, title='Oscilloscope View'):
host = host_subplot(111, axes_class=AA.Axes) host = host_subplot(111, axes_class=AA.Axes)
plt.subplots_adjust(right=1.0 - 0.11 * (Ntraces - 1)) plt.subplots_adjust(right=1.0 - 0.11 * (Ntraces - 1))
line, = host.plot(traces.index, traces.iloc[:, 0], label=traces.columns[0]) line, = host.plot(np.array(traces.index), np.array(traces.iloc[:, 0]), label=traces.columns[0])
host.set_ylabel(traces.columns[0]) host.set_ylabel(traces.columns[0])
host.set_xlabel(traces.index.name) host.set_xlabel(traces.index.name)
host.axis['left'].label.set_color(line.get_color()) host.axis['left'].label.set_color(line.get_color())
...@@ -111,7 +111,7 @@ def scope(traces, title='Oscilloscope View'): ...@@ -111,7 +111,7 @@ def scope(traces, title='Oscilloscope View'):
pax.major_ticks.set_ticksize(4.0) pax.major_ticks.set_ticksize(4.0)
ax.axis['right'] = pax ax.axis['right'] = pax
line, = ax.plot(traces.index, traces.iloc[:, ii], label=traces.columns[ii]) line, = ax.plot(np.array(traces.index), np.array(traces.iloc[:, ii]), label=traces.columns[ii])
ax.axis['right'].toggle(all=True) ax.axis['right'].toggle(all=True)
ax.set_ylabel(traces.columns[ii]) ax.set_ylabel(traces.columns[ii])
ax.axis['right'].label.set_color(line.get_color()) ax.axis['right'].label.set_color(line.get_color())
......
...@@ -51,3 +51,14 @@ class TestAmplitudePhase(unittest.TestCase): ...@@ -51,3 +51,14 @@ class TestAmplitudePhase(unittest.TestCase):
def test_clamp_phase_warns(self): def test_clamp_phase_warns(self):
with self.assertWarns(DeprecationWarning): with self.assertWarns(DeprecationWarning):
plots.frequency_domain._clamp_phase(4) plots.frequency_domain._clamp_phase(4)
class TestTimeDomain(unittest.TestCase):
def setUp(self):
self.data = io.read(
r'./ContainerTestData/SuccedingImport/Oscilloscope/Keysight/20180606_001.csv')
def test_default_plot(self):
fig = plots.scope(self.data)
fig = plots.scope(self.data.iloc[:, 0])
self.assertIsInstance(fig, matplotlib.figure.Figure)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment