foscat 3.3.1__py3-none-any.whl → 3.3.4__py3-none-any.whl

foscat/alm.py

@@ -3,10 +3,13 @@ import numpy as np
 
 class alm():
 
-    def __init__(self,backend=None,lmax=24,limit_range=1E7):
+    def __init__(self,backend=None,lmax=24,nside=None,limit_range=1E7):
         self._logtab={}
-        self.lmax=0
-        for k in range(1,2*lmax+1):
+        if nside is not None:
+            self.lmax=3*nside
+        else:
+            self.lmax=lmax
+        for k in range(1,2*self.lmax+1):
             self._logtab[k]=np.log(k) 
         self._limit_range=1/limit_range
         self._log_limit_range=np.log(limit_range)
@@ -52,7 +55,7 @@ class alm():
         ratio[0,0]= self.double_factorial_log(2*m - 1)-0.5*np.sum(self.log(1+np.arange(2*m)))
     
         if m == lmax:
-            return result*np.exp(ratio)*np.sqrt((2*(np.arange(lmax-m+1)-m))/(4*np.pi)).reshape(lmax+1-m,1)
+            return result*np.exp(ratio)*np.sqrt(4*np.pi*(2*(np.arange(lmax-m+1)+m)+1)).reshape(lmax+1-m,1)
     
         # Étape 2 : Calcul de P_{l+1, m}(x)
         result[1] = x * (2*m + 1) * result[0]
@@ -68,7 +71,7 @@ class alm():
                 result[l-m]*=self._limit_range
                 ratio[l-m-1,0]+=self._log_limit_range
                 ratio[l-m,0]+=self._log_limit_range
-        
+                
         return result*np.exp(ratio)*(np.sqrt(4*np.pi*(2*(np.arange(lmax-m+1)+m)+1))).reshape(lmax+1-m,1)
     
     def comp_tf(self,im,ph):
@@ -101,9 +104,9 @@ class alm():
         th,ph=hp.pix2ang(nside,np.arange(12*nside*nside))
         if nest:
             idx=hp.ring2nest(nside,np.arange(12*nside**2))
-            ft_im=self.comp_tf(self.backend.bk_complex(im[idx],0*im),ph)
+            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(map2[idx],0*im),ph)
+                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:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.3.1
+Version: 3.3.4
 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.1.dist-info → foscat-3.3.4.dist-info}/RECORD

@@ -6,8 +6,8 @@ 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=Ga1PUDDQlXz6sNf9ZTewO2U3uspbN8GsieKj3fSaQ14,5446
-foscat/backend.py,sha256=SyPNkwuwIKAeUQZE4m5RSUr29jjVbL4wzNrtqYXmVno,38557
+foscat/alm.py,sha256=L29DxMFuKUPk3LO9wVErhDKDqyWUxk5OndyxFHphgps,5597
+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
@@ -19,8 +19,8 @@ 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.1.dist-info/LICENCE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
-foscat-3.3.1.dist-info/METADATA,sha256=HuiEXLDRqhuE2dGcp6Uvh8aCJeo80XUrh1ppa5ncB2Y,7191
-foscat-3.3.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foscat-3.3.1.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.3.1.dist-info/RECORD,,
+foscat-3.3.4.dist-info/LICENCE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
+foscat-3.3.4.dist-info/METADATA,sha256=yaXfM1oeDDodXs_qfv1UlHx_Fmd4oeMFk-L3noimUmo,7191
+foscat-3.3.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foscat-3.3.4.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.3.4.dist-info/RECORD,,