Commit 62fc3656 authored by ultimanet's avatar ultimanet
Browse files

Merge remote-tracking branch 'upstream/master' into mpi

parents 0f24d97e 892ff83a
......@@ -21,12 +21,17 @@
from __future__ import division
from nifty import about
from distutils.version import LooseVersion as lv
#from nifty_lm import *
try:
import libsharp_wrapper_gl as gl
except(ImportError):
try:
import healpy as hp
if lv(hp.__version__) <= lv('1.8.1'):
raise ImportError(about._errors.cprint("ERROR: installed healpy version is older than 1.8.1!"))
except(ImportError):
about.infos.cprint("INFO: neither libsharp_wrapper_gl nor healpy available.")
pass ## import nothing
......@@ -36,9 +41,11 @@ except(ImportError):
else:
try:
import healpy as hp
if lv(hp.__version__) <= lv('1.8.1'):
raise ImportError(about._errors.cprint("ERROR: installed healpy version is older than 1.8.1!"))
except(ImportError):
from nifty_lm import lm_space,gl_space ## import lm & gl
else:
else:
from nifty_lm import lm_space,gl_space,hp_space ## import all 3
from nifty_power_conversion_lm import *
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