foscat 3.1.0__tar.gz → 3.1.1__tar.gz

{foscat-3.1.0 → foscat-3.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.1.0
+Version: 3.1.1
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Home-page: https://github.com/jmdelouis/FOSCAT
 Author: Jean-Marc DELOUIS

{foscat-3.1.0 → foscat-3.1.1}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='foscat',
-    version='3.1.0',
+    version='3.1.1',
     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.0 → foscat-3.1.1}/src/foscat/FoCUS.py

@@ -33,7 +33,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.1.0'
+        self.__version__ = '3.1.1'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None
@@ -251,11 +251,17 @@ class FoCUS:
             if KERNELSZ==5:
                 xx=np.arange(5)-2
                 w=np.exp(-0.25*(xx)**2)
-                c=np.cos((xx)*np.pi/2)
-                s=np.sin((xx)*np.pi/2)
-                
-                self.ww_RealT[1]=self.backend.constant(np.array(w*c).reshape(xx.shape[0],1,1))
-                self.ww_ImagT[1]=self.backend.constant(np.array(w*s).reshape(xx.shape[0],1,1))
+                c=w*np.cos((xx)*np.pi/2)
+                s=w*np.sin((xx)*np.pi/2)
+
+                w=w/np.sum(w)
+                c=c-np.mean(c)
+                s=s-np.mean(s)
+                r=np.sum(np.sqrt(c*c+s*s))
+                c=c/r
+                s=s/r
+                self.ww_RealT[1]=self.backend.constant(np.array(c).reshape(xx.shape[0],1,1))
+                self.ww_ImagT[1]=self.backend.constant(np.array(s).reshape(xx.shape[0],1,1))
                 self.ww_SmoothT[1] = self.backend.constant(np.array(w).reshape(xx.shape[0],1,1))
             
         else:

{foscat-3.1.0 → foscat-3.1.1}/src/foscat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.1.0
+Version: 3.1.1
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Home-page: https://github.com/jmdelouis/FOSCAT
 Author: Jean-Marc DELOUIS