ewoksdata 2.1.0__tar.gz → 2.2.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {ewoksdata-2.1.0/src/ewoksdata.egg-info → ewoksdata-2.2.0}/PKG-INFO +2 -2
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/pyproject.toml +2 -2
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/blissdata/blissdatav2.py +5 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/hdf5/dataset_writer/_sequential_stack.py +6 -3
- {ewoksdata-2.1.0 → ewoksdata-2.2.0/src/ewoksdata.egg-info}/PKG-INFO +2 -2
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata.egg-info/requires.txt +1 -1
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/LICENSE.md +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/README.md +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/setup.cfg +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/__init__.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/__init__.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/bliss.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/blissdata/__init__.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/blissdata/blissdatav0.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/blissdata/blissdatav1.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/contextiterator.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/hdf5/__init__.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/hdf5/config.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/hdf5/dataset_writer/__init__.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/hdf5/dataset_writer/_base.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/hdf5/dataset_writer/_non_sequential.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/hdf5/dataset_writer/_non_sequential_stack.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/hdf5/dataset_writer/_sequential.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/hdf5/types.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/nexus.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/url.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/utils.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/tests/__init__.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/tests/conftest.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/tests/data/__init__.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/tests/data/bliss_scans.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/tests/test_contextiterator.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/tests/test_data_bliss.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/tests/test_data_hdf5.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/tests/test_data_nexus.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/tests/test_dataset_writer.py +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata.egg-info/SOURCES.txt +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata.egg-info/dependency_links.txt +0 -0
- {ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata.egg-info/top_level.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: ewoksdata
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.2.0
|
|
4
4
|
Summary: Ewoks tasks for data access
|
|
5
5
|
Author-email: ESRF <dau-pydev@esrf.fr>
|
|
6
6
|
License: # MIT License
|
|
@@ -45,7 +45,7 @@ Requires-Dist: redis!=5.3.0b1,!=5.3.0b3
|
|
|
45
45
|
Requires-Dist: redis-om!=1.0.0b0; python_version < "3.9"
|
|
46
46
|
Requires-Dist: redis-om!=1.0.3b0; python_version < "3.9"
|
|
47
47
|
Provides-Extra: online
|
|
48
|
-
Requires-Dist: blissdata[tango]; extra == "online"
|
|
48
|
+
Requires-Dist: blissdata[lima2,tango]; extra == "online"
|
|
49
49
|
Provides-Extra: test
|
|
50
50
|
Requires-Dist: ewoksdata[online]; extra == "test"
|
|
51
51
|
Requires-Dist: pytest>=7; extra == "test"
|
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "ewoksdata"
|
|
7
|
-
version = "2.
|
|
7
|
+
version = "2.2.0"
|
|
8
8
|
authors = [{ name = "ESRF", email = "dau-pydev@esrf.fr" }]
|
|
9
9
|
description = "Ewoks tasks for data access"
|
|
10
10
|
readme = { file = "README.md", content-type = "text/markdown" }
|
|
@@ -36,7 +36,7 @@ Changelog = "https://gitlab.esrf.fr/workflow/ewoksapps/ewoksdata/-/blob/main/CHA
|
|
|
36
36
|
|
|
37
37
|
[project.optional-dependencies]
|
|
38
38
|
online = [
|
|
39
|
-
"blissdata[tango]"
|
|
39
|
+
"blissdata[tango,lima2]"
|
|
40
40
|
]
|
|
41
41
|
test = [
|
|
42
42
|
"ewoksdata[online]",
|
|
@@ -198,6 +198,11 @@ def _get_streams(
|
|
|
198
198
|
if name.split(":")[-2] in lima_names:
|
|
199
199
|
streams[name.split(":")[-2]] = stream
|
|
200
200
|
|
|
201
|
+
elif stream.info["plugin"] == "lima2":
|
|
202
|
+
for lima_name in lima_names:
|
|
203
|
+
if name == f"{lima_name}:frame":
|
|
204
|
+
streams[lima_name] = stream
|
|
205
|
+
|
|
201
206
|
elif name.split(":")[-1] in counter_names:
|
|
202
207
|
streams[name.split(":")[-1]] = stream
|
|
203
208
|
|
{ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/hdf5/dataset_writer/_sequential_stack.py
RENAMED
|
@@ -164,6 +164,8 @@ class StackDatasetWriter(DatasetWriterBase):
|
|
|
164
164
|
non_ragged_destination = len(set(istart0_dim1)) == 1
|
|
165
165
|
|
|
166
166
|
if non_ragged_destination and non_ragged_buffers:
|
|
167
|
+
if flush_sizes_dim1[0] == 0:
|
|
168
|
+
continue # h5py=3.16 cannot handle this anymore
|
|
167
169
|
data = [buffer[: flush_sizes_dim1[0]] for buffer in buffers]
|
|
168
170
|
idx_dim1 = slice(istart0_dim1[0], istart0_dim1[0] + flush_sizes_dim1[0])
|
|
169
171
|
self._dataset[idx_dim0, idx_dim1] = data
|
|
@@ -174,9 +176,10 @@ class StackDatasetWriter(DatasetWriterBase):
|
|
|
174
176
|
istart0_dim1,
|
|
175
177
|
flush_sizes_dim1,
|
|
176
178
|
):
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
179
|
+
if i_flush_size_dim1 == 0:
|
|
180
|
+
continue # h5py=3.16 cannot handle this anymore
|
|
181
|
+
idx_dim1 = slice(istart_dim1, istart_dim1 + i_flush_size_dim1)
|
|
182
|
+
self._dataset[i_dim0, idx_dim1, ...] = buffer[:i_flush_size_dim1]
|
|
180
183
|
|
|
181
184
|
# Remove copied data from buffer
|
|
182
185
|
for i0 in range(size_dim0):
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: ewoksdata
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.2.0
|
|
4
4
|
Summary: Ewoks tasks for data access
|
|
5
5
|
Author-email: ESRF <dau-pydev@esrf.fr>
|
|
6
6
|
License: # MIT License
|
|
@@ -45,7 +45,7 @@ Requires-Dist: redis!=5.3.0b1,!=5.3.0b3
|
|
|
45
45
|
Requires-Dist: redis-om!=1.0.0b0; python_version < "3.9"
|
|
46
46
|
Requires-Dist: redis-om!=1.0.3b0; python_version < "3.9"
|
|
47
47
|
Provides-Extra: online
|
|
48
|
-
Requires-Dist: blissdata[tango]; extra == "online"
|
|
48
|
+
Requires-Dist: blissdata[lima2,tango]; extra == "online"
|
|
49
49
|
Provides-Extra: test
|
|
50
50
|
Requires-Dist: ewoksdata[online]; extra == "test"
|
|
51
51
|
Requires-Dist: pytest>=7; extra == "test"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/hdf5/dataset_writer/_non_sequential.py
RENAMED
|
File without changes
|
{ewoksdata-2.1.0 → ewoksdata-2.2.0}/src/ewoksdata/data/hdf5/dataset_writer/_non_sequential_stack.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|