Qelec branch : for travis checks - #27
Open
bhuard wants to merge 133 commits into
Open
Conversation
- Pulse loses its compute method in favor of a waveform property returning a 1d numpy array. - Shapes and modulation compute methods now takes a 1d numpy as time arg and return a 1d numpy array - Context get two news methods : len_sample and check time, and a new property sampling_time Tests have been updated.
…nchmarks (only simple sequence for now).
Pulse can recognise dotted names to access shape and modulation members. Moved walks module to hqc_meas.utils.
…ered by the tests.
Conflicts: hqc_meas/measurement/engines/process_engine/engine.py hqc_meas/measurement/workspace.py hqc_meas/task_management/manager_manifest.enaml hqc_meas/task_management/manager_plugin.py hqc_meas/utils/atom_util.py tests/task_management/test_plugin.py
… in RootSequence.
Conflicts: hqc_meas/utils/dependencies/dependencies.py
Conflicts: hqc_meas/tasks/manager/templates.py
… and no more in tasks.tools.walks
…ply always return the given value or set it without any buffering.
Factor 2 in demod
Change in tektro : output ON only at initialization Other instrumental stuff in progress
…ces in addition to the demodulated values
…omplex number acquisition) does not. In that case, it records the data in the format that is currently displayed
…commit in order to merge branches... ?
Conflicts: hqc_meas/instruments/dll/alazar935x.py hqc_meas/tasks/tasks_instr/alazar_tasks.py hqc_meas/tasks/tasks_instr/views/alazar_views.enaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.