diff --git a/dataset.py b/dataset.py index d5dbf8b..c5a952b 100644 --- a/dataset.py +++ b/dataset.py @@ -79,7 +79,7 @@ class StaticDataset(): if 'uv_static' + res_string in self.signature.keys(): uv_static = np.load(os.path.join(self.folder, 'uv_static' + self.filled + res_string, id + '.npz')); uv_static = uv_static['uv_static' + self.filled]; uv_static = np.transpose(uv_static, [2, 0, 1]); data['uv_static' + res_string] = uv_static - if 'uv_mask' in self.signature.keys(): + if 'uv_mask' + res_string in self.signature.keys(): uv_mask = np.load(os.path.join(self.folder, 'uv_mask' + res_string, id + '.npz')); uv_mask=uv_mask['uv_mask']; uv_mask = uv_mask.astype(np.float32); data['uv_mask' + res_string] = uv_mask @@ -211,7 +211,7 @@ class DatasetFactory(): if 'uv_curvature' + res_string in signature.keys(): uv_curvature = np.load(os.path.join(folder, 'uv_curvature' + filled + res_string, id + '_' + frame_nr + '.npz')); - if filled != '': + if filled != '' or res_string != '': uv_curvature = uv_curvature['uv_curvature' + filled] else: uv_curvature = uv_curvature['curvature_uv']