brukerapi 0.1.9__py3-none-any.whl → 0.2.0__py3-none-any.whl
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.
- brukerapi/cli.py +21 -30
- brukerapi/config/properties_fid_core.json +63 -6
- brukerapi/config/properties_rawdata_core.json +16 -9
- brukerapi/config/properties_rawdata_custom.json +65 -1
- brukerapi/data.py +2 -3
- brukerapi/dataset.py +159 -158
- brukerapi/exceptions.py +57 -84
- brukerapi/folders.py +183 -169
- brukerapi/jcampdx.py +223 -237
- brukerapi/mergers.py +15 -22
- brukerapi/schemas.py +222 -279
- brukerapi/splitters.py +100 -87
- brukerapi/utils.py +35 -36
- brukerapi-0.2.0.dist-info/METADATA +244 -0
- brukerapi-0.2.0.dist-info/RECORD +25 -0
- {brukerapi-0.1.9.dist-info → brukerapi-0.2.0.dist-info}/WHEEL +1 -1
- brukerapi-0.1.9.dist-info/METADATA +0 -13
- brukerapi-0.1.9.dist-info/RECORD +0 -25
- {brukerapi-0.1.9.dist-info → brukerapi-0.2.0.dist-info}/entry_points.txt +0 -0
- {brukerapi-0.1.9.dist-info → brukerapi-0.2.0.dist-info/licenses}/LICENSE +0 -0
- {brukerapi-0.1.9.dist-info → brukerapi-0.2.0.dist-info}/top_level.txt +0 -0
brukerapi/mergers.py
CHANGED
|
@@ -1,10 +1,5 @@
|
|
|
1
|
-
from .utils import index_to_slice
|
|
2
|
-
from .dataset import Dataset
|
|
3
|
-
|
|
4
|
-
import numpy as np
|
|
5
|
-
|
|
6
1
|
class FrameGroupMerger:
|
|
7
|
-
SUPPORTED_FG = [
|
|
2
|
+
SUPPORTED_FG = ["FG_COMPLEX"]
|
|
8
3
|
|
|
9
4
|
@classmethod
|
|
10
5
|
def merge(cls, dataset, fg):
|
|
@@ -17,14 +12,14 @@ class FrameGroupMerger:
|
|
|
17
12
|
|
|
18
13
|
"""
|
|
19
14
|
|
|
20
|
-
if "<{}>"
|
|
21
|
-
raise ValueError(f
|
|
15
|
+
if f"<{fg}>" not in dataset.dim_type:
|
|
16
|
+
raise ValueError(f"Dataset does not contain {fg} frame group")
|
|
22
17
|
|
|
23
18
|
"""
|
|
24
19
|
CHECK if FG and index are valid
|
|
25
20
|
"""
|
|
26
21
|
# absolute index of FG_SLICE among dimensions of the dataset
|
|
27
|
-
fg_abs_index = dataset.dim_type.index("<{}>"
|
|
22
|
+
fg_abs_index = dataset.dim_type.index(f"<{fg}>")
|
|
28
23
|
|
|
29
24
|
# index of FG_SLICE among frame group dimensions of the dataset
|
|
30
25
|
fg_rel_index = fg_abs_index - dataset.encoded_dim
|
|
@@ -43,8 +38,7 @@ class FrameGroupMerger:
|
|
|
43
38
|
|
|
44
39
|
return dataset
|
|
45
40
|
|
|
46
|
-
|
|
47
|
-
@ classmethod
|
|
41
|
+
@classmethod
|
|
48
42
|
def _merge_data(cls, dataset, fg_abs_index):
|
|
49
43
|
"""
|
|
50
44
|
Merge the data array in-place
|
|
@@ -82,7 +76,7 @@ class FrameGroupMerger:
|
|
|
82
76
|
@classmethod
|
|
83
77
|
def _merge_VisuCoreFrameCount(cls, dataset, fg_size):
|
|
84
78
|
try:
|
|
85
|
-
parameter = dataset[
|
|
79
|
+
parameter = dataset["VisuCoreFrameCount"]
|
|
86
80
|
except KeyError:
|
|
87
81
|
return
|
|
88
82
|
new_value = int(parameter.value / fg_size)
|
|
@@ -91,7 +85,7 @@ class FrameGroupMerger:
|
|
|
91
85
|
@classmethod
|
|
92
86
|
def _merge_VisuFGOrderDescDim(cls, dataset):
|
|
93
87
|
try:
|
|
94
|
-
parameter = dataset[
|
|
88
|
+
parameter = dataset["VisuFGOrderDescDim"]
|
|
95
89
|
except KeyError:
|
|
96
90
|
return
|
|
97
91
|
new_value = parameter.value - 1
|
|
@@ -99,20 +93,20 @@ class FrameGroupMerger:
|
|
|
99
93
|
if new_value > 1:
|
|
100
94
|
parameter.value = new_value
|
|
101
95
|
else:
|
|
102
|
-
del dataset._parameters[
|
|
96
|
+
del dataset._parameters["visu_pars"]["VisuFGOrderDescDim"]
|
|
103
97
|
|
|
104
98
|
@classmethod
|
|
105
99
|
def _merge_VisuCoreFrameType(cls, dataset):
|
|
106
100
|
try:
|
|
107
|
-
parameter = dataset[
|
|
101
|
+
parameter = dataset["VisuCoreFrameType"]
|
|
108
102
|
except KeyError:
|
|
109
103
|
return
|
|
110
|
-
parameter.value =
|
|
104
|
+
parameter.value = "COMPLEX_IMAGE"
|
|
111
105
|
|
|
112
106
|
@classmethod
|
|
113
107
|
def _merge_VisuFGOrderDesc(cls, dataset, fg):
|
|
114
108
|
try:
|
|
115
|
-
parameter = dataset[
|
|
109
|
+
parameter = dataset["VisuFGOrderDesc"]
|
|
116
110
|
except KeyError:
|
|
117
111
|
return
|
|
118
112
|
|
|
@@ -121,18 +115,17 @@ class FrameGroupMerger:
|
|
|
121
115
|
|
|
122
116
|
value = parameter.nested
|
|
123
117
|
for fg_ in value:
|
|
124
|
-
if fg_[1] ==
|
|
118
|
+
if fg_[1] == f"<{fg}>":
|
|
125
119
|
value.remove(fg_)
|
|
126
120
|
if value:
|
|
127
121
|
parameter.value = value
|
|
128
122
|
else:
|
|
129
|
-
del dataset.parameters[
|
|
123
|
+
del dataset.parameters["visu_pars"]["VisuFGOrderDesc"]
|
|
130
124
|
|
|
131
125
|
@classmethod
|
|
132
126
|
def _merge_VisuFGElemId(cls, dataset):
|
|
133
127
|
try:
|
|
134
|
-
|
|
128
|
+
dataset["VisuFGElemId"]
|
|
135
129
|
except KeyError:
|
|
136
130
|
return
|
|
137
|
-
del dataset.parameters[
|
|
138
|
-
|
|
131
|
+
del dataset.parameters["visu_pars"]["VisuFGElemId"]
|