Skip to content

Commit fbdcbc2

Browse files
authored
Merge pull request #176 from MDHDZ91/patch-2
Update read.py
2 parents fc4f261 + 9d3a4c7 commit fbdcbc2

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

ctd/read.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ def from_cnv(fname):
404404
f.close()
405405

406406
prkeys = [
407-
"prM ",
407+
"prM",
408408
"prE",
409409
"prDM",
410410
"pr50M",
@@ -415,9 +415,14 @@ def from_cnv(fname):
415415
"depSM",
416416
"prDE",
417417
]
418+
df.columns = df.columns.str.strip()
418419
prkey = [key for key in prkeys if key in df.columns]
419-
if len(prkey) != 1:
420-
raise ValueError(f"Expected one pressure/depth column, got {prkey}.")
420+
if len(prkey) == 0:
421+
raise ValueError("Expected one pressure/depth column, didn't receive any")
422+
elif len(prkey) > 1:
423+
# if multiple keys present then keep the first one
424+
prkey = prkey[0]
425+
421426
df.set_index(prkey, drop=True, inplace=True)
422427
df.index.name = "Pressure [dbar]"
423428
if prkey == "depSM":

0 commit comments

Comments
 (0)