[thermo] adding type check for md_trajs

gph82 · Jun 13, 2016 · b68fabc · b68fabc
1 parent 499193f
commit b68fabc
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pyemma/thermo/util/util.py b/pyemma/thermo/util/util.py
@@ -144,6 +144,9 @@ def _get_umbrella_sampling_parameters(
         raise ValueError(
             "Unmatching number of umbrella sampling trajectories and force constants: %d!=%d" \
                 % (len(us_trajs), len(us_force_constants)))
+    if md_trajs is not None:
+        if not isinstance(md_trajs, (list, tuple)):
+            raise ValueError("The parameter md_trajs must be a list of numpy.ndarray objects")
     for i, traj in enumerate(us_trajs):
         state = None
         try: