Feature AWG - Tabor - Reworked implementation of the repetition modes#602

Open

bpapajewski wants to merge 110 commits intoqutech:masterfrom bpapajewski:MergeRunmode

+1,850-102

Commits on Mar 23, 2020

Start der Implementierung der AWG-Treiber

bpapajewski
authored and
b.papajewski
committed
Test push

bpapajewski
authored and
b.papajewski
committed
Anfang der Umsetzung der Feature Strucktur

bpapajewski
authored and
b.papajewski
committed
Erster Ansatz der Feature Strucktur fuers Device umgesetzt

bpapajewski
authored and
b.papajewski
committed
Erster Fertiger Entwurf - vor dem Testen

bpapajewski
authored and
b.papajewski
committed
Erste Verbesserungen eingebaut

bpapajewski
authored and
b.papajewski
committed
Abstrakte Property ueberarbeitet

bpapajewski
authored and
b.papajewski
committed
Finished AWG Driver

bpapajewski
authored and
b.papajewski
committed
Rename hardware/awgs/base.py to old_base.py

lankes-fzj
authored and
b.papajewski
committed
Rename AWGDriver.py to base.py

lankes-fzj
authored and
b.papajewski
committed
Update tabor.py

lankes-fzj
authored and
b.papajewski
committed
Update tektronix.py

lankes-fzj
authored and
b.papajewski
committed
Minor bug fixes

lankes-fzj
authored and
b.papajewski
committed
Added a test script for the base drivers

lankes-fzj
authored and
b.papajewski
committed
Change of the feature-logic

bpapajewski
authored and
b.papajewski
committed
Unittests added

bpapajewski
authored and
b.papajewski
committed
Fixed Problem with CI

bpapajewski
authored and
b.papajewski
committed
Start of the implementation of the tabor drivers

bpapajewski
authored and
b.papajewski
committed
Start of the implementation of the Tabor driver

bpapajewski
authored and
b.papajewski
committed
Start der Implementierung der AWG-Treiber

bpapajewski
authored and
b.papajewski
committed
Test push

bpapajewski
authored and
b.papajewski
committed
Anfang der Umsetzung der Feature Strucktur

bpapajewski
authored and
b.papajewski
committed
Erster Fertiger Entwurf - vor dem Testen

bpapajewski
authored and
b.papajewski
committed
Erste Verbesserungen eingebaut

bpapajewski
authored and
b.papajewski
committed
Abstrakte Property ueberarbeitet

bpapajewski
authored and
b.papajewski
committed
Finished AWG Driver

bpapajewski
authored and
b.papajewski
committed
Rename hardware/awgs/base.py to old_base.py

lankes-fzj
authored and
b.papajewski
committed
Rename AWGDriver.py to base.py

lankes-fzj
authored and
b.papajewski
committed
Update tabor.py

lankes-fzj
authored and
b.papajewski
committed

Commits on Mar 24, 2020

Minor bug fixes

lankes-fzj
authored and
b.papajewski
committed
Added a test script for the base drivers

lankes-fzj
authored and
b.papajewski
committed
Change of the feature-logic

bpapajewski
authored and
b.papajewski
committed
Unittests added

bpapajewski
authored and
b.papajewski
committed
Removed 'Base' form the names of the classes

bpapajewski
authored and
b.papajewski
committed
Renamed BaseAWGChannel to AWGChannel and AWG to AWGDevice to avoid confusion with old_base.AWG

lankes-fzj
authored and
b.papajewski
committed
Some improvements for the feature logic

lankes-fzj
authored and
b.papajewski
committed
Removed type hint in awg_base_test

lankes-fzj
authored and
b.papajewski
committed
Removed type hint in awg_base_test

lankes-fzj
authored and
b.papajewski
committed
Removed f-strings to keep compatibility to Python 3.5

lankes-fzj
authored and
b.papajewski
committed
Using qupulse.utils.types.Collection instead of typing.Collection to keep py3.5-compatibility

lankes-fzj
authored and
b.papajewski
committed
Using qupulse.utils.types.Collection instead of typing.Collection to keep py3.5-compatibility

