rename libs name and modif import path

NuistRadar/__init__.py

@@ -0,0 +1,2 @@
+from . import core, graph, io
+__all__ = ["core", "graph", "io"]

NuistRadar/configure/default_config.py

@@ -4,7 +4,7 @@
 注意：距离单位统一到m
 """
 
-FILL_VALUE = -999.0
+FILL_VALUE = -9999.0
 _LIGHT_SPEED = 2.99792458e8
 
 DEFAULT_METADATA = {

NuistRadar/configure/location_config.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 import pandas as pd
-from cfgs import Radar_info_Path
+from ..cfgs import Radar_info_Path
 
 radar_info = pd.read_json(Radar_info_Path)

NuistRadar/core/NRadar.py

@@ -5,7 +5,7 @@
 """
 import numpy as np
 import xarray as xr
-from configure.default_config import DEFAULT_METADATA, FILL_VALUE, CINRAD_field_mapping
+from ..configure.default_config import DEFAULT_METADATA, FILL_VALUE, CINRAD_field_mapping
 
 class NuistRadar(object):
  """

NuistRadar/core/PyartRadar.py

@@ -21,13 +21,15 @@
 
 
 """
+# the code for Radar Object in this file were adapted from pyart by Helmus, J.J. & Collis, S.M.
+# https://github.com/ARM-DOE/pyart
 from __future__ import print_function
 
 import numpy as np
 import sys
-from configure.pyart_config import get_metadata
-from configure.pyart_lazydict import LazyLoadDict
-from libs.core.transforms import antenna_vectors_to_cartesian, cartesian_to_geographic
+from ..configure.pyart_config import get_metadata
+from ..configure.pyart_lazydict import LazyLoadDict
+from .transforms import antenna_vectors_to_cartesian, cartesian_to_geographic
 
 
 class Radar(object):

NuistRadar/core/__init__.py

@@ -1,3 +1,3 @@
-from libs.core import NRadar, PyartRadar, transforms
+from . import NRadar, PyartRadar, transforms
 
 __all__ = ["NRadar", "PyartRadar", "transforms"]

NuistRadar/core/transforms.py

@@ -30,6 +30,9 @@
 
 """
 
+# the code for transforms in this file were adapted from pyart by Helmus, J.J. & Collis, S.M.
+# https://github.com/ARM-DOE/pyart
+
 import warnings
 
 import numpy as np

NuistRadar/graph/__init__.py

@@ -0,0 +1,2 @@
+from . import colormap, RadarPlotModule
+__all__ = ["colormap", "RadarPlotModule"]

NuistRadar/graph/colormap/__init__.py

@@ -0,0 +1,2 @@
+from . import cm, cm_colorblind
+__all__ = ["cm", "cm_colorblind"]

NuistRadar/graph/colormap/_cm.py

@@ -5,6 +5,8 @@
 Data for radar related colormaps.
 
 """
+# the data for colormaps in this file were adapted from pyart by Helmus, J.J. & Collis, S.M.
+# https://github.com/ARM-DOE/pyart
 
 # The data for the colormaps in this file were adapted from those found in
 # ctables.py of the Deprecated_Metpy package by Patrick Marsh and Ryan May.

NuistRadar/graph/colormap/_cm_colorblind.py

@@ -4,6 +4,9 @@
 Data for colorblind friendly radar colormaps
 
 """
+# the code for colormaps in this file were adapted from pyart by Helmus, J.J. & Collis, S.M.
+# https://github.com/ARM-DOE/pyart
+
 import numpy as np
 import os
 

NuistRadar/graph/colormap/cm.py

@@ -55,6 +55,8 @@
  * LangRainbow12
 
 """
+# the code for colormaps in this file were adapted from pyart by Helmus, J.J. & Collis, S.M.
+# https://github.com/ARM-DOE/pyart
 
 # This file was adapted from the cm.py file of the matplotlib project,
 # http:https://matplotlib.org/.
@@ -66,6 +68,7 @@
 import matplotlib as mpl
 import matplotlib.colors as colors
 from ._cm import datad
+import matplotlib.cm
 
 cmap_d = dict()
 
@@ -147,4 +150,4 @@ def _generate_cmap(name, lutsize):
 # register the colormaps so that can be accessed with the names pyart_XXX
 for name, cmap in cmap_d.items():
  full_name = 'pyart_' + name
- mpl.cm.register_cmap(name=full_name, cmap=cmap)
+ matplotlib.cm.register_cmap(name=full_name, cmap=cmap)

NuistRadar/graph/colormap/cm_colorblind.py

@@ -14,6 +14,8 @@
 
  * HomeyerRainbow
 """
+# the code for colormaps in this file were adapted from pyart by Helmus, J.J. & Collis, S.M.
+# https://github.com/ARM-DOE/pyart
 
 import warnings
 

NuistRadar/io/BaseDataProtocol/__init__.py

@@ -0,0 +1,2 @@
+from . import CCProtocol, SABProtocol, SCProtocol, WSR98DProtocol
+__all__ = ["CCProtocol", "SABProtocol", "SCProtocol", "WSR98DProtocol"]

NuistRadar/io/CCFile.py

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 import numpy as np
-from libs.io.BaseDataProtocol.CCProtocol import dtype_cc
-from libs.io.util import _prepare_for_read, _unpack_from_buf, get_radar_info, make_time_unit_str, get_radar_sitename
-import time
+from .BaseDataProtocol.CCProtocol import dtype_cc
+from .util import _prepare_for_read, _unpack_from_buf, get_radar_info, make_time_unit_str, get_radar_sitename
 import datetime
 import pandas as pd
-from libs.core.NRadar import NuistRadar
-from configure.pyart_config import get_metadata, get_fillvalue
-from configure.default_config import CINRAD_field_mapping, _LIGHT_SPEED
-from libs.core.PyartRadar import Radar
+from ..core.NRadar import NuistRadar
+from ..configure.pyart_config import get_metadata, get_fillvalue
+from ..configure.default_config import CINRAD_field_mapping, _LIGHT_SPEED
+from ..core.PyartRadar import Radar
 from netCDF4 import date2num
 
 class CCBaseData(object):
@@ -406,11 +405,3 @@ def _get_instrument_parameters(self):
  nyquist_velocity['data'] = self.get_nyquist_velocity()
  instrument_parameters['nyquist_velocity'] = nyquist_velocity
  return instrument_parameters
-
-
-if __name__ == "__main__":
- start = time.time()
- test = CCBaseData(r"E:\RadarBaseData\CINRAD-CC\2016070818.00V")
- CC = CC2NRadar(test)
- end = time.time()
- print(end - start)

NuistRadar/io/SABFile.py

@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 import numpy as np
 from scipy import interpolate
-from libs.io.BaseDataProtocol.SABProtocol import dtype_sab
-from libs.io.util import _prepare_for_read, _unpack_from_buf, julian2date, \
+from .BaseDataProtocol.SABProtocol import dtype_sab
+from .util import _prepare_for_read, _unpack_from_buf, julian2date, \
  get_radar_info, make_time_unit_str, get_radar_sitename
-import time
 from netCDF4 import date2num
-from libs.core.NRadar import NuistRadar
-from configure.pyart_config import get_metadata, get_fillvalue
-from configure.default_config import CINRAD_field_mapping, _LIGHT_SPEED
-from libs.core.PyartRadar import Radar
+from ..core.NRadar import NuistRadar
+from ..configure.pyart_config import get_metadata, get_fillvalue
+from ..configure.default_config import CINRAD_field_mapping, _LIGHT_SPEED
+from ..core.PyartRadar import Radar
 
 
 class SABBaseData(object):
@@ -479,12 +478,3 @@ def _get_instrument_parameters(self):
  nyquist_velocity['data'] = self.get_nyquist_velocity()
  instrument_parameters['nyquist_velocity'] = nyquist_velocity
  return instrument_parameters
-
-
-if __name__ == "__main__":
- start = time.time()
- # test = SABBaseData("/home/zy/data/code_data/ERIC/Radar/2010081202.13A")
- test = SABBaseData(r"E:\RadarBaseData\CINRAD-SA\z9250\BASE150427\Z_RADR_I_Z9250_20150427111500_O_DOR_SA_CAP.bin")
- SAB = SAB2NRadar(test)
- end = time.time()
- print(end - start)

NuistRadar/io/SCFile.py

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 import numpy as np
-from libs.io.BaseDataProtocol.SCProtocol import dtype_sc
-from libs.io.util import _prepare_for_read, _unpack_from_buf, get_radar_info, make_time_unit_str, get_radar_sitename
-import time
+from .BaseDataProtocol.SCProtocol import dtype_sc
+from .util import _prepare_for_read, _unpack_from_buf, make_time_unit_str, get_radar_sitename
 import pandas as pd
 import datetime
-from libs.core.NRadar import NuistRadar
-from configure.pyart_config import get_metadata, get_fillvalue
-from configure.default_config import CINRAD_field_mapping, _LIGHT_SPEED
-from libs.core.PyartRadar import Radar
+from ..core.NRadar import NuistRadar
+from ..configure.pyart_config import get_metadata, get_fillvalue
+from ..configure.default_config import CINRAD_field_mapping, _LIGHT_SPEED
+from ..core.PyartRadar import Radar
 from netCDF4 import date2num
 
 class SCBaseData(object):
@@ -413,11 +412,3 @@ def _get_instrument_parameters(self):
  nyquist_velocity['data'] = self.get_nyquist_velocity()
  instrument_parameters['nyquist_velocity'] = nyquist_velocity
  return instrument_parameters
-
-
-if __name__ == "__main__":
- start = time.time()
- test = SCBaseData(r"E:\RadarBaseData\CINRAD_SC_old\Z_RADR_I_Z9280_20180209132700_O_DOR_SC_CAP.bin")
- SC = SC2NRadar(test)
- end = time.time()
- print(end-start)

NuistRadar/io/WSR98DFile.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
 import numpy as np
-from libs.io.BaseDataProtocol.WSR98DProtocol import dtype_98D
-from libs.io.util import _prepare_for_read, _unpack_from_buf, julian2date_SEC, make_time_unit_str
-import time
-from libs.core.NRadar import NuistRadar
-from configure.pyart_config import get_metadata, get_fillvalue
-from configure.default_config import CINRAD_field_mapping, _LIGHT_SPEED
-from libs.core.PyartRadar import Radar
+from .BaseDataProtocol.WSR98DProtocol import dtype_98D
+from .util import _prepare_for_read, _unpack_from_buf, julian2date_SEC, make_time_unit_str
+from ..core.NRadar import NuistRadar
+from ..configure.pyart_config import get_metadata, get_fillvalue
+from ..configure.default_config import CINRAD_field_mapping, _LIGHT_SPEED
+from ..core.PyartRadar import Radar
 from netCDF4 import date2num
 
 class WSR98DBaseData(object):
@@ -477,13 +476,3 @@ def _get_instrument_parameters(self):
  nyquist_velocity['data'] = self.get_nyquist_velocity()
  instrument_parameters['nyquist_velocity'] = nyquist_velocity
  return instrument_parameters
-
-if __name__ == "__main__":
- start = time.time()
- # test = WSR98DBaseData(r"E:\RadarBaseData\郑玉\利奇马\LQM_Z9513_NT\Z_RADR_I_Z9513_20190811234540_O_DOR_SAD_CAP_FMT.bin.bz2")
- test = WSR98DBaseData(r"E:\RadarBaseData\StandardFormat\厦门\Z9592.20160728.111443.AR2.bz2")
- # test = WSR98DBaseData(r'E:\RadarBaseData\StandardFormat\NUIST\NUIST.20170408.153319.AR2')
- wsr98d = WSR98D2NRadar(test)
- NRadar = wsr98d.ToNuistRadar()
- end = time.time()
- print(end - start)

NuistRadar/io/__init__.py

@@ -1,5 +1,3 @@
-from libs.io import auto_io
-from libs.io import CCFile
-from libs.io import SCFile, WSR98DFile, SABFile
+from . import SCFile, WSR98DFile, SABFile, auto_io, CCFile
 
 __all__ = ["auto_io", "CCFile", "SCFile", "WSR98DFile", "SABFile"]

NuistRadar/io/auto_io.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
-from libs.io.util import radar_format
-from libs.io import CCFile
-from libs.io import SABFile
-from libs.io import SCFile
-from libs.io import WSR98DFile
+from .util import radar_format
+from . import CCFile, SABFile, SCFile, WSR98DFile
 
 class radar_io(object):
  def __init__(self, filename):

NuistRadar/io/util.py

@@ -5,7 +5,7 @@
 import gzip
 import datetime
 import os
-from configure.location_config import radar_info
+from ..configure.location_config import radar_info
 
 def _structure_size(structure):
  """计算structure的字节大小"""