foscat 3.0.27__tar.gz → 3.0.28__tar.gz

{foscat-3.0.27 → foscat-3.0.28}/PKG-INFO

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

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

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

{foscat-3.0.27 → foscat-3.0.28}/src/foscat/scat1D.py

@@ -54,6 +54,25 @@ class scat1D:
             return np.concatenate(tmp,1)
         else:
             return self.backend.bk_concat(tmp,1)
+    # ---------------------------------------------−---------
+    def flatten_name(self,S2L=True,P00=True):
+        
+        tmp=['S0']
+
+        
+        tmp=tmp+['S1_%d'%(k) for k in range(self.S1.shape[-1])]
+        
+        if P00:
+            tmp=tmp+['P00_%d'%(k) for k in range(self.P00.shape[-1])]
+
+        j1,j2=self.get_j_idx()
+        
+        tmp=tmp+['S2_%d-%d'%(j1[k],j2[k]) for k in range(self.S2.shape[-1])]
+        
+        if S2L:
+            tmp=tmp+['S2L_%d-%d'%(j1[k],j2[k]) for k in range(self.S2.shape[-1])]
+            
+        return tmp
         
     def get_j_idx(self):
         return self.j1,self.j2

{foscat-3.0.27 → foscat-3.0.28}/src/foscat/scat_cov1D.py

@@ -793,23 +793,42 @@ class scat_cov1D:
         return self.backend.bk_reshape(table,[table.shape[0],ndata])
     
     # ---------------------------------------------−---------
-    def flatten(self,S2L=True,P00=True):
+    def flatten(self):
         tmp=[self.build_flat(self.P00)]
         
         if self.S1 is not None:
-            tmp=[self.build_flat(self.S1)]
+            tmp=tmp+[self.build_flat(self.S1)]
             
-        tmp=[self.build_flat(self.C01)]
+        tmp=tmp+[self.build_flat(self.C01)]
         
         if self.C10 is not None:
-            tmp=[self.build_flat(self.C10)]
+            tmp=tmp+[self.build_flat(self.C10)]
             
-        tmp=[self.build_flat(self.C11)]
+        tmp=tmp+[self.build_flat(self.C11)]
             
         if isinstance(self.P00,np.ndarray):
             return np.concatenate(tmp,1)
         else:
             return self.backend.bk_concat(tmp,1)
+        
+    # ---------------------------------------------−---------
+    def flatten_name(self):
+        tmp=['P00_%d'%(k) for k in range(self.P00.shape[-1])]
+        
+        if self.S1 is not None:
+            tmp=tmp+['S1_%d'%(k) for k in range(self.S1.shape[-1])]
+            
+        j1,j2=self.get_j_idx()
+        
+        tmp=tmp+['C01_%d-%d'%(j1[k],j2[k]) for k in range(self.C01.shape[-1])]
+        
+        if self.C10 is not None:
+            tmp=tmp+['C10_%d-%d'%(j1[k],j2[k]) for k in range(self.C10.shape[-1])]
+            
+        j1,j2,j3=self.get_jc11_idx()
+        tmp=tmp+['C11_%d-%d-%d'%(j1[k],j2[k],j3[k]) for k in range(self.C11.shape[-1])]
+
+        return tmp
 
         
     def add_data_from_log_slope(self,y,n,ds=3):

{foscat-3.0.27 → foscat-3.0.28}/src/foscat.egg-info/PKG-INFO

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