Commit c1b6a1ab authored by Theo Steininger's avatar Theo Steininger
Browse files

Merge branch 'misc_tweaks' into 'master'

Misc tweaks

See merge request !138
parents 45c8584b df8dce00
Pipeline #13150 passed with stages
in 11 minutes and 22 seconds
#!/bin/bash #!/bin/bash
git clone https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git git clone https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
(cd pyHealpix && autoreconf -i && ./configure --enable-openmp --enable-native-optimizations && make -j4 install) (cd pyHealpix && autoreconf -i && ./configure --enable-openmp && make -j4 install)
rm -rf pyHealpix rm -rf pyHealpix
...@@ -37,7 +37,7 @@ class GLLMTransformation(SlicingTransformation): ...@@ -37,7 +37,7 @@ class GLLMTransformation(SlicingTransformation):
if module != 'pyHealpix': if module != 'pyHealpix':
raise ValueError("Unsupported SHT module.") raise ValueError("Unsupported SHT module.")
if 'pyHealpix' not in gdi: if pyHealpix is None:
raise ImportError( raise ImportError(
"The module pyHealpix is needed but not available.") "The module pyHealpix is needed but not available.")
......
...@@ -38,7 +38,7 @@ class HPLMTransformation(SlicingTransformation): ...@@ -38,7 +38,7 @@ class HPLMTransformation(SlicingTransformation):
if module != 'pyHealpix': if module != 'pyHealpix':
raise ValueError("Unsupported SHT module.") raise ValueError("Unsupported SHT module.")
if 'pyHealpix' not in gdi: if pyHealpix is None:
raise ImportError( raise ImportError(
"The module pyHealpix is needed but not available") "The module pyHealpix is needed but not available")
......
...@@ -37,7 +37,7 @@ class LMGLTransformation(SlicingTransformation): ...@@ -37,7 +37,7 @@ class LMGLTransformation(SlicingTransformation):
if module != 'pyHealpix': if module != 'pyHealpix':
raise ValueError("Unsupported SHT module.") raise ValueError("Unsupported SHT module.")
if 'pyHealpix' not in gdi: if pyHealpix is None:
raise ImportError( raise ImportError(
"The module pyHealpix is needed but not available.") "The module pyHealpix is needed but not available.")
......
...@@ -36,7 +36,7 @@ class LMHPTransformation(SlicingTransformation): ...@@ -36,7 +36,7 @@ class LMHPTransformation(SlicingTransformation):
if module != 'pyHealpix': if module != 'pyHealpix':
raise ValueError("Unsupported SHT module.") raise ValueError("Unsupported SHT module.")
if gdi.get('pyHealpix') is None: if pyHealpix is None:
raise ImportError( raise ImportError(
"The module pyHealpix is needed but not available.") "The module pyHealpix is needed but not available.")
......
...@@ -13,7 +13,7 @@ class GLMollweide(Heatmap): ...@@ -13,7 +13,7 @@ class GLMollweide(Heatmap):
def __init__(self, data, xsize=800, color_map=None, def __init__(self, data, xsize=800, color_map=None,
webgl=False, smoothing=False): webgl=False, smoothing=False):
# smoothing 'best', 'fast', False # smoothing 'best', 'fast', False
if 'pyHealpix' not in gdi: if pyHealpix is None:
raise ImportError( raise ImportError(
"The module pyHealpix is needed but not available.") "The module pyHealpix is needed but not available.")
self.xsize = xsize self.xsize = xsize
......
...@@ -12,7 +12,7 @@ pyHealpix = gdi.get('pyHealpix') ...@@ -12,7 +12,7 @@ pyHealpix = gdi.get('pyHealpix')
class HPMollweide(Heatmap): class HPMollweide(Heatmap):
def __init__(self, data, xsize=800, color_map=None, webgl=False, def __init__(self, data, xsize=800, color_map=None, webgl=False,
smoothing=False): # smoothing 'best', 'fast', False smoothing=False): # smoothing 'best', 'fast', False
if 'pyHealpix' not in gdi: if pyHealpix is None:
raise ImportError( raise ImportError(
"The module pyHealpix is needed but not available.") "The module pyHealpix is needed but not available.")
self.xsize = xsize self.xsize = xsize
......
...@@ -31,7 +31,7 @@ class PlotterBase(Loggable, object): ...@@ -31,7 +31,7 @@ class PlotterBase(Loggable, object):
__metaclass__ = abc.ABCMeta __metaclass__ = abc.ABCMeta
def __init__(self, interactive=False, path='.', title=""): def __init__(self, interactive=False, path='.', title=""):
if 'plotly' not in gdi: if plotly is None:
raise ImportError("The module plotly is needed but not available.") raise ImportError("The module plotly is needed but not available.")
self.interactive = interactive self.interactive = interactive
self.path = path self.path = path
......
...@@ -45,7 +45,7 @@ class GLSpace(Space): ...@@ -45,7 +45,7 @@ class GLSpace(Space):
Number of latitudinal bins (or rings) that are used for this Number of latitudinal bins (or rings) that are used for this
pixelization. pixelization.
nlon : int, *optional* nlon : int, *optional*
Number of longditudinal bins that are used for this pixelization. Number of longitudinal bins that are used for this pixelization.
Attributes Attributes
---------- ----------
...@@ -57,7 +57,7 @@ class GLSpace(Space): ...@@ -57,7 +57,7 @@ class GLSpace(Space):
Number of latitudinal bins (or rings) that are used for this Number of latitudinal bins (or rings) that are used for this
pixelization. pixelization.
nlon : int nlon : int
Number of longditudinal bins that are used for this pixelization. Number of longitudinal bins that are used for this pixelization.
total_volume : np.float total_volume : np.float
The total volume of the space. The total volume of the space.
shape : tuple of np.ints shape : tuple of np.ints
...@@ -89,7 +89,7 @@ class GLSpace(Space): ...@@ -89,7 +89,7 @@ class GLSpace(Space):
# ---Overwritten properties and methods--- # ---Overwritten properties and methods---
def __init__(self, nlat, nlon=None): def __init__(self, nlat, nlon=None):
if 'pyHealpix' not in gdi: if pyHealpix is None:
raise ImportError( raise ImportError(
"The module pyHealpix is needed but not available.") "The module pyHealpix is needed but not available.")
...@@ -163,7 +163,7 @@ class GLSpace(Space): ...@@ -163,7 +163,7 @@ class GLSpace(Space):
@property @property
def nlon(self): def nlon(self):
""" Number of longditudinal bins that are used for this pixelization. """ Number of longitudinal bins that are used for this pixelization.
""" """
return self._nlon return self._nlon
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment