Fixed (I hope)

stonerlab · Sep 13, 2016 · ff92f62 · ff92f62
1 parent d70a1b7
commit ff92f62
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Stoner/Analysis.py b/Stoner/Analysis.py
@@ -1144,7 +1144,7 @@ def lmfit(self, model, xcol=None, ycol=None, p0=None, sigma=None,**kargs):
                 p0=dict()
                 for k in model.param_names:
                     if k not in kargs:
-                        raise RuntimeError("You must either supply a p0 of length {} or supply a value for keyword {} for your model function {}",format(len(model.param_names),k,model.func.__bame__))
+                        raise RuntimeError("You must either supply a p0 of length {} or supply a value for keyword {} for your model function {}".format(len(model.param_names),k,model.func.__name__))
                     else:
                         p0[k] = kargs[k]
         else:

diff --git a/Stoner/Core.py b/Stoner/Core.py
@@ -2572,11 +2572,11 @@ def _col_args(self,scalar=True,**cols):
                     del ret[c]
             elif c in ret and isinstance(ret[c],list):
                 if isinstance(cols[c],string_types):
-                    cols[c]=self.find_col[cols[c]]
+                    cols[c]=self.find_col(cols[c])
                 elif isinstance(cols[c],Iterable):
                     cols[c]=[self.find_col(cols[c]) for c in cols]
-                else:
-                    pass
+            else:
+                cols[c]=self.find_col(cols[c])
         ret.update(cols)
         if scalar:
             for c in ret: