Skip to content

TekScope bug fix #118

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

Merged
merged 2 commits into from
Jun 25, 2024
Merged

TekScope bug fix #118

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
259ea85
Move one object update out of the h5 block (for slight speedup if h5l…
Jun 25, 2024
fc3aeb9
Merge branch 'labscript-suite:master' into master
ispielma Jun 25, 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: 4 additions & 2 deletions labscript_devices/TekScope/blacs_workers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ def transition_to_buffered(self, device_name, h5file, front_panel_values, refres
self.scope_params = labscript_utils.properties.get(
hdf5_file, device_name, 'device_properties'
)
self.scope.dev.timeout = 1000 * self.scope_params.get('timeout', 5)

self.scope.dev.timeout = 1000 * self.scope_params.get('timeout', 5)

self.scope.unlock()
self.scope.set_acquire_state(True)
Expand Down Expand Up @@ -61,10 +62,11 @@ def transition_to_manual(self):

# Open the file after download so as not to hog the file lock
with h5py.File(self.h5file, 'r+') as hdf_file:
grp = hdf_file.create_group('/data/traces')
grp = hdf_file.require_group('/data/traces')
print('Saving traces...')
dset = grp.create_dataset(self.device_name, data=data)
dset.attrs.update(wfmp[ch])

print('Done!')
return True

Expand Down