feature: driver/yokogawa gs200 #393

nataliejpg · 2016-11-19T19:31:00Z

Changes proposed in this pull request:

adds very basic functionality for basic yokogawa voltage source

…into ATS9870-dev-branch

Generalise ATS.py and debugging. Changes to example notebook. Add specific ATS9360.py file for board settings. nb in this commit there is no use of the acquisition controller

…9360

…actor

…so this one is cleaner

WilliamHPNielsen

The init should perhaps have a docstring too.

Otherwise A-OK.

giulioungaretti

Docstring fixin' aside, ready to merge.
Thanks for the contribution!

giulioungaretti · 2016-11-28T12:48:15Z

qcodes/instrument_drivers/yokogawa/GS200.py

+
+    def __init__(self, name, address, reset=False, **kwargs):
+        """
+        Args:


🎠 Class docstring is split, and should all be in under the class and not on the init function.
Reset attr needs to be described. Also, is it used ?

See http://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html for an example.

docstring moved. I think it's nice to have a reset function, it resets the instrument (not sure it's worth detailing the default settings...). Thought? @giulioungaretti

jenshnielsen · 2017-02-10T11:49:45Z

Would it be ok to merge these by squash? It would be nice to not have the ATS and revert commits going in

giulioungaretti · 2017-02-10T11:50:37Z

@jenshnielsen I always squash and merge, it's the default for qcodes.

Author: Natalie Pearson <npearson@phys.ethz.ch> feature: driver/yokogawa gs200 (#393)

jenshnielsen · 2017-02-10T12:03:58Z

Ok missed that somehow.

4559: Update towncrier requirement from ~=21.9.0 to ~=22.8.0 r=jenshnielsen a=dependabot[bot] Updates the requirements on [towncrier](https://github.com/hawkowl/towncrier) to permit the latest version. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/hawkowl/towncrier/releases">towncrier's releases</a>.</em></p> <blockquote> <h2>Towncrier 22.8.0</h2> <h1>towncrier 22.8.0 (2022-08-29)</h1> <p>No significant changes since the previous release candidate.</p> <h1>towncrier 22.8.0.rc1 (2022-08-28)</h1> <h2>Features</h2> <ul> <li> <p>Make the check subcommand succeed for branches that change the news file</p> <p>This should enable the <code>check</code> subcommand to be used as a CI lint step and not fail when a pull request only modifies the configured news file (i.e. when the news file is being assembled for the next release). (<code>[#337](twisted/towncrier#337) <https://github.com/hawkowl/towncrier/issues/337></code>_)</p> </li> <li> <p>Added support to tables in toml settings, which provides a more intuitive way to configure custom types. (<code>[#369](twisted/towncrier#369) <https://github.com/hawkowl/towncrier/issues/369></code>_)</p> </li> <li> <p>The <code>towncrier create</code> command line now has a new <code>-m TEXT</code> argument that is used to define the content of the newly created fragment. (<code>[#374](twisted/towncrier#374) <https://github.com/hawkowl/towncrier/issues/374></code>_)</p> </li> </ul> <h2>Bugfixes</h2> <ul> <li> <p>The extra newline between the title and rendered content when using <code>--draft</code> is no longer inserted. (<code>[#105](twisted/towncrier#105) <https://github.com/hawkowl/towncrier/issues/105></code>_)</p> </li> <li> <p>The detection of duplicate release notes was fixed and recording changes of same version is no longer triggered.</p> <p>Support for having the release notes for each version in a separate file is working again. This is a regression introduced in VERSION 19.9.0rc1. (<code>[#391](twisted/towncrier#391) <https://github.com/hawkowl/towncrier/issues/391></code>_)</p> </li> </ul> <h2>Improved Documentation</h2> <ul> <li>Improve <code>CONTRIBUTING.rst</code> and add PR template. (<code>[#342](twisted/towncrier#342) <https://github.com/hawkowl/towncrier/issues/342></code>_)</li> <li>Move docs too the main branch and document custom fragment types. (<code>[#367](twisted/towncrier#367) <https://github.com/hawkowl/towncrier/issues/367></code>_)</li> <li>The CLI help messages were updated to contain more information. (<code>[#384](twisted/towncrier#384) <https://github.com/hawkowl/towncrier/issues/384></code>_)</li> </ul> <h2>Deprecations and Removals</h2> <ul> <li>Support for all Python versions older than 3.7 has been dropped. (<code>[#378](twisted/towncrier#378) <https://github.com/hawkowl/towncrier/issues/378></code>_)</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/twisted/towncrier/blob/trunk/NEWS.rst">towncrier's changelog</a>.</em></p> <blockquote> <h1>towncrier 22.8.0 (2022-08-29)</h1> <p>No significant changes since the previous release candidate.</p> <h1>towncrier 22.8.0.rc1 (2022-08-28)</h1> <h2>Features</h2> <ul> <li> <p>Make the check subcommand succeed for branches that change the news file</p> <p>This should enable the <code>check</code> subcommand to be used as a CI lint step and not fail when a pull request only modifies the configured news file (i.e. when the news file is being assembled for the next release). (<code>[#337](twisted/towncrier#337) <https://github.com/hawkowl/towncrier/issues/337></code>_)</p> </li> <li> <p>Added support to tables in toml settings, which provides a more intuitive way to configure custom types. (<code>[#369](twisted/towncrier#369) <https://github.com/hawkowl/towncrier/issues/369></code>_)</p> </li> <li> <p>The <code>towncrier create</code> command line now has a new <code>-m TEXT</code> argument that is used to define the content of the newly created fragment. (<code>[#374](twisted/towncrier#374) <https://github.com/hawkowl/towncrier/issues/374></code>_)</p> </li> </ul> <h2>Bugfixes</h2> <ul> <li> <p>The extra newline between the title and rendered content when using <code>--draft</code> is no longer inserted. (<code>[#105](twisted/towncrier#105) <https://github.com/hawkowl/towncrier/issues/105></code>_)</p> </li> <li> <p>The detection of duplicate release notes was fixed and recording changes of same version is no longer triggered.</p> <p>Support for having the release notes for each version in a separate file is working again. This is a regression introduced in VERSION 19.9.0rc1. (<code>[#391](twisted/towncrier#391) <https://github.com/hawkowl/towncrier/issues/391></code>_)</p> </li> </ul> <h2>Improved Documentation</h2> <ul> <li>Improve <code>CONTRIBUTING.rst</code> and add PR template. (<code>[#342](twisted/towncrier#342) <https://github.com/hawkowl/towncrier/issues/342></code>_)</li> <li>Move docs too the main branch and document custom fragment types. (<code>[#367](twisted/towncrier#367) <https://github.com/hawkowl/towncrier/issues/367></code>_)</li> <li>The CLI help messages were updated to contain more information. (<code>[#384](twisted/towncrier#384) <https://github.com/hawkowl/towncrier/issues/384></code>_)</li> </ul> <h2>Deprecations and Removals</h2> <ul> <li>Support for all Python versions older than 3.7 has been dropped. (<code>[#378](twisted/towncrier#378) <https://github.com/hawkowl/towncrier/issues/378></code>_)</li> </ul> <h2>Misc</h2> <ul> <li><code>[#292](twisted/towncrier#292) <https://github.com/hawkowl/towncrier/issues/292></code><em>, <code>[#330](twisted/towncrier#330) <https://github.com/hawkowl/towncrier/issues/330></code></em>, <code>[#366](twisted/towncrier#366) <https://github.com/hawkowl/towncrier/issues/366></code><em>, <code>[#376](twisted/towncrier#376) <https://github.com/hawkowl/towncrier/issues/376></code></em>, <code>[#377](twisted/towncrier#377) <https://github.com/hawkowl/towncrier/issues/377></code><em>, <code>[#380](twisted/towncrier#380) <https://github.com/hawkowl/towncrier/issues/380></code></em>, <code>[#381](twisted/towncrier#381) <https://github.com/hawkowl/towncrier/issues/381></code><em>, <code>[#382](twisted/towncrier#382) <https://github.com/hawkowl/towncrier/issues/382></code></em>, <code>[#383](twisted/towncrier#383) <https://github.com/hawkowl/towncrier/issues/383></code><em>, <code>[#393](twisted/towncrier#393) <https://github.com/hawkowl/towncrier/issues/393></code></em>, <code>[#399](twisted/towncrier#399) <https://github.com/hawkowl/towncrier/issues/399></code><em>, <code>[#402](twisted/towncrier#402) <https://github.com/hawkowl/towncrier/issues/402></code></em></li> </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/twisted/towncrier/commit/411f2676b18daf9ba1eb656f7dc6c726397c4a9e"><code>411f267</code></a> Update version for final release.</li> <li><a href="https://github.com/twisted/towncrier/commit/f031dfa94e52e07b6c71e88cd5cd50e3803ad96c"><code>f031dfa</code></a> towncrier build --yes</li> <li><a href="https://github.com/twisted/towncrier/commit/4c854f58a2074458cd66767aca9f3aaa34d842d8"><code>4c854f5</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/hawkowl/towncrier/issues/402">#402</a> from webknjaz/patch-2</li> <li><a href="https://github.com/twisted/towncrier/commit/f911402b69960bee358b0c2011d685721afa9454"><code>f911402</code></a> Pin external github actions,</li> <li><a href="https://github.com/twisted/towncrier/commit/a814202234214182855fe4a5ffb40c7f7aec2b04"><code>a814202</code></a> [pre-commit.ci] auto fixes from pre-commit.com hooks</li> <li><a href="https://github.com/twisted/towncrier/commit/675219a6deac7c65bb94b72da55059b7077e5ec4"><code>675219a</code></a> Add a dummy change note for PR <a href="https://github-redirect.dependabot.com/hawkowl/towncrier/issues/402">#402</a></li> <li><a href="https://github.com/twisted/towncrier/commit/b566bfb0dcdcd86fa9d349875eba15e647c06459"><code>b566bfb</code></a> Uninvent the wheel w/ <code>re-actors/alls-green</code> @ GHA</li> <li><a href="https://github.com/twisted/towncrier/commit/5bf0a4653bb2adf52162550d436f1dc39f6e0446"><code>5bf0a46</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/hawkowl/towncrier/issues/396">#396</a> from twisted/292-more-ci-checks</li> <li><a href="https://github.com/twisted/towncrier/commit/1bb62219a9e7b0d969292cae56104678b8bea151"><code>1bb6221</code></a> Merge branch 'trunk' into 292-more-ci-checks</li> <li><a href="https://github.com/twisted/towncrier/commit/07baa2ba4b1159462dcb212395be1de91674698d"><code>07baa2b</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/hawkowl/towncrier/issues/395">#395</a> from twisted/384-cli-help</li> <li>Additional commits viewable in <a href="https://github.com/hawkowl/towncrier/compare/21.9.0...22.8.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> Changes needed for this * Invert logic for single file. 22.8.0 fixed the logic such that single_file=False is correct when you have more than one file * Pin versions of towncrier and sphinx towncrier to reflect this (so we get the right config) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jens H. Nielsen <Jens.Nielsen@microsoft.com>

nataliejpg and others added 19 commits July 26, 2016 11:00

Merge branch 'master' into ATS9870-dev-branch

293637a

Merge branch 'ATS9870-dev-branch' of https://github.com/qdev-dk/Qcodes …

c0a1dff

…into ATS9870-dev-branch

Merge branch 'ATS9870-dev-branch' of https://github.com/qdev-dk/Qcodes …

6e85d14

…into ATS9870-dev-branch

feature: initial commit for ATS9360 alazar driver.

18aa323

Generalise ATS.py and debugging. Changes to example notebook. Add specific ATS9360.py file for board settings. nb in this commit there is no use of the acquisition controller

style: Remove some print statememnts from ATS.py

256b35a

tidy up ATS.py comments and create test acquisition conroller for ATS…

9b0d84b

…9360

more edits on acquisition_controller

5f02af0

First steps to filter acquisition controller and docstrings

b242aa0

feat: variety of QDev acquisition controllers created, not complete

3a27d43

refactor/style: comments and docstings tidy up and temporary test ref…

23cde4e

…actor

Merge with master and fix conflicts

f29f4ab

fix: ATS closer to working for 9360

e4dcdfd

feature: basic yoko driver added

1cf0080

comments and small tidy

4b7b47f

remove reset on initialisation

f129daa

Merge branch 'master' into driver/yokogawaGS200

39c27ce

pep8

678f310

deleting the mess that was me branching off of my ATS9360 dev branch …

71b0b24

…so this one is cleaner

replace accidentally deleted alazar example notebook

51d95ad

WilliamHPNielsen approved these changes Nov 24, 2016

View reviewed changes

nataliejpg and others added 2 commits November 24, 2016 16:11

add init docstring

d1f54b8

Merge branch 'master' into driver/yokogawaGS200

8c3f516

giulioungaretti added this to the v.0.1.3 milestone Nov 25, 2016

giulioungaretti suggested changes Nov 28, 2016

View reviewed changes

nataliejpg and others added 3 commits November 30, 2016 13:23

move docsting to be on class level

dc1a02a

Merge branch 'master' into driver/yokogawaGS200

fb5d95b

Merge branch 'master' into driver/yokogawaGS200

a2ec96c

giulioungaretti approved these changes Feb 10, 2017

View reviewed changes

Remove unused reset arg

ebbe2ab

giulioungaretti merged commit ac19458 into microsoft:master Feb 10, 2017

giulioungaretti pushed a commit that referenced this pull request Feb 10, 2017

Generated gh-pages for commit ac19458

791303a

Author: Natalie Pearson <npearson@phys.ethz.ch> feature: driver/yokogawa gs200 (#393)

nataliejpg deleted the driver/yokogawaGS200 branch March 9, 2017 10:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature: driver/yokogawa gs200 #393

feature: driver/yokogawa gs200 #393

nataliejpg commented Nov 19, 2016

WilliamHPNielsen left a comment

giulioungaretti left a comment

giulioungaretti Nov 28, 2016

nataliejpg Nov 30, 2016

jenshnielsen commented Feb 10, 2017

giulioungaretti commented Feb 10, 2017

jenshnielsen commented Feb 10, 2017

feature: driver/yokogawa gs200 #393

feature: driver/yokogawa gs200 #393

Conversation

nataliejpg commented Nov 19, 2016

WilliamHPNielsen left a comment

Choose a reason for hiding this comment

giulioungaretti left a comment

Choose a reason for hiding this comment

giulioungaretti Nov 28, 2016

Choose a reason for hiding this comment

nataliejpg Nov 30, 2016

Choose a reason for hiding this comment

jenshnielsen commented Feb 10, 2017

giulioungaretti commented Feb 10, 2017

jenshnielsen commented Feb 10, 2017