Code

feature: driver/yokogawa gs200#393

Code

Merged

giulioungaretti merged 25 commits intomicrosoft:mastermicrosoft/Qcodes:masterfrom nataliejpg:driver/yokogawaGS200nataliejpg/Qcodes:driver/yokogawaGS200Copy head branch name to clipboardFeb 10, 2017

+38

Commits

Commits on Jul 26, 2016

• Merge branch 'master' into ATS9870-dev-branch

  nataliejpg

  committed
  293637a

  Copy full SHA for 293637a

Commits on Jul 28, 2016

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

  nataliejpg

  committed
  c0a1dff

  Copy full SHA for c0a1dff

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

  nataliejpg

  committed
  6e85d14

  Copy full SHA for 6e85d14

Commits on Aug 2, 2016

• feature: initial commit for ATS9360 alazar driver.

  Show description for 18aa323
  nataliejpg

  committed
  18aa323

  Copy full SHA for 18aa323

• style: Remove some print statememnts from ATS.py

  nataliejpg

  committed
  256b35a

  Copy full SHA for 256b35a

Commits on Aug 3, 2016

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

  nataliejpg

  committed
  9b0d84b

  Copy full SHA for 9b0d84b

Commits on Aug 4, 2016

• more edits on acquisition_controller

  nataliejpg

  committed
  5f02af0

  Copy full SHA for 5f02af0

Commits on Aug 8, 2016

• First steps to filter acquisition controller and docstrings

  

  nataliejpg

  authored and

  Tina Bang Christensen

  committed
  b242aa0

  Copy full SHA for b242aa0

Commits on Aug 11, 2016

• feat: variety of QDev acquisition controllers created, not complete

  nataliejpg

  committed
  3a27d43

  Copy full SHA for 3a27d43

Commits on Aug 15, 2016

• refactor/style: comments and docstings tidy up and temporary test refactor

  nataliejpg

  committed
  23cde4e

  Copy full SHA for 23cde4e

Commits on Oct 17, 2016

• Merge with master and fix conflicts

  nataliejpg

  committed
  f29f4ab

  Copy full SHA for f29f4ab

Commits on Oct 25, 2016

• fix: ATS closer to working for 9360

  nataliejpg

  committed
  e4dcdfd

  Copy full SHA for e4dcdfd

Commits on Oct 27, 2016

• feature: basic yoko driver added

  nataliejpg

  committed
  1cf0080

  Copy full SHA for 1cf0080

Commits on Oct 31, 2016

• comments and small tidy

  nataliejpg

  committed
  4b7b47f

  Copy full SHA for 4b7b47f

Commits on Nov 19, 2016

• remove reset on initialisation

  nataliejpg

  committed
  f129daa

  Copy full SHA for f129daa

• Merge branch 'master' into driver/yokogawaGS200

  nataliejpg

  committed
  39c27ce

  Copy full SHA for 39c27ce

• pep8

  nataliejpg

  committed
  678f310

  Copy full SHA for 678f310

• deleting the mess that was me branching off of my ATS9360 dev branch so this one is cleaner

  nataliejpg

  committed
  71b0b24

  Copy full SHA for 71b0b24

• replace accidentally deleted alazar example notebook

  nataliejpg

  committed
  51d95ad

  Copy full SHA for 51d95ad

Commits on Nov 24, 2016

• add init docstring

  nataliejpg

  committed
  d1f54b8

  Copy full SHA for d1f54b8

Commits on Nov 25, 2016

• Merge branch 'master' into driver/yokogawaGS200

  giulioungaretti

  authored
  8c3f516

  Copy full SHA for 8c3f516

Commits on Nov 30, 2016

• move docsting to be on class level

  nataliejpg

  committed
  dc1a02a

  Copy full SHA for dc1a02a

Commits on Feb 9, 2017

• Merge branch 'master' into driver/yokogawaGS200

  giulioungaretti

  authored
  fb5d95b

  Copy full SHA for fb5d95b

• Merge branch 'master' into driver/yokogawaGS200

  giulioungaretti

  authored
  a2ec96c

  Copy full SHA for a2ec96c

Commits on Feb 10, 2017

• Remove unused reset arg

  giulioungaretti

  authored
  ebbe2ab

  Copy full SHA for ebbe2ab