Dear Gitlab Users, for our upcoming upgrade to Gitlab v14, Gitlab will be unavailable on Thursday, 05.08.2021 from 5:00 pm to approximately 7:00 pm. Note that with v14, certain breaking changes will be introduced (https://about.gitlab.com/blog/2021/06/04/gitlab-moving-to-14-breaking-changes/).

Commit c2af5913 authored by Schellhorn's avatar Schellhorn
Browse files

more + to / for datapaths

parent 57c3f376
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment