foscat 2026.1.1__py3-none-any.whl → 2026.2.1__py3-none-any.whl

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

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

@@ -4,14 +4,14 @@ foscat/BkTensorflow.py,sha256=iIdLx6VTOfOEocfZBOGyizQn5geDLTfdWWAwDeQr9YA,20056
 foscat/BkTorch.py,sha256=9utOTAfS99E7DPN0QfCnn5ULS1WdS4z3-Z0XJMriJY4,53202
 foscat/CNN.py,sha256=4vky7jqTshL1aYLWsc-hQwf7gDjTVjL7I6HZiAsa6x4,5158
 foscat/CircSpline.py,sha256=CXi49FxF8ZoeZ17Ua8c1AZXe2B5ICEC9aCXb97atB3s,4028
-foscat/FoCUS.py,sha256=QP5qZlZrrfn4FyhnoKRCF2CwusoLGrrouPc-ysfiP3M,109246
+foscat/FoCUS.py,sha256=HxXh9jHGtopt-jtYAz_dx4GH-88tALY6yZ30kkbDIHM,109790
 foscat/GCNN.py,sha256=q7yWHCMJpP7-m3WvR3OQnp5taeYWaMxIY2hQ6SIb9gs,4487
 foscat/HOrientedConvol.py,sha256=xMaS-zzoUyXisBCPsHBVpn54tuA9Qv3na-tT86Cwn7U,38744
 foscat/HealBili.py,sha256=YRPk9PO5G8NdwKeb33xiJs3_pMPAgIv5phCs8GT6LN0,12943
 foscat/HealSpline.py,sha256=YRotJ1NQuXYFyFiM8fp6qkATIwRJ8lqIVo4vGXpHO-w,7472
 foscat/Plot.py,sha256=bpohWGsblTBxMrqE_X-iRvuvT-YyHDcgfWB4iYk5l10,49218
 foscat/Softmax.py,sha256=UDZGrTroYtmGEyokGUVpwNO_cgbICi9QVuRr8Yx52_k,2917
-foscat/SphereDownGeo.py,sha256=KA25940n0Wu8D8t0xCWdkUjHqfsRUnKIDjA-DvpRTnc,15378
+foscat/SphereDownGeo.py,sha256=B_ENfL4Mqn6VmpXEGGxEW8DR3R6zCNV-YVtsU00xwjY,15380
 foscat/SphereUpGeo.py,sha256=KvvXqVRW7eX79MJsJJS6g5ll84Qyx0bLZzQaDXy4fp4,7023
 foscat/SphericalStencil.py,sha256=kRyQXwZyoxdRW326e2ht8eGzg1-Lvl89tdHSpVTfJzg,47620
 foscat/Spline1D.py,sha256=rKzzenduaZZ-yBDJd35it6Gyrj1spqb7hoIaUgISPzY,2983
@@ -33,14 +33,14 @@ foscat/planar_vit.py,sha256=lQqwyz_P8G-Dav2vLqgkssDfeSe15YmjFzP5W-otjs0,6888
 foscat/scat.py,sha256=emN7MsSuoJzPWQfgDETScZeKLmu8K-jjEh5Dp7szQzY,72809
 foscat/scat1D.py,sha256=FvvxwhlzxwvIETkenpisvDteJ06DBYP5K7wsnJ2nHjM,53713
 foscat/scat2D.py,sha256=boKj0ASqMMSy7uQLK6hPniG87m3hZGJBYBiq5v8F9IQ,532
-foscat/scat_cov.py,sha256=MQ31UjFqhdc3NBoUhnphyN1HhJZGLnrBf6CIMVEaevU,271772
+foscat/scat_cov.py,sha256=R_-S1RLz6_TUUPGyZO9aenSfRWIzF-Ber5W3-LbdLwU,271770
 foscat/scat_cov1D.py,sha256=XOxsZZ5TYq8f34i2tUgIfzyaqaTDlICB3HzD2l_puro,531
 foscat/scat_cov2D.py,sha256=pAm0fKw8wyXram0TFbtw8tGcc8QPKuPXpQk0kh10r4U,7078
 foscat/scat_cov_map.py,sha256=9MzpwT2g9S3dmnjHEMK7PPLQ27oGQg2VFVsP_TDUU5E,2869
 foscat/scat_cov_map2D.py,sha256=zaIIYshXCqAeZ04I158GhD-Op4aoMlLnLEy7rxckVYY,2842
 foscat/unet_2_d_from_healpix_params.py,sha256=r8hN-s091f3yHYlvAAiBbLOvtsz9vPrdwrWPM0ULR2Q,15949
-foscat-2026.1.1.dist-info/licenses/LICENSE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
-foscat-2026.1.1.dist-info/METADATA,sha256=5Wkrz1VwUxbh8Edc6X_84dOTcpOzYl7dFo71fxzyFJk,4489
-foscat-2026.1.1.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-foscat-2026.1.1.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-2026.1.1.dist-info/RECORD,,
+foscat-2026.2.1.dist-info/licenses/LICENSE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
+foscat-2026.2.1.dist-info/METADATA,sha256=bj4y6lKOf7qwfFrR6KdRt_8GWXh6W3q0fkHKMo6fSD8,4489
+foscat-2026.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+foscat-2026.2.1.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-2026.2.1.dist-info/RECORD,,

{foscat-2026.1.1.dist-info → foscat-2026.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any