Skip to content

Commit ea1c89c

Browse files
committed
fix for the case that there are multiple dotsin file names
1 parent 839f574 commit ea1c89c

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

pyerrors/input/openQCD.py

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,23 +1032,28 @@ def read_ms5_xsf(path, prefix, qc, corr, sep="r", **kwargs):
10321032
found = []
10331033
files = []
10341034
names = []
1035+
1036+
if "names" in kwargs:
1037+
names = kwargs.get("names")
1038+
10351039
for (dirpath, dirnames, filenames) in os.walk(path + "/"):
10361040
found.extend(filenames)
10371041
break
10381042

10391043
for f in found:
10401044
if fnmatch.fnmatch(f, prefix + "*.ms5_xsf_" + qc + ".dat"):
10411045
files.append(f)
1042-
if not sep == "":
1043-
names.append(prefix + "|r" + f.split(".")[0].split(sep)[1])
1044-
else:
1045-
names.append(prefix)
1046-
files = sorted(files)
1046+
if "names" not in kwargs:
1047+
if not sep == "":
1048+
se = f.split(".")[0]
1049+
for s in f.split(".")[1:-1]:
1050+
se += "." + s
1051+
names.append(se.split(sep)[0] + "|r" + se.split(sep)[1])
1052+
else:
1053+
names.append(prefix)
10471054

1048-
if "names" in kwargs:
1049-
names = kwargs.get("names")
1050-
else:
1051-
names = sorted(names)
1055+
names = sorted(names)
1056+
files = sorted(files)
10521057

10531058
cnfgs = []
10541059
realsamples = []

0 commit comments

Comments
 (0)