foscat 3.1.3__tar.gz → 3.1.5__tar.gz

{foscat-3.1.3 → foscat-3.1.5}/PKG-INFO

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

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

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

{foscat-3.1.3 → foscat-3.1.5}/src/foscat/scat_cov.py

@@ -1958,16 +1958,12 @@ 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(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)
 
         #### COMPUTE S1, P00, C01 and C11
         nside_j3 = nside  # NSIDE start (nside_j3 = nside / 2^j3)

{foscat-3.1.3 → foscat-3.1.5}/src/foscat.egg-info/PKG-INFO

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