foscat 3.1.4__tar.gz → 3.1.6__tar.gz

{foscat-3.1.4 → foscat-3.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.1.4
+Version: 3.1.6
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Home-page: https://github.com/jmdelouis/FOSCAT
 Author: Jean-Marc DELOUIS
@@ -9,6 +9,12 @@ Maintainer: Theo Foulquier
 Maintainer-email: theo.foulquier@ifremer.fr
 License: MIT
 Keywords: Scattering transform,Component separation,denoising
+Requires-Dist: imageio
+Requires-Dist: imagecodecs
+Requires-Dist: matplotlib
+Requires-Dist: numpy
+Requires-Dist: tensorflow
+Requires-Dist: healpy
 
 Utilize the Cross Scattering Transform (described in https://arxiv.org/abs/2207.12527) to synthesize Healpix or 2D data that is suitable for component separation purposes, such as denoising. 
  A demo package for this process can be found at https://github.com/jmdelouis/FOSCAT_DEMO. 

{foscat-3.1.4 → foscat-3.1.6}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='foscat',
-    version='3.1.4',
+    version='3.1.6',
     description='Generate synthetic Healpix or 2D data using Cross Scattering Transform' ,
     long_description='Utilize the Cross Scattering Transform (described in https://arxiv.org/abs/2207.12527) to synthesize Healpix or 2D data that is suitable for component separation purposes, such as denoising. \n A demo package for this process can be found at https://github.com/jmdelouis/FOSCAT_DEMO. \n Complete doc can be found at https://foscat-documentation.readthedocs.io/en/latest/index.html. \n\n List of developers : J.-M. Delouis, T. Foulquier, L. Mousset, T. Odaka, F. Paul, E. Allys ' ,
     license='MIT',

{foscat-3.1.4 → foscat-3.1.6}/src/foscat/FoCUS.py

@@ -33,7 +33,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.1.4'
+        self.__version__ = '3.1.6'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None

{foscat-3.1.4 → foscat-3.1.6}/src/foscat/scat_cov.py

@@ -1961,8 +1961,7 @@ class funct(FOC.FoCUS):
             if not cross:
                 s0,l_vs0 = self.masked_mean(I1,vmask,axis=1,calc_var=True)
             else:
-                s0,l_vs0 = self.masked_mean(I1-I2,vmask,axis=1,calc_var=True)
-                
+                s0,l_vs0 = self.masked_mean(self.backend.bk_L1(I1*I2),vmask,axis=1,calc_var=True)
             vs0=self.backend.bk_concat([l_vs0,l_vs0],1)
             s0=self.backend.bk_concat([s0,l_vs0],1)
 
@@ -2012,7 +2011,7 @@ class funct(FOC.FoCUS):
         
                 if cond_init_P1_dic:
                     # We fill P1_dic with P00 for normalisation of C01 and C11
-                    P1_dic[j3] = p00  # [Nbatch, Nmask, Norient3]
+                    P1_dic[j3] = self.backend.bk_real(p00)  # [Nbatch, Nmask, Norient3]
 
                 # We store P00_auto to return it [Nbatch, Nmask, NP00, Norient3]
                 if return_data:
@@ -2087,8 +2086,8 @@ class funct(FOC.FoCUS):
                             p1 = self.masked_mean(M1_square, vmask, axis=1,rank=j3)  # [Nbatch, Nmask, Norient3]
                             p2 = self.masked_mean(M2_square, vmask, axis=1,rank=j3)  # [Nbatch, Nmask, Norient3]
                     # We fill P1_dic with P00 for normalisation of C01 and C11
-                    P1_dic[j3] = p1  # [Nbatch, Nmask, Norient3]
-                    P2_dic[j3] = p2  # [Nbatch, Nmask, Norient3]
+                    P1_dic[j3] = self.backend.bk_real(p1)  # [Nbatch, Nmask, Norient3]
+                    P2_dic[j3] = self.backend.bk_real(p2)  # [Nbatch, Nmask, Norient3]
 
                 ### P00_cross = < (I1 * Psi_j3) (I2 * Psi_j3)^* >_pix
                 # z_1 x z_2^* = (a1a2 + b1b2) + i(b1a2 - a1b2)

{foscat-3.1.4 → foscat-3.1.6}/src/foscat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.1.4
+Version: 3.1.6
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Home-page: https://github.com/jmdelouis/FOSCAT
 Author: Jean-Marc DELOUIS
@@ -9,6 +9,12 @@ Maintainer: Theo Foulquier
 Maintainer-email: theo.foulquier@ifremer.fr
 License: MIT
 Keywords: Scattering transform,Component separation,denoising
+Requires-Dist: imageio
+Requires-Dist: imagecodecs
+Requires-Dist: matplotlib
+Requires-Dist: numpy
+Requires-Dist: tensorflow
+Requires-Dist: healpy
 
 Utilize the Cross Scattering Transform (described in https://arxiv.org/abs/2207.12527) to synthesize Healpix or 2D data that is suitable for component separation purposes, such as denoising. 
  A demo package for this process can be found at https://github.com/jmdelouis/FOSCAT_DEMO.