foscat 2026.1.1__tar.gz → 2026.2.1__tar.gz

{foscat-2026.1.1/src/foscat.egg-info → foscat-2026.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foscat
-Version: 2026.1.1
+Version: 2026.2.1
 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-2026.1.1 → foscat-2026.2.1}/pyproject.toml

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

{foscat-2026.1.1 → foscat-2026.2.1}/src/foscat/FoCUS.py

@@ -9,7 +9,7 @@ from foscat.SphereDownGeo import SphereDownGeo
 from foscat.SphereUpGeo import SphereUpGeo
 import torch
 
-TMPFILE_VERSION = "V12_0"
+TMPFILE_VERSION = "V13_0"
 
 
 class FoCUS:
@@ -39,7 +39,7 @@ class FoCUS:
             mpi_rank=0
     ):
 
-        self.__version__ = "2026.01.1"
+        self.__version__ = "2026.02.1"
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION = TMPFILE_VERSION
         self.P1_dic = None
@@ -1579,11 +1579,20 @@ class FoCUS:
                     
                     xx=np.tile(np.arange(self.KERNELSZ)-self.KERNELSZ//2,self.KERNELSZ).reshape(self.KERNELSZ,self.KERNELSZ)
                     
-                    wwr=(np.exp(-pw2*(xx**2+(xx.T)**2))*np.cos(pw*xx*np.pi)).reshape(1,1,self.KERNELSZ*self.KERNELSZ)
-                    wwr-=wwr.mean()
-                    wwi=(np.exp(-pw2*(xx**2+(xx.T)**2))*np.sin(pw*xx*np.pi)).reshape(1,1,self.KERNELSZ*self.KERNELSZ)
-                    wwi-=wwi.mean()
-                    amp=np.sum(abs(wwr+1J*wwi))
+                    if nside>2:
+                        wwr=(np.exp(-pw2*(xx**2+(xx.T)**2))*np.cos(pw*xx*np.pi)).reshape(1,1,self.KERNELSZ*self.KERNELSZ)
+                        wwr-=wwr.mean()
+                        wwi=(np.exp(-pw2*(xx**2+(xx.T)**2))*np.sin(pw*xx*np.pi)).reshape(1,1,self.KERNELSZ*self.KERNELSZ)
+                        wwi-=wwi.mean()
+                        amp=np.sum(abs(wwr+1J*wwi))
+                    else:
+                        #asymetric kernels
+                        wwr=(np.exp(-2*pw2*(xx**2+self.NORIENT*(xx.T)**2))).reshape(1,1,self.KERNELSZ*self.KERNELSZ)
+                        #wwr-=wwr.mean()
+                        #wwi=(np.exp(-pw2*(xx**2+(xx.T)**2))*np.sin(pw*xx*np.pi)).reshape(1,1,self.KERNELSZ*self.KERNELSZ)
+                        #wwi-=wwi.mean()
+                        wwi=0.0*wwr
+                        amp=self.NORIENT*np.sum(abs(wwr+1J*wwi))
                     
                     wwr/=amp
                     wwi/=amp

{foscat-2026.1.1 → foscat-2026.2.1}/src/foscat/SphereDownGeo.py

@@ -259,7 +259,7 @@ class SphereDownGeo(nn.Module):
             # angular distance via dot product
             dots = np.clip(np.dot(vec, vec0), -1.0, 1.0)
             ang = np.arccos(dots)
-            w = np.exp(- 2*(ang / sigma_rad) ** 2)
+            w = np.exp(- 2.0*(ang / sigma_rad) ** 2)
 
             w = self._normalize_weights(w)
 

{foscat-2026.1.1 → foscat-2026.2.1}/src/foscat/scat_cov.py

@@ -2701,7 +2701,7 @@ class funct(FOC.FoCUS):
             if nside is None:
                 nside = int(np.sqrt(npix // 12))
 
-            J = int(np.log(nside) / np.log(2))  # Number of j scales
+            J = int(np.log2(nside)+1)  # Number of j scales
             if cell_ids is not None:
                 J=np.min([J,int(np.log(cell_ids.shape[0]) / (2*np.log(2)))-1])
 
@@ -2712,7 +2712,7 @@ class funct(FOC.FoCUS):
         if Jmax > J:
             print("==========\n\n")
             print(
-                "The Jmax you requested is larger than the data size, which may cause problems while computing the scattering transform."
+                "The Jmax you requested is larger than the data size ", J,", which may cause problems while computing the scattering transform."
             )
             print("\n\n==========")
 

{foscat-2026.1.1 → foscat-2026.2.1/src/foscat.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foscat
-Version: 2026.1.1
+Version: 2026.2.1
 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>