update tests to match basis refactor and minor edits

Author: jngaravitoc

EXPtools/__init__.py

@@ -1,19 +1,21 @@
-# Allow direct access to these submodules/classes from the package
-from .basis_builder.profiles import Profiles
-from .basis_builder.basis_utils import make_basis, make_config, make_Dfit
-from .basis_builder.makemodel import make_model
-from .ios.ios import exp_coefficients
+# Re-export selected submodules and utilities at the package level
+from .basis.profiles import Profiles
+from .basis.basis_utils import load_basis, make_basis, write_config
+from .basis.makemodel import make_model
+#from .ios.ios import exp_coefficients
 from .utils.halo import ICHernquist
-from .utils import write_basis, load_basis
 from .visuals import Grid3D
-# Explicitly declare public API
+
+# Declare the public API
 __all__ = [
-            "Profiles",
-            "makebasis",
-            "write_table",
-            "make_config",
-            "exp_coefficients",
-            "makemodel",
-            "ICHernquist"
-           ]
+    "Profiles",
+    "make_basis",
+    "write_config",
+    "make_Dfit",
+    "make_model",
+    "exp_coefficients",
+    "ICHernquist",
+    "load_basis",
+    "Grid3D",
+]
 

EXPtools/utils/__init__.py

@@ -2,4 +2,3 @@
 from . import coefficients
 from . import indexing
 from . import units
-from .basis import load_basis, write_basis

EXPtools/utils/halo.py

