From 7fa457c791bd7ca7f3ce9943dcb9f9585eb6f583 Mon Sep 17 00:00:00 2001
From: Marco Selig <mselig@ncg-02.MPA-Garching.MPG.DE>
Date: Wed, 4 Feb 2015 15:16:11 +0100
Subject: [PATCH] minor bugs in submodule lm fixed.
---
lm/__init__.py | 4 ++--
lm/nifty_lm.py | 2 +-
nifty_core.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lm/__init__.py b/lm/__init__.py
index a25f43f5a..c79efd860 100644
--- a/lm/__init__.py
+++ b/lm/__init__.py
@@ -20,7 +20,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division
-
+from nifty import about
#from nifty_lm import *
try:
import libsharp_wrapper_gl as gl
@@ -28,6 +28,7 @@ except(ImportError):
try:
import healpy as hp
except(ImportError):
+ about.infos.cprint("INFO: neither libsharp_wrapper_gl nor healpy available.")
pass ## import nothing
else:
from nifty_lm import lm_space,hp_space ## import lm & hp
@@ -39,6 +40,5 @@ else:
from nifty_lm import lm_space,gl_space ## import lm & gl
else:
from nifty_lm import lm_space,gl_space,hp_space ## import all 3
-
from nifty_power_conversion_lm import *
diff --git a/lm/nifty_lm.py b/lm/nifty_lm.py
index 039a7f0e7..a7eae985d 100644
--- a/lm/nifty_lm.py
+++ b/lm/nifty_lm.py
@@ -636,7 +636,7 @@ class lm_space(space):
else:
return gl.dotlm(x,y,lmax=self.para[0],mmax=self.para[1])
else:
- self._dotlm(x,y)
+ return self._dotlm(x,y)
##+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/nifty_core.py b/nifty_core.py
index 2fc1351a6..b107fda81 100644
--- a/nifty_core.py
+++ b/nifty_core.py
@@ -150,7 +150,7 @@ from multiprocessing import Value as mv
from multiprocessing import Array as ma
-__version__ = "1.0.4"
+__version__ = "1.0.5"
pi = 3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679
--
GitLab