addition of two looping variables ignores second variable

Created by: sldesnoo-Delft

When 2 looping variables on different are being added, then only the first one is in the result.

Example to reproduce: from pulse_lib.base_pulse import pulselib import pulse_lib.segments.utility.looping as lp from pulse_lib.tests.mock_m3202a import MockM3202A

awg1 = MockM3202A('AWG1',0,1) pulse = pulselib()

pulse.add_awgs('AWG1', awg1) pulse.define_channel('P1','AWG1', 1) pulse.finish_init()

pulse_container = pulse.mk_segment()

v1 = lp.linspace(0, 100, 11, axis=0, unit = 'mV', name='V') v2 = lp.linspace(0.5, 10.5, 11, axis=1, unit = 'mV', name='V')

pulse_container.P1.add_block(0, 100, v1 + v2) pulse_container.P1.setpoints

Output: setpoint(axis=0, label=('V',), unit=('mV',), setpoint=(array([ 0., 10., 20., 30., 40., 50., 60., 70., 80., 90., 100.]),))

assigned to @sldesnoo-Delft

added bug label

Created by: sldesnoo-Delft

@stephanlphilips, can you have a look at the fix? Branch: "M3202A_2Dloop_fix". This is a quick fix for addition of 2 looping variables with dimension 1 on different axis. Should we support addition on the same axis or addition with more dimensions? Should we support other operations like multiplication?

I've also added a check when 2D loop is created from data. The axis must be specified in descending order. This is correct: lp = loop_obj() lp.add_data(data, axis=[1,0], labels = ("gate_name_1", "gate_name_2"), units = ('mV', 'mV'), setvals=([10,20,30],[1,2,3,4]))

This fails when passed to a loop_controller annotated method and therefore an exception is raised upon creation. lp = loop_obj() lp.add_data(data, axis=[0,1], labels = ("gate_name_1", "gate_name_2"), units = ('mV', 'mV'), setvals=([10,20,30],[1,2,3,4]))

Created by: sldesnoo-Delft

Addition on same axis should also work. Addition of an existing axis is added to a 2D loop of addition of 2 2D loops with identical axis should also work. It should be similar to the way setpoints are used in the setpoint manager.