Skip to content

feature: SR865 driver#242

Merged
euchas merged 9 commits into
masterfrom
adomas-drivers
Jul 27, 2016
Merged

feature: SR865 driver#242
euchas merged 9 commits into
masterfrom
adomas-drivers

Conversation

@euchas

@euchas euchas commented Jun 17, 2016

Copy link
Copy Markdown
Contributor

Changes proposed in this pull request :

@Rubenknex

Copy link
Copy Markdown
Contributor

I think you can copy most of the functionality from the SR830 driver in #139 that is nearly complete.

@euchas

euchas commented Jul 21, 2016

Copy link
Copy Markdown
Contributor Author

@alexcjohnson updated strings to numbers. Anything else to fix?

class Stanford_SR865(VisaInstrument):
"""
This is the code for Stanford_SR865 Lock-in Amplifier
Status: writing in progress

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Status can be upgraded - beta perhaps, until it's seen use in an experiment?

@giulioungaretti you've made the point that first lines like this are pretty useless and I agree - but is there anything specific you'd like to see there instead?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though call, maybe nothing at all just if anything status, quirks and so on ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alexcjohnson I have pushed the latest version.

if mode in ['a', 'a-b']:
self.sensitivity.set_validator(self._VOLT_ENUM)
self._set_units('V')
else:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you ever enter these else blocks? Up above you are only define a and a-b. Some other lockins can do voltage or current, does this one?

@qcodes-bot

Copy link
Copy Markdown

Codacy Here is an overview of what got changed by this pull request:

Issues
======
+ Solved 1
- Added 2


Complexity increasing per file
==============================
- qcodes/instrument_drivers/stanford_research/SR865.py  2


Clones added
============
- qcodes/instrument_drivers/stanford_research/SR865.py  17

See the complete overview on Codacy

units='s',
get_cmd='OFLT?',
set_cmd='OFLT {}',
val_mapping={1e-6: 0, 3e-6: 1,

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@euchas

euchas commented Jul 27, 2016

Copy link
Copy Markdown
Contributor Author

@alexcjohnson ok so this is the current version for SR865 what I have. Anything out of ordinary or I can merge?

@euchas

euchas commented Jul 27, 2016

Copy link
Copy Markdown
Contributor Author

@alexcjohnson dancer? :)

@alexcjohnson

Copy link
Copy Markdown
Contributor

💃

@euchas euchas merged commit 8196c88 into master Jul 27, 2016
@euchas euchas deleted the adomas-drivers branch July 27, 2016 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants