Added the unicode literal import. Successfully tested BE ODF translation and SHO fitting

pycroscopy/analysis/be_loop_model.py

@@ -6,7 +6,7 @@ Created on Thu Aug 25 11:48:53 2016
 
 """
 
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 
 from warnings import warn
 

pycroscopy/analysis/be_sho_model.py

@@ -3,7 +3,7 @@ Created on 7/17/16 10:08 AM
 @author: Suhas Somnath, Numan Laanait, Chris R. Smith
 """
 
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 from warnings import warn
 import numpy as np
 from .model import Model

pycroscopy/analysis/fit_methods.py

@@ -3,7 +3,7 @@ Created on 12/15/16 3:44 PM
 @author: Numan Laanait -- nlaanait@gmail.com
 """
 
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 from warnings import warn
 import numpy as np
 from .utils.be_loop import loop_fit_function

pycroscopy/analysis/guess_methods.py

@@ -3,7 +3,7 @@ Created on 10/5/16 3:44 PM
 @author: Numan Laanait -- nlaanait@gmail.com
 """
 
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 from warnings import warn
 
 import numpy as np

pycroscopy/analysis/model.py

 """
 Created on 7/17/16 10:08 AM
-@author: Numan Laanait, Suhas Somnath
+@author: Numan Laanait, Suhas Somnath, Chris Smith
 """
 
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 from warnings import warn
 
 import numpy as np

pycroscopy/analysis/optimize.py

@@ -3,7 +3,7 @@ Created on 12/15/16 10:08 AM
 @author: Numan Laanait
 """
 
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 from warnings import warn
 import numpy as np
 import sys

pycroscopy/analysis/utils/atom_finding.py

@@ -5,7 +5,7 @@ Created on Mon Jan 23 11:13:22 2017
 @author: Suhas Somnath, Stephen Jesse
 """
 
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 import numpy as np
 from scipy.optimize import least_squares
 import itertools as itt

pycroscopy/analysis/utils/atom_finding_general_gaussian.py

@@ -3,7 +3,7 @@
 @author: Ondrej Dyck
 """
 
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 import os
 import numpy as np
 from scipy.optimize import least_squares

pycroscopy/analysis/utils/be_loop.py

@@ -7,7 +7,7 @@ Created on Wed Jun 29 11:13:22 2016
 Various helper functions for aiding loop fitting and projection
 """
 
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 
 import matplotlib.pyplot as plt
 import numpy as np

pycroscopy/analysis/utils/be_sho.py

@@ -5,7 +5,7 @@ Created on Mon Sep 28 11:35:57 2015
 @author: Anton Ievlev
 """
 
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 import numpy as np
 from numpy import exp, abs, sqrt, sum, real, imag, arctan2, append
 

pycroscopy/analysis/utils/tree.py

@@ -5,7 +5,7 @@ Created on Wed Aug 31 17:03:29 2016
 @author: Suhas Somnath
 """
 
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 import numpy as np
 
 # TODO: Test and debug node and clusterTree classes for agglomerative clustering etc

pycroscopy/io/__init__.py

@@ -10,4 +10,4 @@ from .microdata import MicroDataset, MicroDataGroup
 from .translators import *
 
 __all__ = ['ioHDF5', 'MicroDataset', 'MicroDataGroup', 'be_hdf_utils', 'hdf_utils', 'io_utils', 'microdata']
-__all__ += translators.__all__
\ No newline at end of file
+__all__ += translators.__all__

pycroscopy/io/be_hdf_utils.py

@@ -5,8 +5,7 @@ Created on Tue Dec 15 11:10:37 2015
 @author: Suhas Somnath
 """
 
-# cannot import unicode_literals since it is not compatible with h5py just yet
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 import numpy as np
 
 from .hdf_utils import getAuxData

pycroscopy/io/hdf_utils.py

@@ -5,8 +5,7 @@ Created on Tue Nov  3 21:14:25 2015
 @author: Suhas Somnath, Chris Smith, Numan Laanait
 """
 
-# cannot import unicode_literals since it is not compatible with h5py just yet
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 import os
 import h5py
 from warnings import warn

pycroscopy/io/io_utils.py

@@ -5,8 +5,7 @@ Created on Tue Nov  3 21:14:25 2015
 @author: Suhas Somnath, Chris Smith
 """
 
-# cannot import unicode_literals since it is not compatible with h5py just yet
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 from multiprocessing import cpu_count
 from time import strftime
 from psutil import virtual_memory as vm

pycroscopy/io/microdata.py

@@ -5,7 +5,8 @@ Created on Wed Dec 16 10:42:03 2015
 @author: Suhas Somnath, Numan Laanait
 
 """
-from __future__ import division, print_function, absolute_import
+
+from __future__ import division, print_function, absolute_import, unicode_literals
 import socket
 from warnings import warn
 

pycroscopy/io/translators/be_odf.py

@@ -5,7 +5,7 @@ Created on Tue Nov  3 15:24:12 2015
 @author: Suhas Somnath, Stephen Jesse
 """
 
-from __future__ import division, print_function, absolute_import  # int/int = float
+from __future__ import division, print_function, absolute_import, unicode_literals
 
 from os import path, listdir, remove
 from warnings import warn

pycroscopy/io/translators/be_odf_relaxation.py

@@ -5,7 +5,7 @@ Created on Thursday May 26 11:23:00 2016
 @author:  Rama Vasudevan, Suhas Somnath
 """
 
-from __future__ import division, print_function, absolute_import  # int/int = float
+from __future__ import division, print_function, absolute_import, unicode_literals
 
 from os import path, remove  # File Path formatting
 from warnings import warn
@@ -220,7 +220,7 @@ class BEodfRelaxationTranslator(Translator):
         ds_main_data = MicroDataset('Raw_Data', data=[], maxshape=(num_pix,tot_bins), dtype=np.complex64, chunking=(chunking,chunking*bins_per_step), compression='gzip')
         
         chan_grp = MicroDataGroup('Channel_')
-        chan_grp.attrs['Channel_Input'] = curr_parm_dict['IO_Analog_Input_1']      
+        chan_grp.attrs['Channel_Input'] = parm_dict['IO_Analog_Input_1']
         chan_grp.addChildren([ds_main_data, ds_noise_floor])
         chan_grp.addChildren([ds_ex_wfm, ds_pos_ind, ds_pos_val, ds_spec_mat, ds_UDVS,
                               ds_bin_steps, ds_bin_inds, ds_bin_freq, ds_bin_FFT,ds_wfm_typ,ds_spec_vals_mat])

pycroscopy/io/translators/beps_ndf.py

@@ -6,7 +6,7 @@ Created on Tue Nov  3 15:07:16 2015
 
 """
 
-from __future__ import division, print_function, absolute_import  # int/int = float
+from __future__ import division, print_function, absolute_import, unicode_literals
 
 from os import path, listdir, remove
 from warnings import warn

pycroscopy/io/translators/df_utils/be_utils.py

@@ -5,7 +5,7 @@ Created on Tue Jan 05 07:55:56 2016
 @author: Suhas Somnath, Chris Smith, Rama K. Vasudevan
 """
 
-from __future__ import division, print_function, absolute_import
+from __future__ import division, print_function, absolute_import, unicode_literals
 from os import path
 from warnings import warn