comment removed

tardis-sn · Mar 26, 2014 · 6013ec8 · 6013ec8
1 parent a4b205c
commit 6013ec8
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/tardis/atomic.py b/tardis/atomic.py
@@ -228,10 +228,8 @@ def read_collision_data(fname):
 def read_ion_cx_data(fname):
     try:
         h5_file = h5py.File(fname, 'r')
-        ion_cx_th_data = None
-        ion_cx_sp_data = None
-        #ion_cx_th_data = h5_file['ion_cx_data']
-        #ion_cx_sp_data = h5_file['ion_cx_sp_data']
+        ion_cx_th_data = h5_file['ion_cx_data']
+        ion_cx_sp_data = h5_file['ion_cx_sp_data']
         return ion_cx_th_data, ion_cx_sp_data
     except IOError, err:
         print(err.errno)
@@ -351,15 +349,15 @@ def from_hdf5(cls, fname=None):
                         collision_data=(collision_data, collision_data_temperatures), synpp_refs=synpp_refs,
                         ion_cx_data=ion_cx_data)
 
-        #with h5py.File(fname, 'r') as h5_file:
-        #    atom_data.uuid1 = h5_file.attrs['uuid1']
-        #    atom_data.md5 = h5_file.attrs['md5']
-        #    atom_data.version = h5_file.attrs.get('database_version', None)
+        with h5py.File(fname, 'r') as h5_file:
+            atom_data.uuid1 = h5_file.attrs['uuid1']
+            atom_data.md5 = h5_file.attrs['md5']
+            atom_data.version = h5_file.attrs.get('database_version', None)
 
-        #    if atom_data.version is not None:
-        #        atom_data.data_sources = pickle.loads(h5_file.attrs['data_sources'])
+            if atom_data.version is not None:
+                atom_data.data_sources = pickle.loads(h5_file.attrs['data_sources'])
 
-        #   logger.info('Read Atom Data with UUID=%s and MD5=%s', atom_data.uuid1, atom_data.md5)
+            logger.info('Read Atom Data with UUID=%s and MD5=%s', atom_data.uuid1, atom_data.md5)
 
         return atom_data