Merge branches 'fix_co' and 'master' of https://github.com/linetools/…

…linetools into fix_co
linetools · Dec 28, 2016 · f33e858 · f33e858
2 parents 3539692 + 98d5ff0
commit f33e858
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/linetools/lists/linelist.py b/linetools/lists/linelist.py
@@ -201,6 +201,7 @@ def load_data(self, use_ISM_table=True, tol=1e-3 * u.AA, use_cache=True):
                                 newi.append(jj)
                         # Append new ones as Tables (can't stack QTables yet)
                         full_table = vstack([Table(full_table), Table(table[newi])])
+                        full_table = QTable(full_table)
                     # Save to avoid repeating
                     all_func.append(func)
 

diff --git a/linetools/lists/parse.py b/linetools/lists/parse.py
@@ -222,8 +222,11 @@ def read_verner94():
     print(
         'linetools.lists.parse: Reading linelist --- \n   {:s}'.format(
             verner94))
-    tbl_6 = QTable.read(verner94)
+    tbl_6 = Table.read(verner94)
 
+    # Deal with bad unit
+    tbl_6['lambda'].unit = u.AA
+    tbl_6 = QTable(tbl_6)
 
     # My table
     ldict, data = line_data(nrows=len(tbl_6))
@@ -273,6 +276,7 @@ def read_forbidden():
 
     # load values using convention names
     data['wrest'] = aux['wave']
+    data['wrest'].unit = u.AA
     data['Z'] = aux['Z']
     data['ion'] = aux['ion']
     for ii, row in enumerate(data):
@@ -302,6 +306,7 @@ def read_recomb():
 
     # load values using convention names
     data['wrest'] = aux['wave']
+    data['wrest'].unit = u.AA
     data['Z'] = aux['Z']
     data['ion'] = aux['ion']
     for ii, row in enumerate(data):
@@ -330,6 +335,7 @@ def read_galabs():
 
     # load values using convention names
     data['wrest'] = aux['wave']
+    data['wrest'].unit = u.AA
     data['Z'] = aux['Z']
     data['ion'] = aux['ion']
     for ii, row in enumerate(data):