Fix errors due to DLV changes

Author: shumpohl

qupulse/program/measurement.py

@@ -104,7 +104,7 @@ def inner_scope(self, scope: Scope) -> Scope:
         process."""
         if self._ranges:
             name, rng = self._ranges[-1]
-            return scope.overwrite({name: DynamicLinearValue(base=rng.start, offsets={name: rng.step})})
+            return scope.overwrite({name: DynamicLinearValue(base=rng.start, factors={name: rng.step})})
         else:
             return scope
 
@@ -169,7 +169,7 @@ def time_reversed(self) -> ContextManager['ProgramBuilder']:
         self._frames[-1].keep = True
         self._frames[-1].commands.extend(_reversed_commands(frame.commands))
 
-    def to_program(self) -> Optional[Program]:
+    def to_program(self, channels = None) -> Optional[Program]:
         """Further addition of new elements might fail after finalizing the program."""
         if self._frames[0].keep:
             return MeasurementInstructions(self._frames[0].commands)
@@ -214,7 +214,7 @@ def __init__(self, callback: Callable[[str, float, float], None]):
     def _eval_hardware_time(self, t: HardwareTime):
         if isinstance(t, DynamicLinearValue):
             value = t.base
-            for (factor_name, factor_val) in t.offsets.items():
+            for (factor_name, factor_val) in t.factors.items():
                 count = self._counts[self._memory[factor_name]]
                 value += factor_val * count
             return value

tests/program/measurement_tests.py

@@ -6,6 +6,7 @@
 
 from qupulse.pulses import *
 from qupulse.program.measurement import *
+from qupulse.program import DynamicLinearValue
 
 
 class SingleRampTest(TestCase):
@@ -16,7 +17,7 @@ def setUp(self):
         self.commands = [
             LoopLabel(1, 'idx', 200),
             Measure('A', 10, 100),
-            Measure('B', SimpleExpression(base=1, offsets={'idx': 2}), 200),
+            Measure('B', DynamicLinearValue(base=1, factors={'idx': 2}), 200),
             Wait(TimeType(10 ** 6)),
             LoopJmp(1)
         ]