lankes-fzj
authored and
b.papajewski
committed
Replaced imports of awgs.base with awgs.old_base

lankes-fzj
authored and
b.papajewski
committed
Basic communication works - but Tabor driver not yet completely rewritten/implemented

b.papajewski
authored and
b.papajewski
committed
simulator based unit tests run without a problem

b.papajewski
authored and
b.papajewski
committed
simulator based unit tests run, but in the last UNIT-Test a Exception is thrown but ignored

b.papajewski
authored and
b.papajewski
committed
simulator based unit tests run, but in the last UNIT-Test a Exception is thrown but ignored

b.papajewski
authored and
b.papajewski
committed
removed a few old comments

b.papajewski
authored and
b.papajewski
committed
added new comments

b.papajewski
authored and
b.papajewski
committed
channel tuple adapter was added

b.papajewski
authored and
b.papajewski
committed
channel tuple adapter - a bug was fixed

b.papajewski
authored and
b.papajewski
committed
channel tuple adapter - consturctor was changed

b.papajewski
authored and
b.papajewski
committed
channel tuple adapter - consturctor was changed

b.papajewski
authored and
b.papajewski
committed
start of implementing the feedback

b.papajewski
authored and
b.papajewski
committed
Rebase conflicts finished - with buggs left

b.papajewski
authored and
b.papajewski
committed

Commits on Mar 25, 2020

Compared with lukas merged branch

b.papajewski
authored and
b.papajewski
committed
old simulator based tests runs, but throws asserations fail

b.papajewski
authored and
b.papajewski
committed
a few bugs from the rebase are fixed

b.papajewski
authored and
b.papajewski
committed
a few bugs from the rebase are fixed

b.papajewski
authored and
b.papajewski
committed

Commits on Mar 26, 2020

UNIT-tests run without exceptions again after the rebase

b.papajewski
authored and
b.papajewski
committed

Commits on Apr 1, 2020

Synchronisation feature and DeviceControl feature were added

b.papajewski
authored and
b.papajewski
committed

Commits on Apr 2, 2020

More methods in ProgramManagement, but not all Unit Tests run

b.papajewski
authored and
b.papajewski
committed
Unit tests run fine, but TaborProgramManagement needs some work

b.papajewski
authored and
b.papajewski
committed

Commits on Apr 6, 2020

Unit tests run fine, but TaborProgramManagement needs some work

b.papajewski
authored and
b.papajewski
committed

Commits on Apr 8, 2020

Weakrefs added for Channels, ChannelTuple and features

b.papajewski
authored and
b.papajewski
committed

Commits on Apr 15, 2020

Changed the loop in the synchronisation feature

b.papajewski
authored and
b.papajewski
committed
Changed samplerate property to TimeType

b.papajewski
authored and
b.papajewski
committed

Commits on Apr 22, 2020

TaborProgramManagement - upload Method fixed

b.papajewski
authored and
b.papajewski
committed
Added a few docstrings

b.papajewski
authored and
b.papajewski
committed

Commits on Apr 23, 2020

Worked on some docstrings

b.papajewski
authored and
b.papajewski
committed

Commits on May 19, 2020

-removed the setter for amplitude and offset

b.papajewski
authored and
b.papajewski
committed

Commits on May 26, 2020

SCPI-Feature generalization implemented

b.papajewski
authored and
b.papajewski
committed

Commits on Jun 4, 2020

Changed run_current_programm to work with coupling

b.papajewski
authored and
b.papajewski
committed

Commits on Jun 25, 2020

Beginning of the ContinuousRunMode Feature

b.papajewski
authored and
b.papajewski
committed

Commits on Aug 27, 2020

continued work on the ContinuousRunMode Feature

b.papajewski
authored and
b.papajewski
committed

Commits on Aug 28, 2020

-fixes from tests with device ("once" still not working)

b.papajewski
authored and
b.papajewski
committed
-small fixes

b.papajewski
authored and
b.papajewski
committed
marker_channls is now the name for the consistently

b.papajewski
authored and
b.papajewski
committed
first test of run_current_program for a coupled device

