Skip to content

Issues/485 make compatilbe warning #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 27, 2019
Merged

Issues/485 make compatilbe warning #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d407065
Update release notes and add test
shumpohl Nov 27, 2019
72cd836
Add missing export
shumpohl Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ReleaseNotes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- Add a `set_measurement_mask` to DAC interface. This method is used by the QCoDeS integration.
- Add a `get_sample_times` util method to share code for exact and fast sample time calculation
- Add a driver for Tektronix AWG5000/7000
- Warn the user if waveforms need to be concatenated to be compatible with hardware requirements.

- Pulse Templates:
- `MappingPulseTemplate`:
Expand Down
2 changes: 1 addition & 1 deletion qupulse/_program/_loop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

from qupulse._program.waveforms import SequenceWaveform, RepetitionWaveform

__all__ = ['Loop', 'MultiChannelProgram', 'make_compatible']
__all__ = ['Loop', 'MultiChannelProgram', 'make_compatible', 'MakeCompatibleWarning']


class Loop(Node):
Expand Down
6 changes: 4 additions & 2 deletions tests/_program/loop_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
from string import ascii_uppercase

from qupulse.utils.types import TimeType, time_from_float
from qupulse._program._loop import Loop, MultiChannelProgram, _make_compatible, _is_compatible, _CompatibilityLevel, RepetitionWaveform, SequenceWaveform, make_compatible
from qupulse._program._loop import Loop, MultiChannelProgram, _make_compatible, _is_compatible, _CompatibilityLevel,\
RepetitionWaveform, SequenceWaveform, make_compatible, MakeCompatibleWarning
from qupulse._program.instructions import InstructionBlock, ImmutableInstructionBlock
from tests.pulses.sequencing_dummies import DummyWaveform
from qupulse.pulses.multi_channel_pulse_template import MultiChannelWaveform
Expand Down Expand Up @@ -583,7 +584,8 @@ def test_make_compatible_repetition_count(self):
program = Loop(children=[Loop(waveform=wf1, repetition_count=3),
Loop(waveform=wf2)])
duration = program.duration
make_compatible(program, minimal_waveform_length=1, waveform_quantum=1, sample_rate=time_from_float(1.))
with self.assertWarns(MakeCompatibleWarning):
make_compatible(program, minimal_waveform_length=1, waveform_quantum=1, sample_rate=time_from_float(1.))
self.assertEqual(program.duration, duration)

program = Loop(children=[Loop(waveform=wf1, repetition_count=3),
Expand Down