foscat 3.0.27__py3-none-any.whl → 3.0.29__py3-none-any.whl

foscat/FoCUS.py

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

foscat/backend.py

@@ -684,9 +684,21 @@ class foscat_backend:
                 
         if self.BACKEND==self.TENSORFLOW or self.BACKEND==self.TORCH:
             if axis is None:
-                return(self.backend.concat(data))
+                if data[0].dtype==self.all_cbk_type:
+                    ndata=len(data)
+                    xr=self.backend.concat([self.bk_real(data[k]) for k in range(ndata)])
+                    xi=self.backend.concat([self.bk_imag(data[k]) for k in range(ndata)])
+                    return self.backend.complex(xr,xi)
+                else:
+                    return(self.backend.concat(data))
             else:
-                return(self.backend.concat(data,axis=axis))
+                if data[0].dtype==self.all_cbk_type:
+                    ndata=len(data)
+                    xr=self.backend.concat([self.bk_real(data[k]) for k in range(ndata)],axis=axis)
+                    xi=self.backend.concat([self.bk_imag(data[k]) for k in range(ndata)],axis=axis)
+                    return self.backend.complex(xr,xi)
+                else:
+                    return(self.backend.concat(data,axis=axis))
         else:
             if axis is None:
                 return np.concatenate(data,axis=0)

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/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):
-        tmp=[self.build_flat(self.P00)]
+    def flatten(self):
+        tmp=[self.backend.bk_real(self.build_flat(self.P00))]
         
         if self.S1 is not None:
-            tmp=[self.build_flat(self.S1)]
+            tmp=tmp+[self.backend.bk_real(self.build_flat(self.S1))]
             
-        tmp=[self.build_flat(self.C01)]
+        tmp=tmp+[self.backend.bk_real(self.build_flat(self.C01))]
         
         if self.C10 is not None:
-            tmp=[self.build_flat(self.C10)]
+            tmp=tmp+[self.backend.bk_real(self.build_flat(self.C10))]
             
-        tmp=[self.build_flat(self.C11)]
-            
-        if isinstance(self.P00,np.ndarray):
+        tmp=tmp+[self.backend.bk_real(self.build_flat(self.C11))]
+        
+        if isinstance(self.C11,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.dist-info → foscat-3.0.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.27
+Version: 3.0.29
 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.dist-info → foscat-3.0.29.dist-info}/RECORD

@@ -1,25 +1,25 @@
 foscat/CNN.py,sha256=BVf-uD5K-_Tb_Q9xdckLF7PZq-Wcs6qexP9J2K8KCq0,4231
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=8M8kNf1B1weit-Eze47QGwX3C6Q6Rg37UJX4mz74OFQ,67309
+foscat/FoCUS.py,sha256=_hES8wvgaK3enLxOtY_wtqWOCntqmqIgfeD4olQWzMo,67309
 foscat/GCNN.py,sha256=TEW81DGRM4WL7RzH50VKQ-_oHbl5i3iQKuhdkkgKEO8,3831
 foscat/GetGPUinfo.py,sha256=6sJWKO_OeiA0SoGQQdCT_h3D8rZtrv_4hpBc8H3nZls,731
 foscat/Softmax.py,sha256=UDc8Kbl0qWfH1bqDDwfLnkxhON7p93ueZ-Qg2oY4Ke4,2874
 foscat/Spline1D.py,sha256=9oeM8SSHjpfUE5z72YxGt1RVt22vJYM1zhHbNBW8phw,1232
 foscat/Synthesis.py,sha256=oYtHFVTqalVzBQs5okJBnP4pzXFhBMds-pytdEm4Bqs,12611
 foscat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-foscat/backend.py,sha256=AZaMJSGoRGUSnjLKN8FF1tS16DmQZ70BjDl8zCDU9yg,30346
+foscat/backend.py,sha256=43Q-OtWlB-S14LH5IiUTxg9j_1WvOBZea3DkuEET7aY,31066
 foscat/backend_tens.py,sha256=zEFZ71j0nMNP9_91tz21ZVBTayr75l-sfONOLkJ8DyI,1432
 foscat/loss_backend_tens.py,sha256=WbGC4vy1pBg_bxUXnlCRiXX9WszN6MaUWUc_lUvZNvQ,1667
 foscat/loss_backend_torch.py,sha256=Fj_W3VwGgeD79eQ4jOxOmhZ548UKDRUb3JjUo2-gSWM,1755
 foscat/scat.py,sha256=Ht_xyo7XKJJrUIbQIeucjhIrJo4RGrE63EyhTH8IYig,60061
-foscat/scat1D.py,sha256=51QdkhKOuuvTr8VfFdGMR33DSM4gI72YYArDKh2O-g4,45283
+foscat/scat1D.py,sha256=fiGxyWSASGik9BimBKz_Z07jSPywJckLXaHDB_v5HHQ,45847
 foscat/scat2D.py,sha256=Xtisjc5KsbLQAlbn71P0Xg1UIu3r1gUKXoYG2vIMK1M,523
 foscat/scat_cov.py,sha256=uST8ij9o1sJh2AKhFffxMUr0WFQX9vz3VK4LGfiSOlE,110188
-foscat/scat_cov1D.py,sha256=exfWe-sNh7ZTPvKALePeXe-sZzD-4HGYWlfecpWgYxs,59800
+foscat/scat_cov1D.py,sha256=I2GgEo7ASkb7JW443SAp25tmI2Rvuy4xggW8WMHI-L4,60591
 foscat/scat_cov2D.py,sha256=8_XvC-lOEVUWP9vT3Wx10G_ATeVeh0SdrSWuBV7Xf5k,536
 foscat/scat_cov_map.py,sha256=ocU2xd41GtJhiU9S3dEv38KfPCvz0tJKY2f8lPxpm5c,2729
 foscat/scat_cov_map2D.py,sha256=t4llIt7DVIyU1b_u-dJSX4lBr2FhDict8RnNnHpRvHM,2754
-foscat-3.0.27.dist-info/METADATA,sha256=aHsc1a-XzzUp9vCFjG-4Meo3MioJAZos9VxZO3P7Lf8,1013
-foscat-3.0.27.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-foscat-3.0.27.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.27.dist-info/RECORD,,
+foscat-3.0.29.dist-info/METADATA,sha256=Jf-TaEYSTRi1dTpaa3rM9SwpOnAnh1B19VzWiJJfkzw,1013
+foscat-3.0.29.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foscat-3.0.29.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.0.29.dist-info/RECORD,,

{foscat-3.0.27.dist-info → foscat-3.0.29.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any