From 335ed8198cba28e2e07a2f1e5ac814fa6d4a7197 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Fri, 15 Sep 2017 17:29:35 +0100 Subject: [PATCH] instumentation/energy_management: update import to match devlib change --- wa/instrumentation/energy_measurement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wa/instrumentation/energy_measurement.py b/wa/instrumentation/energy_measurement.py index b1670319..c2a5bb85 100644 --- a/wa/instrumentation/energy_measurement.py +++ b/wa/instrumentation/energy_measurement.py @@ -18,12 +18,12 @@ from __future__ import division import os +from devlib import DerivedEnergyMeasurements from devlib.instrument import CONTINUOUS from devlib.instrument.energy_probe import EnergyProbeInstrument from devlib.instrument.daq import DaqInstrument from devlib.instrument.acmecape import AcmeCapeInstrument from devlib.utils.misc import which -from devlib.derived.derived_measurements import DerivedEnergyMeasurements from wa import Instrument, Parameter from wa.framework import pluginloader