foscat 3.3.0__py3-none-any.whl → 3.3.3__py3-none-any.whl

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/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/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.dist-info → foscat-3.3.3.dist-info}/METADATA

@@ -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.dist-info → foscat-3.3.3.dist-info}/RECORD

@@ -6,21 +6,21 @@ foscat/Softmax.py,sha256=aBLQauoG0q2SJYPotV6U-cxAhsJcspWHNRWdnA_nAiQ,2854
 foscat/Spline1D.py,sha256=a5Jb8I9tb8y20iM8W-z6iZsIqDFByRp6eZdChpmuI5k,3010
 foscat/Synthesis.py,sha256=3_Lq5-gUM-WmO2h15kajMES8XjRo2BGseoxvTLW_xEc,13626
 foscat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-foscat/alm.py,sha256=qjczgfyZSZKv7eNmvE-UbRtOO6HQ42Cu-TTx1TioYyM,5148
-foscat/backend.py,sha256=SyPNkwuwIKAeUQZE4m5RSUr29jjVbL4wzNrtqYXmVno,38557
+foscat/alm.py,sha256=Dl--lgUVKsPUtDSAaiAewr5QBEU4kAAAGywl6_-SEA0,5492
+foscat/backend.py,sha256=TZnOyPYjqbHjOTkH2Zk0zN5DQf2-WNHlaxenuPo_wO0,38822
 foscat/backend_tens.py,sha256=9Dp136m9frkclkwifJQLLbIpl3ETI3_txdPUZcKfuMw,1618
 foscat/loss_backend_tens.py,sha256=dCOVN6faDtIpN3VO78HTmYP2i5fnFAf-Ddy5qVBlGrM,1783
 foscat/loss_backend_torch.py,sha256=k3z18Dj3SaLKK6ZIKcm7GO4U_YKYVP6LtHG1aIbxkYk,1627
 foscat/scat.py,sha256=qGYiBIysPt65MdmF07WWA4piVlTfA9-lFDTaicnqC2w,72822
 foscat/scat1D.py,sha256=W5Uu6wdQ4ZsFKXpof0f1OBl-1wjJmW7ruvddRWxe7uM,53726
 foscat/scat2D.py,sha256=boKj0ASqMMSy7uQLK6hPniG87m3hZGJBYBiq5v8F9IQ,532
-foscat/scat_cov.py,sha256=cyq-gK23mlQSy1zblDPWJsmJwrEw7bcWx1URqCgqZ48,144287
+foscat/scat_cov.py,sha256=e7o5CRG48tdYD1KYbXKWW5XmGA-C70aoRzAGCh0RJdM,144285
 foscat/scat_cov1D.py,sha256=XOxsZZ5TYq8f34i2tUgIfzyaqaTDlICB3HzD2l_puro,531
 foscat/scat_cov2D.py,sha256=3gn6xjKvfKsyHJoPfYIu8q9LLVAbU3tsiS2l1LAJ0XM,531
 foscat/scat_cov_map.py,sha256=0wTRo4Nc7rYfI09RI2mh2bYixoukt5lrvAXR6wa9kjA,2744
 foscat/scat_cov_map2D.py,sha256=FqF45FBcoiQbvuVsrLWUIPRUc95GsKsrnH6fKzB3GlE,2841
-foscat-3.3.0.dist-info/LICENCE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
-foscat-3.3.0.dist-info/METADATA,sha256=chJzw6s5UFmpGc-XlgunHjQRfDWlZUomwec7CYU5diY,7191
-foscat-3.3.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foscat-3.3.0.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.3.0.dist-info/RECORD,,
+foscat-3.3.3.dist-info/LICENCE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
+foscat-3.3.3.dist-info/METADATA,sha256=t8Rl5Bh6t2LRjFZLpctvDA6eXzqemUSRLzhjiO8s-fY,7191
+foscat-3.3.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foscat-3.3.3.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.3.3.dist-info/RECORD,,