subhaloscript 1.0.3__tar.gz → 1.0.4__tar.gz

{subhaloscript-1.0.3 → subhaloscript-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subhaloscript
-Version: 1.0.3
+Version: 1.0.4
 Summary: Utility functions for analyzing subhalo distributions.
 Author-email: Charles Gannon <cgannon@ucmerced.edu>
 License-File: LICENSE

{subhaloscript-1.0.3 → subhaloscript-1.0.4}/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: subhaloscript
-  version: "1.0.3"
+  version: "1.0.4"
 
 source:
   path: .  # Or use `git_url`/`url` if not building from local files

{subhaloscript-1.0.3 → subhaloscript-1.0.4}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 [project]
 dependencies = ["numpy","pandas","scipy","h5py", "scikit-learn"]
 name = "subhaloscript"
-version = "1.0.3"
+version = "1.0.4"
 authors = [
   { name="Charles Gannon", email="cgannon@ucmerced.edu" },
 ]

{subhaloscript-1.0.3 → subhaloscript-1.0.4}/subscript/wrappers.py

@@ -230,14 +230,15 @@ def gscript_proj(func):
 
         ## This wrapped as well so we can call with None
         def wrap_inner(gout, **kwargs2):
-            _gout = format_nodedata(gout)[0].unfilter()
+            _gout = format_nodedata(gout)
 
             _input = []
             for n, _ in enumerate(normvector):
                 _in = copy(_gout)
-                _in.data = copy(_in.data)
-                _in.data['__custom_proj_iter__'] = n * np.ones(_in.data[next(_in.data.__iter__())].shape[0], dtype=int)
-                _input.append(_in)
+                for i in _in:
+                    _i = copy(i)
+                    _i.data['__custom_proj_iter__'] = n * np.ones(i.data[next(i.data.__iter__())].shape[0], dtype=int)
+                    _input.append(_i)
 
             return wrap_inner_main(_input, **(kwargs | kwargs2))
 

{subhaloscript-1.0.3 → subhaloscript-1.0.4}/tests/test_wrappers.py

@@ -53,12 +53,10 @@ def test_multi_proj():
     out_expected_yz = np.asarray((4, 3, 0), dtype=int)
 
     out_expected = np.mean(np.asarray((out_expected_xy, out_expected_xz, out_expected_yz)), axis=0)
-    print(out_expected)
 
     out = spatial2d_dn(mockdata, bins=bins, normvector=norm, summarize=True)
-    print(out)
-    out_actual, dn_r = out
 
+    out_actual, dn_r = out
 
     testing.assert_allclose(dn_r, bins)
     testing.assert_allclose(out_actual, out_expected) 
@@ -170,11 +168,45 @@ def test_multiproj():
 
 
 def test_multiproj_file():
+    # Test that combining multiple projections is the same as
+    # passing multiple projection vectors
+    path_dmo    = "tests/data/test.hdf5"
+    gout        = h5py.File(path_dmo)
+
+    nfproj   = freeze(r2d, rmin=1E-1, rmax=2E-2)
+
+    nv = np.identity(3)
+    n_actual = multiproj(nodecount, nfilter=nfproj)(gout, summarize=True, normvector=nv)
+
+    ncomb = []
+    ncomb += nodecount(gout, nfilter=nfproj, normvector=nv[0])
+    ncomb = nodecount(gout, nfilter=nfproj, normvector=nv[0])
+    ncomb = nodecount(gout, nfilter=nfproj, normvector=nv[0])
+
+    n_expected = np.mean(ncomb)
+
+    testing.assert_allclose(n_actual, n_expected)
+
+
+def test_multiproj_file():
+    # Test that projections are treated as trees in output shape
     path_dmo    = "tests/data/test.hdf5"
     gout        = h5py.File(path_dmo)
 
     nfproj   = freeze(r2d, rmin=1E-1, rmax=2E-2)
-    n_actual = multiproj(nodecount, nfilter=nfproj)(gout, summarize=True, normvector=np.identity(3))
+
+    nprojv = 6
+
+    nv = np.random.random(18).reshape(nprojv,3)
+    nproj = multiproj(nodecount, nfilter=nfproj)(gout, normvector=nv)
+
+    ntrees = len(nodecount(gout))
+
+    testing.assert_equal(len(nproj), ntrees * nprojv)
+
+
+
+
 
 def test_gscript_unfilter():
     # Ensure the expected behaviour occours when calling a script within a script