fix: bug in _find_correlator fixed. (#193)

This commit is contained in:
Fabian Joswig 2023-06-02 15:46:27 +01:00 committed by GitHub
parent 09cf6bae5a
commit e0e2686142
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -286,28 +286,26 @@ def _make_pattern(version, name, noffset, wf, wf2, b2b, quarks):
def _find_correlator(file_name, version, pattern, b2b, silent=False):
T = 0
file = open(file_name, "r")
with open(file_name, "r") as my_file:
content = my_file.read()
match = re.search(pattern, content)
if match:
if version == "0.0":
start_read = content.count('\n', 0, match.start()) + 1
T = content.count('\n', start_read)
else:
start_read = content.count('\n', 0, match.start()) + 5 + b2b
end_match = re.search(r'\n\s*\n', content[match.start():])
T = content[match.start():].count('\n', 0, end_match.start()) - 4 - b2b
if not T > 0:
raise ValueError("Correlator with pattern\n" + pattern + "\nis empty!")
if not silent:
print(T, 'entries, starting to read in line', start_read)
content = file.read()
match = re.search(pattern, content)
if match:
if version == "0.0":
start_read = content.count('\n', 0, match.start()) + 1
T = content.count('\n', start_read)
else:
start_read = content.count('\n', 0, match.start()) + 5 + b2b
end_match = re.search(r'\n\s*\n', content[match.start():])
T = content[match.start():].count('\n', 0, end_match.start()) - 4 - b2b
if not T > 0:
raise ValueError("Correlator with pattern\n" + pattern + "\nis empty!")
if not silent:
print(T, 'entries, starting to read in line', start_read)
raise ValueError('Correlator with pattern\n' + pattern + '\nnot found.')
else:
file.close()
raise ValueError('Correlator with pattern\n' + pattern + '\nnot found.')
file.close()
return start_read, T