Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nam
ProxPython
Commits
c2af5913
Commit
c2af5913
authored
Jan 21, 2021
by
Schellhorn
Browse files
more + to / for datapaths
parent
57c3f376
Changes
1
Hide whitespace changes
Inline
Side-by-side
proxtoolbox/experiments/ptychography/ptychographyExperiment.py
View file @
c2af5913
...
...
@@ -172,11 +172,11 @@ class PtychographyExperiment(Experiment):
if
self
.
datafile
is
not
None
:
if
self
.
data_dir
is
not
None
:
data_path
=
self
.
data_dir
+
self
.
datafile
data_path
=
self
.
data_dir
/
self
.
datafile
else
:
data_path
=
self
.
datafile
if
not
data_path
.
endswith
(
'.mat'
):
data_path
+
=
'.mat'
if
not
str
(
data_path
)
.
endswith
(
'.mat'
):
data_path
=
self
.
data_dir
/
(
self
.
datafile
+
'.mat'
)
if
not
os
.
path
.
isfile
(
data_path
):
print
(
'*************************************************************************'
)
...
...
@@ -224,14 +224,14 @@ class PtychographyExperiment(Experiment):
if
self
.
datafile
==
'data_NTT_01_26210_192x192'
:
reconst_file
=
'reconstruction_data_NTT_01_26210_192x192.mat'
if
self
.
data_dir
is
not
None
:
file_path
=
self
.
data_dir
+
reconst_file
file_path
=
self
.
data_dir
/
reconst_file
else
:
file_path
=
reconst_file
reconst_dict
=
loadMatFile
(
file_path
)
QQ
=
reconst_dict
[
'P'
]
pos_file
=
'positions_NTT_01_26210.mat'
if
self
.
data_dir
is
not
None
:
file_path
=
self
.
data_dir
+
pos_file
file_path
=
self
.
data_dir
/
pos_file
else
:
file_path
=
pos_file
pos_dict
=
loadMatFile
(
file_path
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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