From 5e885498831716e459b7acb394d405081ae72497 2015-10-07 16:42:18 From: Miguel Valdez Date: 2015-10-07 16:42:18 Subject: [PATCH] remove stuffr library from jroIO_hf.py --- diff --git a/schainpy/model/io/__init__.py b/schainpy/model/io/__init__.py index 4b8b73c..022a2f0 100644 --- a/schainpy/model/io/__init__.py +++ b/schainpy/model/io/__init__.py @@ -14,17 +14,6 @@ from jroIO_usrp import * # except: # print "jroIO_usrp_api could not be imported" -try: - from jroIO_amisr import * -except: - print "jroIO_amisr could not be imported" - -try: - from jroIO_HDF5 import * -except: - print "jroIO_HDF5 could not be imported" - -try: - from jroIO_hf import * -except: - print "jroIO_hf could not be imported" \ No newline at end of file +from jroIO_amisr import * +from jroIO_HDF5 import * +from jroIO_hf import * \ No newline at end of file diff --git a/schainpy/model/io/jroIO_hf.py b/schainpy/model/io/jroIO_hf.py index 6debbf1..382f4c9 100644 --- a/schainpy/model/io/jroIO_hf.py +++ b/schainpy/model/io/jroIO_hf.py @@ -10,11 +10,10 @@ import h5py import numpy import fnmatch import re -import stuffr -from model.data.jroheaderIO import RadarControllerHeader, SystemHeader -from model.data.jrodata import Voltage -from model.proc.jroproc_base import ProcessingUnit, Operation +from schainpy.model.data.jroheaderIO import RadarControllerHeader, SystemHeader +from schainpy.model.data.jrodata import Voltage +from schainpy.model.proc.jroproc_base import ProcessingUnit, Operation def isNumber(str): @@ -267,7 +266,7 @@ class HFReader(ProcessingUnit): fp= h5py.File(dir_hf_filename,'r') hipoc=fp['t'].value fp.close() - date_time=stuffr.unix2datestr(hipoc) + date_time=datetime.datetime.utcfromtimestamp(hipoc) year =int(date_time[0:4]) month=int(date_time[5:7]) dom =int(date_time[8:10]) @@ -312,7 +311,7 @@ class HFReader(ProcessingUnit): fp= h5py.File(dir_hf_filename,'r') hipoc=fp['t'].value hipoc=hipoc+self.timezone - date_time=stuffr.unix2datestr(hipoc) + date_time=datetime.datetime.utcfromtimestamp(hipoc) fp.close() year =int(date_time[0:4]) month=int(date_time[5:7]) @@ -479,7 +478,7 @@ class HFReader(ProcessingUnit): # fp= h5py.File(dir_hf_filename,'r') # hipoc=fp['t'].value # fp.close() -# date_time=stuffr.unix2datestr(hipoc) +# date_time=datetime.datetime.utcfromtimestamp(hipoc) # # year =int(date_time[0:4]) # month=int(date_time[5:7])