Skip to content

beta driver for Keithley and docstrings#69

Merged
eendebakpt merged 8 commits into
masterfrom
eendebakpt_keith
Apr 18, 2016
Merged

beta driver for Keithley and docstrings#69
eendebakpt merged 8 commits into
masterfrom
eendebakpt_keith

Conversation

@eendebakpt

Copy link
Copy Markdown
Contributor

No description provided.

@eendebakpt eendebakpt mentioned this pull request Apr 8, 2016
self._trigger_sent = False

# Add parameters to wrapper
self.add_parameter('mode', get_cmd=':CONF?', get_parser=lambda x: x.strip().strip('"'), set_cmd=':CONF:{}', vals=StringValidator() )

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.

can you wrap these to 80 chars for readability?

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.

btw I see the wrapping below in the commented-out section, that I gather someone else wrote and you're just porting - just wanted to point out that it doesn't use the Python standard wrapping, which is to align with the opening paren inside which you're wrapping.

flags=Instrument.FLAG_GETSET,
units='s', minval=0.001, maxval=99999.999, type=float)
self.add_parameter('readval', flags=Instrument.FLAG_GET,
units='AU',

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.

@eendebakpt I noticed you use 'AU' for arbitrary units, I am using 'a.u.' in my drivers. I don't really care about which we use but I guess it's better to be consistent.

@damazter

damazter commented Apr 8, 2016

Copy link
Copy Markdown
Contributor

@AdriaanRol

Copy link
Copy Markdown
Contributor

@damazter , I couldn't resist following your link. I think especially the reasoning why AU and a.u. should not be used makes sense.

Abbreviations for "arbitrary unit" include: arb. unit,[1] arb. u., AU,[3] and a.u.[4] Among these, "AU" and "a.u." are common abbreviations for astronomical units and atomic units.[5] For this reason, Japanese Journal of Applied Physics, and probably other academic journals, recommend against using "a.u." (Jpn. J. Appl. Phys recommends "arb. unit" instead).

Let's stick to "arb.unit"

@MerlinSmiles

Copy link
Copy Markdown
Contributor

@eendebakpt I think the driver file should be renamed to fit the actual instrument and not the (previous?) company name

@alexcjohnson

Copy link
Copy Markdown
Contributor

@eendebakpt I did some linting and fixed a bug with the parameter docstring - it needed a separate form for the composite parameter case (multiple names etc).

This is good to go from my standpoint - thanks for all the other little changes! 💃
Check out the changes I made, make sure you're happy with them, then you can merge.

@eendebakpt eendebakpt merged commit 83d23bd into master Apr 18, 2016
@peendebak peendebak deleted the eendebakpt_keith branch April 19, 2016 15:21
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.

6 participants