Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
XRD
darfix
Commits
47003726
Commit
47003726
authored
Aug 25, 2021
by
Julia Garriga Ferrer
Browse files
Merge branch 'fix_bugs' into 'master'
Fix bugs See merge request
!135
parents
dca8bd41
a165d784
Pipeline
#53296
passed with stage
in 4 minutes and 55 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
darfix/core/dataset.py
View file @
47003726
...
...
@@ -1504,11 +1504,15 @@ class Data(numpy.ndarray):
self
.
_lock
.
release
()
_file
=
h5py
.
File
(
save
,
'a'
)
dataset_name
=
"dataset"
new_shape
=
self
.
shape
if
new_shape
is
None
else
tuple
(
new_shape
)
if
"dataset"
in
_file
:
if
new_shape
is
not
Non
e
:
if
new_shape
!=
_file
[
"dataset"
].
shap
e
:
_file
.
create_dataset
(
"update_dataset"
,
new_shape
,
dtype
=
self
.
dtype
)
else
:
_file
.
create_dataset
(
"update_dataset"
,
data
=
_file
[
"dataset"
])
_file
.
create_dataset
(
"update_dataset"
,
shape
=
_file
[
"dataset"
].
shape
,
dtype
=
_file
[
"dataset"
].
dtype
)
for
i
,
img
in
enumerate
(
_file
[
"dataset"
]):
_file
[
"update_dataset"
][
i
]
=
img
dataset_name
=
"update_dataset"
else
:
new_shape
=
self
.
shape
if
new_shape
is
None
else
new_shape
...
...
@@ -1567,9 +1571,11 @@ class Data(numpy.ndarray):
_file
=
h5py
.
File
(
path
,
'a'
)
new_shape
=
self
.
shape
if
new_shape
is
None
else
tuple
(
new_shape
)
if
"dataset"
not
in
_file
:
_file
.
create_dataset
(
"dataset"
,
self
.
shape
,
dtype
=
self
.
dtype
)
elif
new_shape
is
not
Non
e
:
elif
new_shape
!=
_file
[
"dataset"
].
shap
e
:
del
_file
[
"dataset"
]
_file
.
create_dataset
(
"dataset"
,
new_shape
,
dtype
=
self
.
dtype
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment