Skip to content

Commit

Permalink
conda installation
Browse files Browse the repository at this point in the history
  • Loading branch information
julienbarrier committed Dec 8, 2021
1 parent 0a54b7c commit 8809df3
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 2 deletions.
25 changes: 25 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: mesoscopy
channels:
- defaults
dependencies:
- python>=3.9
- pip
- numpy
- matplotlib
- qcodes
- conda-forge::pyqtgraph=0.11.0
- h5py=2:10.0
- pyqt=5.9.2
- QtPy
- jsonschema
- jupyter
- hypothesis
- scipy
- pandas
- tqdm
- conda-forrge::websockets
conda-forge::schema
conda-forge::requirements-parser
- pip:
- pyvisa

5 changes: 3 additions & 2 deletions mesoscopy/instrument/lockin.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ def init_lockin(
freq: Optional[float] = 127,
ampl: Optional[float] = 1,
TC: Optional[float] = None,
filterorder=8
filterorder: Optional[int] = 8,
sensitivity: Optional[float] = 0.003
):

lockins = _list_lockins(station)
Expand Down Expand Up @@ -60,7 +61,7 @@ def init_lockin(
station.__getattr__(lockin).sigins[0].diff(1)
station.__getattr__(lockin).sigins[0].float(1)
station.__getattr__(lockin).sigins[0].scaling(1)
station.__getattr__(lockin).sigins[0].range(3e-3)
station.__getattr__(lockin).sigins[0].range(sensitivity)

station.__getattr__(lockin).sigouts[0].range(10)

Expand Down

0 comments on commit 8809df3

Please sign in to comment.