submodule lm implemented.

.gitignore

@@ -22,8 +22,6 @@ rg/*
 lm/*
 !lm/__init__.py
 !lm/nifty_lm.py
-!lm/nifty_gl.py
-!lm/nifty_hp.py
 !lm/nifty_power_conversion_lm.py
 
 demos/*

lm/__init__.py

@@ -20,6 +20,25 @@
 ## along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import division
-#from nifty_rg import *
+
+#from nifty_lm import *
+try:
+    import libsharp_wrapper_gl as gl
+except(ImportError):
+    try:
+        import healpy as hp
+    except(ImportError):
+        pass ## import nothing
+    else:
+        from nifty_lm import lm_space,hp_space ## import lm & hp
+        ## TODO: change about
+else:
+    try:
+        import healpy as hp
+    except(ImportError):
+        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 *
 

rg/nifty_rg.py

@@ -28,7 +28,7 @@
     ..  /__/ /__/ /__/ /__/    \___/  \___   /  rg
     ..                               /______/
 
-    This submodule for regular Cartesian grids.
+    NIFTY submodule for regular Cartesian grids.
 
 """
 from __future__ import division