From cad08c7ee6b2f31a9136c861d3eb1a98111520e1 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Wed, 14 Jul 2021 16:35:33 +0100
Subject: [PATCH] Replace h5py dataset.value with dataset[()]
---
src/cal_tools/ana_tools.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/cal_tools/ana_tools.py b/src/cal_tools/ana_tools.py
index b9074e118..edc60e75d 100644
--- a/src/cal_tools/ana_tools.py
+++ b/src/cal_tools/ana_tools.py
@@ -52,7 +52,7 @@ def load_data_from_hdf5(filelist):
ctime = data[cKey][mKey].get("ctime", [])
for timeKey in f.get("/".join((cKey, mKey, tKey))):
path = "/".join((cKey, mKey, tKey, timeKey))
- value = f.get(path).value
+ value = f.get(path)[()]
value = dateutil.parser.parse(value)
ctime.append(value)
data[cKey][mKey]["ctime"] = ctime
@@ -60,8 +60,8 @@ def load_data_from_hdf5(filelist):
# Load ndarray if they are there
item = f.get("/".join((cKey, mKey, tKey)))
- if isinstance(item, h5py._hl.dataset.Dataset):
- data[cKey][mKey][tKey] = item.value
+ if isinstance(item, h5py.Dataset):
+ data[cKey][mKey][tKey] = item[()]
continue
# Loop over stored data
@@ -75,7 +75,7 @@ def load_data_from_hdf5(filelist):
mdata_d[mdKey] = f.get(
"/".join(
(cKey, mKey, tKey, 'mdata',
- mdKey))).value
+ mdKey)))[()]
mdata_l = data[cKey][mKey].get("mdata", [])
mdata_l.append(mdata_d)
data[cKey][mKey]["mdata"] = mdata_l
@@ -85,7 +85,7 @@ def load_data_from_hdf5(filelist):
data[cKey][mKey][dKey] = []
value = f.get(
- "/".join((cKey, mKey, tKey, dKey))).value
+ "/".join((cKey, mKey, tKey, dKey)))[()]
if dKey == "ctime":
value = dateutil.parser.parse(value)
--
GitLab