Skip to content

Commit ec4cfb3

Browse files
committed
Introduce requirements file with all dependencies
1 parent 7eda620 commit ec4cfb3

File tree

2 files changed

+43
-38
lines changed

2 files changed

+43
-38
lines changed

README.md

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# Zurich Instruments Labber Drivers
22

3-
The Zurich Instruments Labber Drivers are a collection of instrument drivers for
3+
The Zurich Instruments Labber Drivers are a collection of instrument drivers for
44
the scientific measurement software [Labber](http://labber.org/). They provide
5-
a high-level interface of Zurich Instruments devices such as
5+
a high-level interface of Zurich Instruments devices such as
66

77
* the PQSC Programmable Quantum System Controller
88
* the HDAWG Arbitrary Waveform Generator
99
* the UHFQA and SHFQA Quantum Analyzers
1010
* the MFLI and UHFLI Lock-In Amplifiers
1111

12-
The Labber drivers are based on the
13-
[Zurich Instruments Toolkit](https://github.com/zhinst/zhinst-toolkit)
14-
(*zhinst-toolkit*), an extension of our Python API *ziPython* for high-level
15-
instrument control.
12+
The Labber drivers are based on the
13+
[Zurich Instruments Toolkit](https://github.com/zhinst/zhinst-toolkit)
14+
(*zhinst-toolkit*), an extension of our Python API *ziPython* for high-level
15+
instrument control.
16+
1617

17-
1818
# Status
1919

20-
The Zurich Instruments Labber Drivers are well tested and considered stable
21-
enough for general usage. The interfaces may have some incompatible changes
20+
The Zurich Instruments Labber Drivers are well tested and considered stable
21+
enough for general usage. The interfaces may have some incompatible changes
2222
between releases. Please check the changelog if you are upgrading.
2323

2424

@@ -27,56 +27,59 @@ between releases. Please check the changelog if you are upgrading.
2727
## LabOne
2828

2929
As prerequisite, the LabOne software version 20.01 or later must be installed.
30-
It can be downloaded for free at https://www.zhinst.com/labone. Follow the
31-
installation instructions specific to your platform. Verify that you can connect
32-
to your instrument(s) using the web interface of LabOne. If you are upgrading
33-
from an older version, be sure to update the firmware of al your devices using
34-
the web interface before continuing. In principle LabOne can be installed in a
35-
remote machine, but we highly recommend to install on the local machine where
30+
It can be downloaded for free at https://www.zhinst.com/labone. Follow the
31+
installation instructions specific to your platform. Verify that you can connect
32+
to your instrument(s) using the web interface of LabOne. If you are upgrading
33+
from an older version, be sure to update the firmware of al your devices using
34+
the web interface before continuing. In principle LabOne can be installed in a
35+
remote machine, but we highly recommend to install on the local machine where
3636
you intend to run the experiment.
3737

3838

3939
## Labber Drivers
4040

41-
Download this repository as ZIP folder and unpack its content. It contains four
42-
folders with the names *'Zurich_Instruments_XXXX'* that define the instrument
43-
drivers. In order to make the drivers available in Labber, the folders
44-
*'Zurich_Instruments_XXXX'* need to be copied to your *local* Labber Drivers
45-
folder. It is located in *'C:\Users\USERNAME\Labber\Drivers'* or similar. Once
46-
the driver folders are copied to your local Labber Drivers folder, they are
41+
Download this repository as ZIP folder and unpack its content. It contains a set of
42+
folders with the names *'Zurich_Instruments_XXXX'* that define the instrument
43+
drivers. In order to make the drivers available in Labber, the folders
44+
*'Zurich_Instruments_XXXX'* need to be copied to your *local* Labber Drivers
45+
folder. It is located in *'C:\Users\USERNAME\Labber\Drivers'* or similar. Once
46+
the driver folders are copied to your local Labber Drivers folder, they are
4747
available to be selected in the *Labber Instrument Server*.
4848

49-
## Install `zhinst-toolkit`
49+
## Install dependencies (e.g. `zhinst-toolkit`)
5050

51-
The Zurich Instruments Labber Drivers are based on the
52-
[Zurich Instruments Toolkit](https://github.com/zhinst/zhinst-toolkit). The `zhinst-toolkit` Python package needs to be installed and available for Labber
53-
to use. There are two ways to do this:
51+
The Zurich Instruments Labber Drivers are based on the
52+
[Zurich Instruments Toolkit](https://github.com/zhinst/zhinst-toolkit) and a small set of third party packages.
53+
A complete list can be found inside the [requirements.txt](requirements.txt)[]().
54+
There are two ways to install these dependencies:
5455

5556
### Using Labber's Python distribution
5657

57-
Labber comes with its own Python distribution that is used by default. The `zhinst-toolkit` package needs to be installed with to this Python distribution,
58-
which is done using Labber's own `pip` package manager. It is located
59-
(on Windows) under C:\Program Files
60-
*'(x86)\Labber\python-labber\Scripts\pip.exe'* or similar. Use it to install `zhinst-toolkit`.
58+
Labber comes with its own Python distribution that is used by default. The required packages needs to be installed with to this Python distribution,
59+
which is done using Labber's own `pip` package manager. It is located
60+
(on Windows) under C:\Program Files
61+
*'(x86)\Labber\python-labber\Scripts\pip.exe'* or similar.
6162

63+
From within the unpacked project folder run:
6264
``` bash
63-
<path to Labber Scripts folder>\pip install zhinst-toolkit
65+
<path to Labber Scripts folder>\pip install -r requirements.txt
6466
```
6567

6668
### Use your own Anaconda distribution
6769

68-
Alternatively, Labber can also configured to use your own Python distribution. Under *Instrument Server -> Preferences -> Advanced -> Python Distribution* you can
69-
point Labber to a different Python distribution, for example your *Anaconda*
70-
environment. If you chose for example you *base* Anaconda environment, install `zhinst-toolkit` like this:
70+
Alternatively, Labber can also configured to use your own Python distribution. Under *Instrument Server -> Preferences -> Advanced -> Python Distribution* you can
71+
point Labber to a different Python distribution, for example your *Anaconda*
72+
environment. If you chose for example you *base* Anaconda environment, install the required packages as followed.
7173

74+
From within the unpacked project folder run:
7275
```
7376
conda activate base
74-
pip install zhinst-toolkit
77+
pip install -r requirements.txt
7578
```
7679

7780
## Try It Out
7881

79-
To see if your installation was successful, try to connect to your device. Add
80-
the instrument driver of your model to the *Instrument Server* with the serial
81-
number (e.g. *'dev1234'*) in the *Address* field and start the instrument. If
82-
the window turns green and no error emssage appears, you are ready to go!
82+
To see if your installation was successful, try to connect to your device. Add
83+
the instrument driver of your model to the *Instrument Server* with the serial
84+
number (e.g. *'dev1234'*) in the *Address* field and start the instrument. If
85+
the window turns green and no error emssage appears, you are ready to go!

requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
zhinst-toolkit >= 0.2.3
2+
numpy >= 1.20.0

0 commit comments

Comments
 (0)