foscat 3.3.0__tar.gz → 3.3.3__tar.gz

{foscat-3.3.0/src/foscat.egg-info → foscat-3.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.3.0
+Version: 3.3.3
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Author-email: Jean-Marc DELOUIS <jean.marc.delouis@ifremer.fr>
 Maintainer-email: Theo Foulquier <theo.foulquier@ifremer.fr>

{foscat-3.3.0 → foscat-3.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "foscat"
-version = "3.3.0"
+version = "3.3.3"
 description = "Generate synthetic Healpix or 2D data using Cross Scattering Transform"
 readme = "README.md"
 license = { text = "BSD-3-Clause" }

{foscat-3.3.0 → foscat-3.3.3}/src/foscat/alm.py

@@ -96,12 +96,18 @@ class alm():
             ii+=1
         return self.backend.bk_reshape(self.backend.bk_concat(ft_im,axis=0),[4*nside-1,3*nside])
 
-    def anafast(self,im,map2=None):
+    def anafast(self,im,map2=None,nest=True):
         nside=int(np.sqrt(im.shape[0]//12))
         th,ph=hp.pix2ang(nside,np.arange(12*nside*nside))
-        ft_im=self.comp_tf(self.backend.bk_complex(im,0*im),ph)
-        if map2 is not None:
-            ft_im2=self.comp_tf(self.backend.bk_complex(map2,0*im),ph)
+        if nest:
+            idx=hp.ring2nest(nside,np.arange(12*nside**2))
+            ft_im=self.comp_tf(self.backend.bk_complex(self.backend.bk_gather(im,idx),0*im),ph)
+            if map2 is not None:
+                ft_im2=self.comp_tf(self.backend.bk_complex(self.backend.bk_gather(map2,idx),0*im),ph)
+        else:
+            ft_im=self.comp_tf(self.backend.bk_complex(im,0*im),ph)
+            if map2 is not None:
+                ft_im2=self.comp_tf(self.backend.bk_complex(map2,0*im),ph)
             
         co_th=np.cos(np.unique(th))
 

{foscat-3.3.0 → foscat-3.3.3}/src/foscat/backend.py

@@ -932,6 +932,14 @@ class foscat_backend:
             return self.backend.zeros(shape,dtype=dtype)
         if self.BACKEND == self.NUMPY:
             return np.zeros(shape,dtype=dtype)
+
+    def bk_gather(self, data,idx):
+        if self.BACKEND == self.TENSORFLOW:
+            return self.backend.gather(data,idx)
+        if self.BACKEND == self.TORCH:
+            return data[idx]
+        if self.BACKEND == self.NUMPY:
+            return data[idx]
         
     def bk_fft(self, data):
         if self.BACKEND == self.TENSORFLOW:

{foscat-3.3.0 → foscat-3.3.3}/src/foscat/scat_cov.py

@@ -1496,7 +1496,7 @@ class scat_cov:
                         ax1.axvline(n - 0.5, ls=":", color="gray")
         plt.yscale("log")
         if norm:
-            ax1.set_ylabel(r"$\frac{S_4}{\sqrt{P_{00,j_1}P_{00,j_2}}}$")
+            ax1.set_ylabel(r"$\frac{S_4}{\sqrt{S_{2,j_1}S_{2,j_2}}}$")
         else:
             ax1.set_ylabel(r"$S_4$")
 

{foscat-3.3.0 → foscat-3.3.3/src/foscat.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.3.0
+Version: 3.3.3
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Author-email: Jean-Marc DELOUIS <jean.marc.delouis@ifremer.fr>
 Maintainer-email: Theo Foulquier <theo.foulquier@ifremer.fr>