Skip to content

Commit 72e5ec3

Browse files
committed
Fix bug in ABR batch processing
1 parent 3a5740b commit 72e5ec3

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

abr/parsers/PSI.py

+2
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,5 @@ def iter_all(path):
129129
else:
130130
for subpath in path.glob('**/*abr_io'):
131131
yield from PSIDataCollection(subpath).iter_frequencies()
132+
for subpath in path.glob('**/*abr_io_click'):
133+
yield from PSIDataCollection(subpath).iter_frequencies()

abr/parsers/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,12 @@ def iter_all(self, path):
176176

177177
def find_processed(self, path):
178178
for ds in self.iter_all(path):
179-
if ds.get_analyzed_filename(self._rater).exists():
179+
if Path(ds.get_analyzed_filename(self._rater).exists()):
180180
yield ds
181181

182182
def find_unprocessed(self, path):
183183
for ds in self.iter_all(path):
184-
if not ds.get_analyzed_filename(self._rater).exists():
184+
if not Path(ds.get_analyzed_filename(self._rater)).exists():
185185
yield ds
186186

187187
def find_analyses(self, study_directory):

abr/parsers/dataset.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ def list_raters(self):
8181

8282
def load_analysis(self, rater):
8383
from . import load_analysis
84-
r = load_analysis(self.get_analyzed_filename(rater))
85-
print(r)
86-
return r
84+
return load_analysis(self.get_analyzed_filename(rater))
8785

8886
def __lt__(self, other):
8987
if not isinstance(other, Dataset):

0 commit comments

Comments
 (0)