Skip to content

Commit a585fc9

Browse files
Making sure tree names are case insensitive and returned dict becomes upper case by default
1 parent 07d5231 commit a585fc9

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

mdsh5/read_mds.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,18 @@ def read_mds(shot_numbers=None, trees=None, point_names=None, server=None,
8989
if isinstance(point_names, Iterable):
9090
point_names = [add_slash(pn) for pn in point_names]
9191
if isinstance(trees, str):
92-
tree_dict = {trees: point_names}
92+
tree_dict = {trees.upper(): point_names}
9393
elif isinstance(trees, list):
94+
trees = [tree.upper() for tree in trees]
95+
if len(trees) == 1:
96+
trees = trees * len(point_names)
9497
if len(trees) != len(point_names):
9598
raise ValueError('trees and point_names must be the same length')
9699
tree_dict = {tree: [] for tree in trees}
97100
for tree, pn in zip(trees, point_names):
98101
tree_dict[tree].append(pn)
99102
elif isinstance(trees, dict):
103+
trees = {tree.upper(): trees[tree] for tree in trees}
100104
tree_dict = {tree: [] for tree in trees}
101105
for tree in trees:
102106
if tree != "PTDATA":

0 commit comments

Comments
 (0)