foscat 3.1.2__tar.gz → 3.1.4__tar.gz

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

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

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

@@ -33,7 +33,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.1.2'
+        self.__version__ = '3.1.4'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None
@@ -1627,7 +1627,7 @@ class FoCUS:
 
     def diff_data(self,x,y,is_complex=True,sigma=None):
         if sigma is None:
-            if is_complex:
+            if self.backend.bk_is_complex(x):
                 r=self.backend.bk_square(self.backend.bk_real(x)-self.backend.bk_real(y))
                 i=self.backend.bk_square(self.backend.bk_imag(x)-self.backend.bk_imag(y))
                 return self.backend.bk_reduce_sum(r+i)
@@ -1635,7 +1635,7 @@ class FoCUS:
                 r=self.backend.bk_square(x-y)
                 return self.backend.bk_reduce_sum(r)
         else:
-            if is_complex:
+            if self.backend.bk_is_complex(x):
                 r=self.backend.bk_square((self.backend.bk_real(x)-self.backend.bk_real(y))/sigma)
                 i=self.backend.bk_square((self.backend.bk_imag(x)-self.backend.bk_imag(y))/sigma)
                 return self.backend.bk_reduce_sum(r+i)

{foscat-3.1.2 → foscat-3.1.4}/src/foscat/backend.py

@@ -407,14 +407,17 @@ class foscat_backend:
     def bk_L1(self,x):
         if x.dtype==self.all_cbk_type:
             xr=self.bk_real(x)
-            xi=self.bk_imag(x)
+            #xi=self.bk_imag(x)
                 
             r=self.backend.sign(xr)*self.backend.sqrt(self.backend.sign(xr)*xr)
-            i=self.backend.sign(xi)*self.backend.sqrt(self.backend.sign(xi)*xi)
+            return r
+            #i=self.backend.sign(xi)*self.backend.sqrt(self.backend.sign(xi)*xi)
+            """
             if self.BACKEND==self.TORCH:
                 return r
             else:
                 return self.bk_complex(r,i)
+            """
         else:
             return self.backend.sign(x)*self.backend.sqrt(self.backend.sign(x)*x)
         

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

@@ -1958,16 +1958,13 @@ class funct(FOC.FoCUS):
         if return_data:
             s0=I1
         else:
-            if calc_var:
-                if not cross:
-                    s0,vs0 = self.masked_mean(I1,vmask,axis=1,calc_var=True)
-                else:
-                    s0,vs0 = self.masked_mean(I1-I2,vmask,axis=1,calc_var=True)
+            if not cross:
+                s0,l_vs0 = self.masked_mean(I1,vmask,axis=1,calc_var=True)
             else:
-                if not cross:
-                    s0 = self.masked_mean(I1,vmask,axis=1)
-                else:
-                    s0 = self.masked_mean(I1-I2,vmask,axis=1)
+                s0,l_vs0 = self.masked_mean(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)
 
         #### COMPUTE S1, P00, C01 and C11
         nside_j3 = nside  # NSIDE start (nside_j3 = nside / 2^j3)
@@ -2257,7 +2254,7 @@ class funct(FOC.FoCUS):
                         if C01 is None:
                             C01 = self.backend.bk_expand_dims(c01,off_C01) # Add a dimension for NC01
                             if calc_var:
-                                VC01 = vself.backend.bk_expand_dims(vc01,off_C01) # Add a dimension for NC01
+                                VC01 = self.backend.bk_expand_dims(vc01,off_C01) # Add a dimension for NC01
                         else:
                             C01 = self.backend.bk_concat([C01, self.backend.bk_expand_dims(c01,off_C01)],axis=2)  # Add a dimension for NC01
                             if calc_var:

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

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