b.papajewski
authored and
b.papajewski
committed

Commits on Nov 20, 2020

fixed __init__ of the tabor program

b.papajewski
authored and
b.papajewski
committed

Commits on Dec 2, 2020

-moved _send_cmd into the SCPI feature of a device

b.papajewski
authored and
b.papajewski
committed
the getitem of a feature can now also be used with a string

b.papajewski
authored and
b.papajewski
committed

Commits on Dec 9, 2020

-removed support once repetition mode in the method upload and run_current_program

b.papajewski
authored and
b.papajewski
committed

Commits on Dec 17, 2020

Moved the tabor driver with the new logic into their own package "awgs_new_driver"

b.papajewski
authored and
b.papajewski
committed
added an __init__.py for awgs_new_driver

b.papajewski
authored and
b.papajewski
committed

Commits on Jan 14, 2021

renamed all the tests to tabor_new_... so they don't overwrite the test for the old tabor in the rebase

b.papajewski
authored and
b.papajewski
committed
fixed the tabor drivers because the read_waveform method isn't subscribable

b.papajewski
authored and
b.papajewski
committed
Merge remote-tracking branch 'remotes/upstream/master' into feat/new-tabor-driver-rebase

b.papajewski
authored and
b.papajewski
committed

Commits on Feb 1, 2021

added tests for the new_tabor_driver

b.papajewski
authored and
b.papajewski
committed

Commits on Feb 3, 2021

Delete tabor_simulator_based_test_debug.py
bpapajewski
authored
-added a comment for the method _is_coupled of a device

b.papajewski
authored and
b.papajewski
committed
removed old comment from the method _enter_config_mode of a channel tuple

b.papajewski
authored and
b.papajewski
committed
added the implenetation for the method enabled for a channel and a marker channel

b.papajewski
authored and
b.papajewski
committed

Commits on Feb 18, 2021

added MATLAB/+qc/personalPaths.mat and /doc/source/_autosummary/* to the gitignore

b.papajewski
authored and
b.papajewski
committed

Commits on Feb 22, 2021

fixed the gitignore

b.papajewski
authored and
b.papajewski
committed
renamed to tabor_new_driver package to feature_awg

b.papajewski
authored and
b.papajewski
committed
removed silencing of all warnings in awg_new_driver_base_tests.py

b.papajewski
authored and
b.papajewski
committed

Commits on Feb 25, 2021

reformated tabor_test.py to minimize merge conflicts

b.papajewski
authored and
b.papajewski
committed

Commits on Mar 1, 2021

reformated tabor_test.py to minimize merge conflicts

b.papajewski
authored and
b.papajewski
committed

Commits on Mar 2, 2021

implemented missing methods in awg_new_driver_base_tests.py

b.papajewski
authored and
b.papajewski
committed
fixed refactoring mistake in setup.py

b.papajewski
authored and
b.papajewski
committed

Commits on Apr 13, 2021

Merge branch 'master' of https://github.com/qutech/qupulse into feat/new-tabor-driver-rebase

b.papajewski
authored and
b.papajewski
committed

Commits on Apr 16, 2021

fixed SyntaxWarning from issue qutech#561

b.papajewski
authored and
b.papajewski
committed

Commits on Apr 26, 2021

first changes for the runmode once

b.papajewski
authored and
b.papajewski
committed

Commits on Jun 1, 2021

-first draft of the runmode auto rearm

b.papajewski
authored and
b.papajewski
committed
tried to fix the test

b.papajewski
authored and
b.papajewski
committed

Commits on Jun 11, 2021

revise repetition mode check in set_repetition_mode and run_current_program

b.papajewski
authored and
b.papajewski
committed
fixed a problem with weakref for the channel tuple

b.papajewski
authored and
b.papajewski
committed
changed the static DummyProgramm to a class so it can have attributes

b.papajewski
authored and
b.papajewski
committed
commented the todos

b.papajewski
authored and
b.papajewski
committed

Commits on Jun 25, 2021

Merge remote-tracking branch 'origin/feat/new-tabor-driver-rebase' into MergeRunmode

b.papajewski
authored and
b.papajewski
committed