foscat 3.0.43__tar.gz → 3.0.45__tar.gz

{foscat-3.0.43 → foscat-3.0.45}/PKG-INFO

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

{foscat-3.0.43 → foscat-3.0.45}/setup.py

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

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

{foscat-3.0.43 → foscat-3.0.45}/src/foscat/scat_cov.py

@@ -77,22 +77,22 @@ class scat_cov:
         return val
     # ---------------------------------------------−---------
     def flatten(self):
-        tmp=[self.conv2complex(self.backend.bk_reshape(self.S0[0],[self.S0.shape[1]]))]
+        tmp=[self.conv2complex(self.backend.bk_reshape(self.S0,[self.S1.shape[0],self.S0.shape[1]]))]
         if self.S1 is not None:
-            tmp=tmp+[self.conv2complex(self.backend.bk_reshape(self.S1[0],
-                                        [self.S1.shape[1]*self.S1.shape[2]*self.S1.shape[3]]))]
-        tmp=tmp+[self.conv2complex(self.backend.bk_reshape(self.P00[0],
-                                        [self.S1.shape[1]*self.S1.shape[2]*self.S1.shape[3]])),
-                 self.conv2complex(self.backend.bk_reshape(self.C01[0],
-                                        [self.C01.shape[1]*self.C01.shape[2]*self.C01.shape[3]*self.C01.shape[4]]))]
+            tmp=tmp+[self.conv2complex(self.backend.bk_reshape(self.S1,
+                                        [self.S1.shape[0],self.S1.shape[1]*self.S1.shape[2]*self.S1.shape[3]]))]
+        tmp=tmp+[self.conv2complex(self.backend.bk_reshape(self.P00,
+                                        [self.S1.shape[0],self.S1.shape[1]*self.S1.shape[2]*self.S1.shape[3]])),
+                 self.conv2complex(self.backend.bk_reshape(self.C01,
+                                        [self.C01.shape[0],self.C01.shape[1]*self.C01.shape[2]*self.C01.shape[3]*self.C01.shape[4]]))]
         if self.C10 is not None:
-            tmp=tmp+[self.conv2complex(self.backend.bk_reshape(self.C10[0],
-                                        [self.C01.shape[1]*self.C01.shape[2]*self.C01.shape[3]*self.C01.shape[4]]))]
+            tmp=tmp+[self.conv2complex(self.backend.bk_reshape(self.C10,
+                                        [self.C01.shape[0],self.C01.shape[1]*self.C01.shape[2]*self.C01.shape[3]*self.C01.shape[4]]))]
         
-        tmp=tmp+[self.conv2complex(self.backend.bk_reshape(self.C11[0],
-                                        [self.C11.shape[1]*self.C11.shape[2]*self.C11.shape[3]*self.C11.shape[4]*self.C11.shape[5]]))]
+        tmp=tmp+[self.conv2complex(self.backend.bk_reshape(self.C11,
+                                        [self.C01.shape[0],self.C11.shape[1]*self.C11.shape[2]*self.C11.shape[3]*self.C11.shape[4]*self.C11.shape[5]]))]
         
-        return self.backend.bk_concat(tmp,0)
+        return self.backend.bk_concat(tmp,1)
 
     # ---------------------------------------------−---------
     def flattenMask(self):
@@ -1836,12 +1836,12 @@ class funct(FOC.FoCUS):
                 if not cross:
                     s0,vs0 = self.masked_mean(I1,vmask,axis=1,calc_var=True)
                 else:
-                    s0,vs0 = (self.masked_mean(I1,vmask,axis=1,calc_var=True)+self.masked_mean(I2,vmask,axis=1,calc_var=True))/2
+                    s0,vs0 = self.masked_mean(I1-I2,vmask,axis=1,calc_var=True)
             else:
                 if not cross:
                     s0 = self.masked_mean(I1,vmask,axis=1)
                 else:
-                    s0 = (self.masked_mean(I1,vmask,axis=1)+self.masked_mean(I2,vmask,axis=1))/2
+                    s0 = self.masked_mean(I1-I2,vmask,axis=1)
             
 
         #### COMPUTE S1, P00, C01 and C11

{foscat-3.0.43 → foscat-3.0.45}/src/foscat.egg-info/PKG-INFO

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