Skip to content

Remove latent dependency on runmanager due to get_shot_globals. #111

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 1 commit into from
Mar 19, 2024
Merged

Remove latent dependency on runmanager due to get_shot_globals. #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions labscript/labscript.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,8 +706,8 @@ def stop(t, target_cycle_time=None, cycle_time_delay_after_programming=False):
# TO_DELETE:runmanager-batchompiler-agnostic
# entire function load_globals can be deleted
def load_globals(hdf5_filename):
import runmanager
params = runmanager.get_shot_globals(hdf5_filename)
import labscript_utils.shot_utils
params = labscript_utils.shot_utils.get_shot_globals(hdf5_filename)
with h5py.File(hdf5_filename,'r') as hdf5_file:
for name in params.keys():
if name in globals() or name in locals() or name in _builtins_dict:
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ packages = find:
python_requires = >=3.6
install_requires =
importlib_metadata
labscript_utils>=3.0.0
labscript_utils>=3.3.0
numpy>=1.15
scipy
matplotlib
Expand Down