Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some bugs #8

Merged
merged 4 commits into from
Aug 20, 2024
Merged

Fix some bugs #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8321830
Fix installation issue by removing `pyproject.toml`
SengerM Aug 14, 2024
12967bb
Fixed mistake in `data_type` argument
SengerM Aug 19, 2024
4e0f63a
Fixed issue in call to `make_generic_array`
SengerM Aug 19, 2024
a41df88
Disabled `DEBUG_MODE` as default
SengerM Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions pyproject.toml
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions src/pylptlib/lpt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
_dll_path = r"C:\s4200\sys\bin\lptlib.dll"
_dll = None

DEBUG_MODE = True
DEBUG_MODE = False


# ### UTILITY FUNCTIONS
Expand Down Expand Up @@ -585,7 +585,7 @@ def pulse_fetch(instr_id: int, chan: int, start_index: int, stop_index: int) ->

meas_v = make_double_array(buffer_size)
meas_i = make_double_array(buffer_size)
statuses = make_generic_array(buffer_size, data_type=c.c_ulong())
statuses = make_generic_array(buffer_size, data_type=c.c_ulong)
timestamp = make_double_array(buffer_size)

# TODO: check whether statuses needs byref
Expand Down Expand Up @@ -832,10 +832,7 @@ def pulse_sweep_linear(instr_id: int, chan: int, sweep_type: int, start: float,

def pulse_train(instr_id: int, chan: int, v_base: float, v_amplitude: float):
""" """
v_base = c.c_double(v_base) if v_base else None
v_amplitude = c.c_double(v_amplitude) if v_amplitude else None

err = _dll.pulse_train(c.c_int32(instr_id), c.c_int32(chan))
err = _dll.pulse_train(c.c_int32(instr_id), c.c_int32(chan), c.c_double(v_base), c.c_double(v_amplitude))
check_error(err)


Expand Down
Loading