foscat 3.3.1__tar.gz → 3.3.4__tar.gz

{foscat-3.3.1/src/foscat.egg-info → foscat-3.3.4}/PKG-INFO

@@ -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 → foscat-3.3.4}/pyproject.toml

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

{foscat-3.3.1 → foscat-3.3.4}/src/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-3.3.1 → foscat-3.3.4}/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.1 → foscat-3.3.4/src/foscat.egg-info}/PKG-INFO

@@ -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>