Add simple demodulator signals to Zi UHFLI #870

jenshnielsen · 2017-11-14T14:19:30Z

@QCoDeS/core all in the title

WilliamHPNielsen · 2017-11-15T08:44:45Z

qcodes/instrument_drivers/ZI/ZIUHFLI.py

+
+            for demod_param in ['x', 'y', 'R', 'phi']:
+
+                self.add_parameter('demod{}_{}'.format(demod, demod_param),


Ideally, this should have a unit too. In the notebook, units are shown for these parameters (with a lowercase "v" instead of "V'), but where are they assigned?

I must have forgotten to add the commit that does the units

jenshnielsen · 2017-11-15T09:19:16Z

@WilliamHPNielsen pushed the units commit now

WilliamHPNielsen

Looks great. I can't believe we didn't have that feature before.

Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Add simple demodulator signals to Zi UHFLI (#870)

4981: Update types-setuptools requirement from ~=67.1.0 to ~=67.2.0 r=jenshnielsen a=dependabot[bot] Updates the requirements on [types-setuptools](https://github.com/python/typeshed) to permit the latest version. <details> <summary>Commits</summary> <ul> <li>See full diff in <a href="https://github.com/python/typeshed/commits">compare view</a></li> </ul> </details> <br /> You can trigger a rebase of this PR by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> 4982: Update pytest-xdist requirement from ~=3.1.0 to ~=3.2.0 r=jenshnielsen a=dependabot[bot] Updates the requirements on [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) to permit the latest version. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst">pytest-xdist's changelog</a>.</em></p> <blockquote> <h1>pytest-xdist 3.2.0 (2023-02-07)</h1> <h2>Improved Documentation</h2> <ul> <li><code>[#863](pytest-dev/pytest-xdist#863) <https://github.com/pytest-dev/pytest-xdist/issues/863></code>_: Document limitations for debugging due to standard I/O of workers not being forwarded. Also, mention remote debugging as a possible workaround.</li> </ul> <h2>Features</h2> <ul> <li> <p><code>[#855](pytest-dev/pytest-xdist#855) <https://github.com/pytest-dev/pytest-xdist/issues/855></code>_: Users can now configure <code>load</code> scheduling precision using <code>--maxschedchunk</code> command line option.</p> </li> <li> <p><code>[#858](pytest-dev/pytest-xdist#858) <https://github.com/pytest-dev/pytest-xdist/issues/858></code><em>: New <code>worksteal</code> scheduler, based on the idea of <code>work stealing <https://en.wikipedia.org/wiki/Work_stealing></code></em>. It's similar to <code>load</code> scheduler, but it should handle tests with significantly differing duration better, and, at the same time, it should provide similar or better reuse of fixtures.</p> </li> </ul> <h2>Trivial Changes</h2> <ul> <li><code>[#870](pytest-dev/pytest-xdist#870) <https://github.com/pytest-dev/pytest-xdist/issues/870></code>_: Make the tests pass even when <code>$PYTEST_XDIST_AUTO_NUM_WORKERS</code> is set.</li> </ul> <h1>pytest-xdist 3.1.0 (2022-12-01)</h1> <h2>Features</h2> <ul> <li> <p><code>[#789](pytest-dev/pytest-xdist#789) <https://github.com/pytest-dev/pytest-xdist/issues/789></code>_: Users can now set a default distribution mode in their configuration file:</p> <p>.. code-block:: ini</p> <pre><code>[pytest] addopts = --dist loadscope </code></pre> </li> <li> <p><code>[#842](pytest-dev/pytest-xdist#842) <https://github.com/pytest-dev/pytest-xdist/issues/842></code>_: Python 3.11 is now officially supported.</p> </li> </ul> <h2>Removals</h2> <ul> <li><code>[#842](pytest-dev/pytest-xdist#842) <https://github.com/pytest-dev/pytest-xdist/issues/842></code>_: Python 3.6 is no longer supported.</li> </ul> <h1>pytest-xdist 3.0.2 (2022-10-25)</h1> <p>Bug Fixes</p>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/pytest-dev/pytest-xdist/commit/5c065198e98df484d8193a5fba5480db541fac37"><code>5c06519</code></a> Release 3.2.0</li> <li><a href="https://github.com/pytest-dev/pytest-xdist/commit/c695763e92951e20bd10c783c47884032826ea6d"><code>c695763</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-xdist/issues/869">#869</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-xdist/commit/9373ddb3f841a009bc9669b514923b6ecba724e7"><code>9373ddb</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-xdist/issues/870">#870</a> from hroncok/delenv</li> <li><a href="https://github.com/pytest-dev/pytest-xdist/commit/8fd1bfd182e87f46e2c2ff6dbb43c0cd43d0cc00"><code>8fd1bfd</code></a> Tests: Unset PYTEST_XDIST_AUTO_NUM_WORKERS when the behavior without the envv...</li> <li><a href="https://github.com/pytest-dev/pytest-xdist/commit/017cc72b7090dc4bb7e7ad3d0caab024feb977a8"><code>017cc72</code></a> Document limitations for debugging as well as a workaround (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-xdist/issues/867">#867</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-xdist/commit/cf19f76d86aa149d21242da520879b8e0ee80013"><code>cf19f76</code></a> Fix minor typos in the documentation (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-xdist/issues/866">#866</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-xdist/commit/691a0751bf7081224287d13c0863fc981a838380"><code>691a075</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-xdist/issues/865">#865</a> from amezin/fix-loadsched-tests</li> <li><a href="https://github.com/pytest-dev/pytest-xdist/commit/e9860923bf899b283627526bf9a23cb688204d42"><code>e986092</code></a> Fix some LoadScheduling tests</li> <li><a href="https://github.com/pytest-dev/pytest-xdist/commit/d1dfad3e927e225c967f16928b39eee43a3d6457"><code>d1dfad3</code></a> Implement work-stealing scheduler (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-xdist/issues/862">#862</a>)</li> <li><a href="https://github.com/pytest-dev/pytest-xdist/commit/9b0b5b1495b024940e3f5c71583711be46df255b"><code>9b0b5b1</code></a> Add --maxschedchunk CLI option (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-xdist/issues/857">#857</a>)</li> <li>Additional commits viewable in <a href="https://github.com/pytest-dev/pytest-xdist/compare/v3.1.0...v3.2.0">compare view</a></li> </ul> </details> <br /> You can trigger a rebase of this PR by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

jenshnielsen added 4 commits November 14, 2017 13:41

remove non existing parameter from init

f4991cc

add option to get demod samples

5dd714c

use correct variable name

189be31

Update notebook to use new examples too

4b58961

WilliamHPNielsen reviewed Nov 15, 2017

View reviewed changes

add unit

b4a24ba

WilliamHPNielsen approved these changes Nov 15, 2017

View reviewed changes

Merge branch 'master' into zi_demod

905d4d6

WilliamHPNielsen merged commit 17768e3 into microsoft:master Nov 15, 2017

giulioungaretti pushed a commit that referenced this pull request Nov 15, 2017

Generated gh-pages for commit 17768e3

4f9b994

Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Add simple demodulator signals to Zi UHFLI (#870)

jenshnielsen deleted the zi_demod branch November 15, 2017 10:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add simple demodulator signals to Zi UHFLI #870

Add simple demodulator signals to Zi UHFLI #870

jenshnielsen commented Nov 14, 2017 •

edited

Loading

WilliamHPNielsen Nov 15, 2017

jenshnielsen Nov 15, 2017

jenshnielsen commented Nov 15, 2017

WilliamHPNielsen left a comment


		for demod_param in ['x', 'y', 'R', 'phi']:

		self.add_parameter('demod{}_{}'.format(demod, demod_param),

Add simple demodulator signals to Zi UHFLI #870

Add simple demodulator signals to Zi UHFLI #870

Conversation

jenshnielsen commented Nov 14, 2017 • edited Loading

WilliamHPNielsen Nov 15, 2017

Choose a reason for hiding this comment

jenshnielsen Nov 15, 2017

Choose a reason for hiding this comment

jenshnielsen commented Nov 15, 2017

WilliamHPNielsen left a comment

Choose a reason for hiding this comment

jenshnielsen commented Nov 14, 2017 •

edited

Loading