foscat 3.0.21__tar.gz → 3.0.23__tar.gz

{foscat-3.0.21 → foscat-3.0.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.21
+Version: 3.0.23
 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.0.21 → foscat-3.0.23}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='foscat',
-    version='3.0.21',
+    version='3.0.23',
     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.0.21 → foscat-3.0.23}/src/foscat/CNN.py

@@ -90,7 +90,6 @@ class CNN:
         im=self.scat_operator.backend.bk_relu(im)
         
         for k in range(self.nscale):
-            print(im.shape)
             ww=self.scat_operator.backend.bk_reshape(x[nn:nn+self.KERNELSZ*self.KERNELSZ*self.chanlist[k]*self.chanlist[k+1]],
                                                 [self.KERNELSZ*self.KERNELSZ,self.chanlist[k],self.chanlist[k+1]])
             nn=nn+self.KERNELSZ*self.KERNELSZ*self.chanlist[k]*self.chanlist[k+1]

{foscat-3.0.21 → foscat-3.0.23}/src/foscat/FoCUS.py

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

{foscat-3.0.21 → foscat-3.0.23}/src/foscat/scat_cov.py

@@ -835,7 +835,7 @@ class scat_cov:
                             for i4 in range(tmp.shape[4]):
                                 dtmp=tmp[i0,i1,j1==i2,i3,i4]
                                 if norm:
-                                    dtmp=dtmp/ntmp[i0,i1,i2,i3]
+                                    dtmp=dtmp/(ntmp[i0,i1,i2,i3]*ntmp[i0,i1,j2[j1==i2],i3])
                                 if j2[j1==i2].shape[0]==1:
                                     ax1.plot(j2[j1==i2]+n,dtmp,'.', \
                                                  color=color, lw=lw)
@@ -859,7 +859,7 @@ class scat_cov:
                         for i3 in range(tmp.shape[3]):
                             dtmp=tmp[i0,i1,j1==i2,i3]
                             if norm:
-                                dtmp=dtmp/ntmp[i0,i1,i2]
+                                dtmp=dtmp/(ntmp[i0,i1,i2]*ntmp[i0,i1,j2[j1==i2]])
                             if j2[j1==i2].shape[0]==1:
                                 ax1.plot(j2[j1==i2]+n,dtmp,'.', \
                                          color=color, lw=lw)
@@ -914,7 +914,7 @@ class scat_cov:
         tabnx=[]
         tab2x=[]
         tab2nx=[]
-        ntmp=ntmp*ntmp
+        ntmp=ntmp
         if len(tmp.shape)>4:
             for i0 in range(tmp.shape[0]):
                 for i1 in range(tmp.shape[1]):
@@ -927,7 +927,7 @@ class scat_cov:
                                     for i5 in range(tmp.shape[5]):
                                         dtmp=tmp[i0,i1,idx,i3,i4,i5]
                                         if norm:
-                                            dtmp=dtmp/ntmp[i0,i1,i2,i3]
+                                            dtmp=dtmp/(ntmp[i0,i1,i2,i3]*ntmp[i0,i1,i2b,i3])
                                         if len(idx)==1:
                                             ax1.plot(np.arange(len(idx))+n,dtmp,'.', \
                                                      color=color, lw=lw)
@@ -954,7 +954,7 @@ class scat_cov:
                             for i3 in range(tmp.shape[3]):
                                 dtmp=tmp[i0,i1,idx,i3]
                                 if norm:
-                                    dtmp=dtmp/ntmp[i0,i1,i2]
+                                    dtmp=dtmp/(ntmp[i0,i1,i2]*ntmp[i0,i1,i2b])
                                 if len(idx)==1:
                                     ax1.plot(np.arange(len(idx))+n,dtmp,'.', \
                                              color=color, lw=lw)

{foscat-3.0.21 → foscat-3.0.23}/src/foscat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.21
+Version: 3.0.23
 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.