Skip to content

Commit 6859e6d

Browse files
committed
masked print, removed double path in prepare_images
1 parent 660003b commit 6859e6d

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

openpiv/tools.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -540,13 +540,16 @@ def __init__(self,
540540
"""
541541
# load lists of images
542542

543-
print(data_dir)
544-
print(pattern_a)
545-
print(data_dir.exists())
546-
print(sorted(data_dir.glob(pattern_a)))
543+
# print('Inside Multiprocesser')
544+
# print(f'data_dir = {data_dir}')
545+
# print(f'pattern_a = {pattern_a}')
546+
# print(f' dir exists: {data_dir.exists()}')
547547

548548
self.files_a = natural_sort(list(data_dir.glob(pattern_a)))
549549

550+
# print(f'List of files:')
551+
# print(f'{self.files_a}')
552+
550553
if pattern_b == '(1+2),(2+3)':
551554
self.files_b = self.files_a[1:]
552555
self.files_a = self.files_a[:-1]

openpiv/windef.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,11 @@ def prepare_images(
177177
"""
178178
image_mask = None
179179

180+
# print(f'Inside prepare_images {file_a}, {file_b}')
181+
180182
# read images into numpy arrays
181-
frame_a = tools.imread(settings.filepath_images / file_a)
182-
frame_b = tools.imread(settings.filepath_images / file_b)
183+
frame_a = tools.imread(file_a)
184+
frame_b = tools.imread(file_b)
183185

184186

185187
# crop to roi
@@ -259,6 +261,8 @@ def func(args):
259261

260262
file_a, file_b, counter = args
261263

264+
# print(f'Inside func {file_a}, {file_b}, {counter}')
265+
262266
# frame_a, frame_b are masked as black where we do not
263267
# want to get vectors. later piv would mark it as completely black
264268
# and set s2n to invalid
@@ -487,6 +491,7 @@ def func(args):
487491
if not save_path.exists():
488492
# os.makedirs(save_path)
489493
save_path.mkdir(parents=True, exist_ok=True)
494+
490495
task = Multiprocesser(
491496
data_dir=settings.filepath_images,
492497
pattern_a=settings.frame_pattern_a,

0 commit comments

Comments
 (0)