Rename module import

Author: paddyroddy

glass/__init__.py

@@ -48,7 +48,6 @@
     "lognormal_fields",
     "lognormal_gls",
     "lognormal_shift_hilbert2011",
-    "multalm",
     "multi_plane_matrix",
     "multi_plane_weights",
     "nfields_from_nspectra",
@@ -62,6 +61,7 @@
     "restrict",
     "save_cls",
     "shear_from_convergence",
+    "sht",
     "smail_nz",
     "solve_gaussian_spectra",
     "spectra_indices",
@@ -78,7 +78,7 @@
     from ._version import __version__
 
 # modules
-from glass import algorithm, grf
+from glass import algorithm, grf, sht
 from glass.fields import (
     check_posdef_spectra,
     cls2cov,
@@ -109,7 +109,6 @@
     redshifts,
     redshifts_from_nz,
 )
-from glass.harmonictools import multalm
 from glass.lensing import (
     MultiPlaneConvergence,
     deflect,

glass/fields.py

@@ -18,7 +18,7 @@
 
 import glass
 import glass.grf
-import glass.harmonictools
+import glass.sht
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Generator, Iterable, Iterator, Sequence
@@ -397,11 +397,11 @@ def _generate_grf(
 
         # scale by standard deviation of the conditional distribution
         # variance is distributed over real and imaginary part
-        alm = glass.harmonictools.multalm(z, s)
+        alm = glass.sht.multalm(z, s)
 
         # add the mean of the conditional distribution
         for i in range(ncorr):
-            alm += glass.harmonictools.multalm(y[:, i], a[:, i])
+            alm += glass.sht.multalm(y[:, i], a[:, i])
 
         # store the standard normal in y array at the indicated index
         if j is not None:

tests/test_harmonictools.py

@@ -5,7 +5,7 @@
 import numpy as np
 import pytest
 
-import glass.harmonictools
+import glass.sht
 
 if TYPE_CHECKING:
     import types
@@ -22,7 +22,7 @@ def test_multalm(xp: types.ModuleType) -> None:
     bl = xp.asarray([2.0, 0.5, 1.0])
     alm_copy = xp.asarray(alm, copy=True)
 
-    result = glass.harmonictools.multalm(alm, bl, inplace=True)
+    result = glass.sht.multalm(alm, bl, inplace=True)
 
     np.testing.assert_allclose(result, alm)
     expected_result = xp.asarray([2.0, 1.0, 1.5, 4.0, 5.0, 6.0])
@@ -39,14 +39,14 @@ def test_multalm(xp: types.ModuleType) -> None:
     alm = xp.asarray([1.0, 2.0, 3.0, 4.0, 5.0, 6.0])
     bl = xp.ones(3)
 
-    result = glass.harmonictools.multalm(alm, bl, inplace=False)
+    result = glass.sht.multalm(alm, bl, inplace=False)
     np.testing.assert_allclose(result, alm)
 
     # multiple with 0s
 
     bl = xp.asarray([0.0, 1.0, 0.0])
 
-    result = glass.harmonictools.multalm(alm, bl, inplace=False)
+    result = glass.sht.multalm(alm, bl, inplace=False)
 
     expected_result = xp.asarray([0.0, 2.0, 3.0, 0.0, 0.0, 0.0])
     np.testing.assert_allclose(result, expected_result)
@@ -56,5 +56,5 @@ def test_multalm(xp: types.ModuleType) -> None:
     alm = xp.asarray([])
     bl = xp.asarray([])
 
-    result = glass.harmonictools.multalm(alm, bl, inplace=False)
+    result = glass.sht.multalm(alm, bl, inplace=False)
     np.testing.assert_allclose(result, alm)