10 Commits

Author SHA1 Message Date
e09538eaeb Consolidate temp, mf and zebra_mode naming 2021-02-05 14:48:48 +01:00
239949b7c0 Consolidate angle names between data formats 2021-02-05 14:48:48 +01:00
7e6df95c49 Track the original scan index 2021-02-05 14:48:48 +01:00
e38993e69d Keep scans in a list instead of a dict 2021-02-05 14:48:41 +01:00
5e979eb9e3 Reapply commits that add extra_meta 2021-02-02 10:38:05 +01:00
JakHolzer
d0b67b8565
Update merge_function.py
Fixed the normalization, changed the structure so we can merge duplicates without merging two dictionaries.
2021-01-24 15:14:25 +01:00
JakHolzer
241c2a9779
Correction of normalization
suggested by Dr. Zolliker
2020-12-18 16:23:14 +01:00
826363a0f5 Use add_dict instead of unified_merge for param study 2020-12-01 17:35:06 +01:00
216de442a5 Display filename in the scan table 2020-11-24 16:14:43 +01:00
JakHolzer
f7f016cf1c
First draft of new merge function
This is the first shot at the new merge function. I didnt wanna rewrite the previous before we agree on this, since I think there will be some changes. Therefore I would like to discuss this first. Since we agreed not to do is as previously, ergo first scan everything and then merge or add, I've tried to do these function recursive. Haven't tested it much, I would like to agree if this would be a good way on how to write it.
2020-11-17 15:25:09 +01:00