*** Wartungsfenster jeden ersten Mittwoch vormittag im Monat ***

Skip to content
Snippets Groups Projects
Commit 6490fab7 authored by David Meyer's avatar David Meyer
Browse files

Break dependency on runmanager by using `labscript_utils.shot_utils.get_shot_globals`

parent 91b87a96
No related branches found
No related tags found
1 merge request!2Merge from GitHub
...@@ -16,7 +16,7 @@ import tzlocal ...@@ -16,7 +16,7 @@ import tzlocal
import labscript_utils.shared_drive import labscript_utils.shared_drive
from labscript_utils.connections import _ensure_str from labscript_utils.connections import _ensure_str
from labscript_utils.properties import get_attributes from labscript_utils.properties import get_attributes
import runmanager from labscript_utils.shot_utils import get_shot_globals
def asdatetime(timestr): def asdatetime(timestr):
...@@ -26,7 +26,7 @@ def asdatetime(timestr): ...@@ -26,7 +26,7 @@ def asdatetime(timestr):
return pandas.Timestamp(timestr, tz=tz) return pandas.Timestamp(timestr, tz=tz)
def get_nested_dict_from_shot(filepath): def get_nested_dict_from_shot(filepath):
row = runmanager.get_shot_globals(filepath) row = get_shot_globals(filepath)
with h5py.File(filepath,'r') as h5_file: with h5py.File(filepath,'r') as h5_file:
if 'results' in h5_file: if 'results' in h5_file:
for groupname in h5_file['results']: for groupname in h5_file['results']:
......
...@@ -31,12 +31,11 @@ install_requires = ...@@ -31,12 +31,11 @@ install_requires =
desktop-app>=0.1.2 desktop-app>=0.1.2
h5py h5py
importlib_metadata importlib_metadata
labscript_utils>=3.0.0 labscript_utils>=3.3.0
matplotlib matplotlib
numpy numpy
pandas>=0.21 pandas>=0.21
qtutils>=2.2.2 qtutils>=2.2.2
runmanager>=3.0.0
scipy scipy
tzlocal tzlocal
zprocess>=2.2.2 zprocess>=2.2.2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment