Skip to content

Commit

Permalink
ugh more wrapping
Browse files Browse the repository at this point in the history
  • Loading branch information
hinnefe2 committed Apr 17, 2016
1 parent 5e9d0d0 commit e647d10
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
6 changes: 4 additions & 2 deletions labdrivers/keithley/keithley2400.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@
import os.path
import time
import logging
import pandas as pd
from numpy import linspace

# non standard-lib libraries, wrapped w/ try catch so that
# readthedocs doesn't fail to build the documentation
try:
import pandas as pd
from numpy import linspace
import visa
from pyvisa.errors import VisaIOError
except ImportError:
Expand Down
18 changes: 18 additions & 0 deletions labdrivers/srs/sr830.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
"""Module containing a class to interface with a SR830 Lockin Amplifier
This module requires a National Instruments VISA driver, which can be found at
https://www.ni.com/visa/
Attributes:
resource_manager: the pyvisa resource manager which provides the visa
objects used for communicating over the GPIB interface
logger: a python logger object
Classes:
sr830: a class for interfacing with a SR830 Lockin Amplifier
"""
import time
import logging

# non standard-lib libraries, wrapped w/ try catch so that
# readthedocs doesn't fail to build the documentation
try:
import visa
from pyvisa.errors import VisaIOError
Expand Down

0 comments on commit e647d10

Please sign in to comment.