PyCosmoMMF 0.0.5__tar.gz → 0.0.7__tar.gz

{PyCosmoMMF-0.0.5 → PyCosmoMMF-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCosmoMMF
-Version: 0.0.5
+Version: 0.0.7
 Summary: A package for detecting structures in the Cosmic Web.
 Home-page: https://github.com/James11222/PyCosmoMMF/
 Author: James Sunseri

{PyCosmoMMF-0.0.5 → PyCosmoMMF-0.0.7}/PyCosmoMMF/filter.py

@@ -26,9 +26,9 @@ def wavevectors3D(dims, box_size=(2*np.pi, 2*np.pi, 2*np.pi)):
         The wavevectors in each dimension.
     """
     sample_rate = 2*np.pi * (np.array(dims) / box_size)
-    kx = np.fft.fftfreq(dims[0], 1/sample_rate[0]) * (2*np.pi / dims[0])
-    ky = np.fft.fftfreq(dims[1], 1/sample_rate[1]) * (2*np.pi / dims[1])
-    kz = np.fft.fftfreq(dims[2], 1/sample_rate[2]) * (2*np.pi / dims[2])
+    kx = (np.fft.fftfreq(dims[0], 1/sample_rate[0]) * (2*np.pi / dims[0])).astype(np.float32)
+    ky = (np.fft.fftfreq(dims[1], 1/sample_rate[1]) * (2*np.pi / dims[1])).astype(np.float32)
+    kz = (np.fft.fftfreq(dims[2], 1/sample_rate[2]) * (2*np.pi / dims[2])).astype(np.float32)
     return kx, ky, kz
 
 @jit_compiler
@@ -50,7 +50,7 @@ def kspace_gaussian_filter(R_S, kv):
     """
     kx, ky, kz = kv
     nx, ny, nz = len(kx), len(ky), len(kz)
-    filter_k = np.zeros((nx, ny, nz))
+    filter_k = np.zeros((nx, ny, nz), dtype=np.float32)
     for ix in nb.prange(nx):
         for iy in range(ny):
             for iz in range(nz):
@@ -78,7 +78,7 @@ def kspace_top_hat_filter(R_S, kv):
 
     kx, ky, kz = kv
     nx, ny, nz = len(kx), len(ky), len(kz)
-    filter_k = np.zeros((nx, ny, nz))
+    filter_k = np.zeros((nx, ny, nz), dtype=np.float32)
 
     for ix in nb.prange(nx):
         for iy in range(ny):
@@ -112,7 +112,7 @@ def smooth_top_hat(f, R_S, kv):
     GF = kspace_top_hat_filter(R_S, kv)
     f_Rn = np.real(np.fft.ifftn(GF * np.fft.fftn(f)))
     f_Rn = f_Rn * (np.sum(f) / np.sum(f_Rn))
-    return f_Rn
+    return f_Rn.astype(np.float32)
 
 def smooth_gauss(f, R_S, kv):
     """
@@ -135,7 +135,7 @@ def smooth_gauss(f, R_S, kv):
     GF = kspace_gaussian_filter(R_S, kv)
     f_Rn = np.real(np.fft.ifftn(GF * np.fft.fftn(f)))
     f_Rn = f_Rn * (np.sum(f) / np.sum(f_Rn))
-    return f_Rn
+    return f_Rn.astype(np.float32)
 
 
 def smooth_loggauss(f, R_S, kv):
@@ -178,5 +178,5 @@ def smooth_loggauss(f, R_S, kv):
     norm = np.sum(f) / np.sum(f_result)
     f_result *= norm
 
-    return f_result
+    return f_result.astype(np.float32)
 

{PyCosmoMMF-0.0.5 → PyCosmoMMF-0.0.7}/PyCosmoMMF/hessian.py

@@ -30,7 +30,7 @@ def fast_hessian_from_smoothed(f_Rn, R_S, kv):
 
     f_Rn_hat = np.fft.fftn(f_Rn)
     dims = f_Rn_hat.shape
-    hessian = np.zeros((dims[0], dims[1], dims[2], 6), dtype=np.complex128)
+    hessian = np.zeros((dims[0], dims[1], dims[2], 6), dtype=np.complex64)
     kx, ky, kz = kv[0], kv[1], kv[2]
 
     @jit_compiler

{PyCosmoMMF-0.0.5 → PyCosmoMMF-0.0.7}/PyCosmoMMF/signatures.py

@@ -29,7 +29,7 @@ def signatures_from_hessian(hessian):
     """
     
     hsize = hessian.shape[:3]
-    sigs = np.zeros((hsize[0], hsize[1], hsize[2], 3))
+    sigs = np.zeros((hsize[0], hsize[1], hsize[2], 3), dtype=np.float32)
 
     #helper functions
     def θ(x):
@@ -95,15 +95,16 @@ def maximum_signature(Rs, field, alg='NEXUSPLUS'):
         raise ValueError("alg must be either 'NEXUS' or 'NEXUSPLUS'")
     
     nx, ny, nz = field.shape
+    eps = 1e-5
     
     # Make sure the field has no 0 values
-    field = field + 0.0001
+    field = field + eps
     
     # Calculate wave vectors for our field
     wave_vecs = wavevectors3D((nx, ny, nz))
     
     # Calculate signatures at each scale Rn, determine max
-    sigmax = np.ones((nx, ny, nz, 3)) * 0.00001
+    sigmax = np.ones((nx, ny, nz, 3), dtype=np.float32) * eps
 
     @jit_compiler
     def perform_loop(sigmax, sigs_Rn, nx, ny, nz):

{PyCosmoMMF-0.0.5 → PyCosmoMMF-0.0.7}/PyCosmoMMF/tagging.py

@@ -235,7 +235,7 @@ def calc_structure_bools(data, max_sigs, verbose, clusbool=None, Smin=-3, Smax=2
     S_fil, dM2_fil = calc_mass_change(filament_valid, flat_data_valid, Smin, Smax)
     ind = np.argmax(dM2_fil) 
     filament_thresh = S_fil[ind]
-    filbool = (max_sigs[:,:,:,2] > filament_thresh) & (~clusbool)
+    filbool = (max_sigs[:,:,:,1] > filament_thresh) & (~clusbool)
     
     # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
     #                   Step 3. Create Wall Boolean Filter

{PyCosmoMMF-0.0.5 → PyCosmoMMF-0.0.7}/PyCosmoMMF.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCosmoMMF
-Version: 0.0.5
+Version: 0.0.7
 Summary: A package for detecting structures in the Cosmic Web.
 Home-page: https://github.com/James11222/PyCosmoMMF/
 Author: James Sunseri

{PyCosmoMMF-0.0.5 → PyCosmoMMF-0.0.7}/setup.py

@@ -12,7 +12,7 @@ here = pathlib.Path(__file__).parent.resolve()
 
 setup(
     name='PyCosmoMMF',  # Required
-    version='0.0.5',  # Required
+    version='0.0.7',  # Required
     description='A package for detecting structures in the Cosmic Web.',  # Optional
     long_description=(here / 'README.md').read_text(encoding='utf-8'),  # Optional
     long_description_content_type='text/markdown',  # Optional (see note above)