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

foscat/FoCUS.py

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

foscat/scat1D.py

@@ -39,31 +39,22 @@ class scat1D:
         return self.backend.bk_reshape(table,[table.shape[0],ndata])
         
     # ---------------------------------------------−---------
-    def flatten(self,S2L=False):
-        if not S2L:
-            if isinstance(self.P00,np.ndarray):
-                return np.concatenate([self.build_flat(lf.S0),
-                                       self.build_flat(lf.S1),
-                                       self.build_flat(lf.P00),
-                                       self.build_flat(lf.S2)],1)
-            else:
-                return self.backend.bk_concat([self.build_flat(self.S0),
-                                               self.build_flat(self.S1),
-                                               self.build_flat(self.P00),
-                                               self.build_flat(self.S2)],1)  
+    def flatten(self,S2L=True,P00=True):
+        tmp=[self.build_flat(self.S0),self.build_flat(self.S1)]
+        
+        if P00:
+            tmp=tmp+[self.build_flat(self.P00)]
+
+        tmp=tmp+[self.build_flat(self.S2)]
+        
+        if S2L:
+            tmp=tmp+[self.build_flat(self.S2L)]
+            
+        if isinstance(self.P00,np.ndarray):
+            return np.concatenate(tmp,1)
         else:
-            if isinstance(self.P00,np.ndarray):
-                return np.concatenate([self.build_flat(lf.S0),
-                                       self.build_flat(lf.S1),
-                                       self.build_flat(lf.P00),
-                                       self.build_flat(lf.S2),
-                                       self.build_flat(lf.S2L)],1)
-            else:
-                return self.backend.bk_concat([self.build_flat(self.S0),
-                                               self.build_flat(self.S1),
-                                               self.build_flat(self.P00),
-                                               self.build_flat(self.S2),
-                                               self.build_flat(self.S2L)],1)        
+            return self.backend.bk_concat(tmp,1)
+        
     def get_j_idx(self):
         return self.j1,self.j2
     

foscat/scat_cov1D.py

@@ -784,6 +784,34 @@ class scat_cov1D:
     def get_norient(self):
         return self.P00.shape[3]
 
+    # ---------------------------------------------−---------
+    def build_flat(self,table):
+        shape=table.shape
+        ndata=1
+        for k in range(1,len(table.shape)):
+            ndata=ndata*table.shape[k]
+        return self.backend.bk_reshape(table,[table.shape[0],ndata])
+    
+    # ---------------------------------------------−---------
+    def flatten(self,S2L=True,P00=True):
+        tmp=[self.build_flat(self.P00)]
+        
+        if self.S1 is not None:
+            tmp=[self.build_flat(self.S1)]
+            
+        tmp=[self.build_flat(self.C01)]
+        
+        if self.C10 is not None:
+            tmp=[self.build_flat(self.C10)]
+            
+        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 add_data_from_log_slope(self,y,n,ds=3):
         if len(y)<ds:
             if len(y)==1:
@@ -1027,7 +1055,7 @@ class funct(FOC.FoCUS):
         # determine jmax and nside corresponding to the input map
         im_shape = image1.shape
         
-        npix=im_shape[axis]
+        npix=im_shape[len(image1.shape)-1]
 
         J = int(np.log(npix) / np.log(2))  # Number of j scales
         Jmax = J - self.OSTEP  # Number of steps for the loop on scales

{foscat-3.0.25.dist-info → foscat-3.0.27.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 foscat/CNN.py,sha256=BVf-uD5K-_Tb_Q9xdckLF7PZq-Wcs6qexP9J2K8KCq0,4231
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=iN4hnwt2DUYhDZ9JgFFe_ElHVmeOUHIBV-35aASlM3k,67309
+foscat/FoCUS.py,sha256=8M8kNf1B1weit-Eze47QGwX3C6Q6Rg37UJX4mz74OFQ,67309
 foscat/GCNN.py,sha256=TEW81DGRM4WL7RzH50VKQ-_oHbl5i3iQKuhdkkgKEO8,3831
 foscat/GetGPUinfo.py,sha256=6sJWKO_OeiA0SoGQQdCT_h3D8rZtrv_4hpBc8H3nZls,731
 foscat/Softmax.py,sha256=UDc8Kbl0qWfH1bqDDwfLnkxhON7p93ueZ-Qg2oY4Ke4,2874
@@ -12,14 +12,14 @@ 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=7egOWL7GXcJEenl8r1DSdArpE1Yvywgo-vxHAQ1gMzY,46269
+foscat/scat1D.py,sha256=51QdkhKOuuvTr8VfFdGMR33DSM4gI72YYArDKh2O-g4,45283
 foscat/scat2D.py,sha256=Xtisjc5KsbLQAlbn71P0Xg1UIu3r1gUKXoYG2vIMK1M,523
 foscat/scat_cov.py,sha256=uST8ij9o1sJh2AKhFffxMUr0WFQX9vz3VK4LGfiSOlE,110188
-foscat/scat_cov1D.py,sha256=wh65aUkqvkwDKykPrl7ZUpB-nw1Jf2zVOvcM0jHWY_k,58898
+foscat/scat_cov1D.py,sha256=exfWe-sNh7ZTPvKALePeXe-sZzD-4HGYWlfecpWgYxs,59800
 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.25.dist-info/METADATA,sha256=SWGvgdVYdhR4gWNcoFTYto-f2kG8bMaV8uFwrQoQtmg,1013
-foscat-3.0.25.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foscat-3.0.25.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.25.dist-info/RECORD,,
+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.25.dist-info → foscat-3.0.27.dist-info}/WHEEL

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