@@ -43,7 +43,7 @@ def triaxial(self, axis_ratios, rot_angle,
         axis_ratios : list
             List of principal axis ratios in the following order: [a, b, c] 
             axis will be computes as x/a, y/b, z/c
-	rot_angle : float
+	    rot_angle : float
             Angle at which the halo is going to be rotated in degrees
         rot_axis : str
             Rotation axis it could be: 'x', 'y', 'z'

EXPtools/visuals/visualize.py

@@ -146,7 +146,7 @@ def find_field(basis, coefficients, time=0, xyz=(0, 0, 0), property='dens',
     else:
         raise ValueError("Invalid property specified. Possible values are 'dens', 'pot', and 'force'.")
 
-def spherical_avg_prop(basis, coefficients, time=0, radius=np.linspace(0.1, 600, 100), property='dens'):
+def spherical_avg_prop(grid, basis, coefficients, time=0, radius=np.linspace(0.1, 600, 100), property='dens'):
     """
     Computes the spherically averaged value of the specified property of the field over the given radii.
 
@@ -174,53 +174,15 @@ def spherical_avg_prop(basis, coefficients, time=0, radius=np.linspace(0.1, 600,
     ValueError: 
         If the property argument is not 'dens', 'pot', or 'force'.
     """
+    Grid3D()
+    fields = pyEXP.field.FieldGenerator(times, mesh)
+    points = field.points(basis, coefs)
+    
+    return radius, profile
 
-    coefficients.set_coefs(coefficients.getCoefStruct(time))
-    field = [find_field(basis, np.hstack([[rad], [0], [0]]), property=property, include_monopole=True) for rad in radius]
-
-    if property == 'force':
-        return np.vstack(field), radius
-
-    return np.array(field), radius
-
-
-def make_grid(gridtype, gridspecs, rgrid, representation='cartesian'):
-    """
-    Make a variety of grids in different coordinate representations
 
-    Parameters
-    ----------
-    gridtype:
-    npoints:
-    rgrid:
-    representation:
 
 
-    Returns:
-    --------
-    coordinates 
-    
-    """
-    
-    if gridtype == 'spherical':
-        arcostheta = np.linspace(-1, 1, gridspecs['theta_bins'])
-        phi = np.linspace(0, 2*np.pi, gridspecs['phi_bins'])
-        theta_mesh, phi_mesh = np.meshgrid(np.arccos(arcostheta), phi)
-
-        if representation == 'cartesian':
-            x = rgrid  * np.sin(theta_mesh) * np.cos(phi_mesh)
-            y = rgrid  * np.sin(theta_mesh) * np.sin(phi_mesh)
-            z = rgrid  * np.cos(theta_mesh) 
-            ## TODO: fix this return to allow the user to chose what to return
-            return np.array([x, y, z]), theta_mesh, phi_mesh
-        
-        elif representation == 'spherical':
-            return np.array([theta_mesh, phi_mesh])
-  
-    else:
-        print('gridtype {} not implemented'.format(gridtype))  
-        return 0 
-
 def return_fields_in_grid(basis, coefficients, times=[0], 
                        projection='3D', proj_plane=0, 
                        grid_lim=300, npoints=150,):

pyproject.toml

@@ -4,15 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "EXPtools"
-version = "0.2.1"
+version = "0.2.2"
 authors = [
   { name="Nico Garavito-Camargo", email="ngaravito@flatironinstitute.org" }, 
   { name="Arpit Arora", email="arora125@sas.upenn.edu"},
 ]
 
 description = "Library to analyze and visualize basis function expansions using pyEXP"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 keywords = ["astronomy", "dynamics"]
 classifiers = [
     "Programming Language :: Python :: 3",

tests/test_basis_utils.py

@@ -2,7 +2,9 @@
 import tempfile
 import os
 import yaml
-from EXPtools.basis_builder import make_model, make_config, _write_table
+from EXPtools.basis import make_model, make_config, write_table
+from EXPtools.basis import Profiles 
+
 
 def test_write_table():
     # Prepare dummy data
@@ -76,30 +78,35 @@ def test_make_config():
     print("✅ All tests passed for make_config")
 
 
-def test_makemodel():
+def test_make_model():
+    from pathlib import Path
+
+    DATA_DIR = Path(__file__).parent / "data"
     # Create simple synthetic density profile
-    radius = np.logspace(-1, 1, 5)  # 5 points from 0.1 to 10
-    density = 1.0 / radius**2       # rho ~ r^-2 (common in astrophysics)
+    TEST_PLUMMER = "test_plummer_halo.txt"
+    test_data = os.join(DATA_DIR, TEST_PLUMMER)
+    R_plummer, D_plummer, M_plummer, P_plummer = np.loadtxt(test_data, skiprows=3, unpack=True)
+    
+    radius = np.logspace(-2, 2.5, 300)  #
+    halo_model = Profiles(radius, scale_radius=10)
+    density = Profiles.plummer_density()
 
     Mtotal = 10.0  # desired total mass
 
     # Run model generation
-    r_scaled, d_scaled, m_scaled, p_scaled = make_model(radius, density, Mtotal, verbose=False)
-
+    r_scaled, d_scaled, m_scaled, p_scaled = make_model(radius, density, Mtotal,
+            physical_units=True, verbose=False)
     # Assertions
-    assert r_scaled.shape == radius.shape
-    assert d_scaled.shape == density.shape
-    assert m_scaled.shape == radius.shape
-    assert p_scaled.shape == radius.shape
+    assert r_scaled == R_plummer
+    assert d_scaled == D_plummer
+    assert m_scaled == M_plummer
+    assert p_scaled == P_plummer
 
     assert np.all(np.isfinite(r_scaled))
     assert np.all(np.isfinite(d_scaled))
     assert np.all(np.isfinite(m_scaled))
     assert np.all(np.isfinite(p_scaled))
 
-    assert np.all(r_scaled > 0)
-    assert np.all(d_scaled > 0)
-    assert np.all(m_scaled > 0)
 
     # Check mass conservation approximately
     np.testing.assert_allclose(m_scaled[-1], Mtotal, rtol=1e-2)

tests/test_profiles.py

@@ -1,5 +1,5 @@
 import numpy as np
-from EXPtools.basis_builder import profiles
+from EXPtools.basis import profiles
 
 # Test output of functions
 # Test document test functions