foscat 3.0.43__py3-none-any.whl → 3.0.45__py3-none-any.whl

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/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.dist-info → foscat-3.0.45.dist-info}/METADATA

@@ -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.dist-info → foscat-3.0.45.dist-info}/RECORD

@@ -1,6 +1,6 @@
 foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=NJEtmH7ggBmyUzmwjowBXnm9b2qXM8lAoIhOlIuR-uA,76562
+foscat/FoCUS.py,sha256=CulqUr3i0RcmYhjiVNmXlPw3O45z7u09TyVlgjgppd8,76562
 foscat/GCNN.py,sha256=qyKJpv238rwXPIMRRw4opHKaS6JaDtpC63QNncydeD0,6706
 foscat/GetGPUinfo.py,sha256=c01MFYCk38niYCTp0vX3WP24zVDHIsex-Cu42hc9Q18,724
 foscat/Softmax.py,sha256=UDc8Kbl0qWfH1bqDDwfLnkxhON7p93ueZ-Qg2oY4Ke4,2874
@@ -14,12 +14,12 @@ foscat/loss_backend_torch.py,sha256=WYK3Cvgo4AvVFfLaE8daZP4N3QwLiVGB2QIj2GmfYVQ,
 foscat/scat.py,sha256=s132WtITyuvBZKLu7T2_qhnoA2xdT2h1ZufP-Awlb8w,61175
 foscat/scat1D.py,sha256=GalTfBmPVNy3wC2ddsckwE3KmgkSJS2sZyplKBi9ugM,45855
 foscat/scat2D.py,sha256=Xtisjc5KsbLQAlbn71P0Xg1UIu3r1gUKXoYG2vIMK1M,523
-foscat/scat_cov.py,sha256=zbsf9VDdqH5hnS8VfWd4wzdDaOF1-C_2xkYkxtu9Lt8,110925
+foscat/scat_cov.py,sha256=wwIl7aY15ITKe3eAmYEiucOeH5gEV5VSd9aDRntf0rI,110928
 foscat/scat_cov1D.py,sha256=1bhzaW-5Pcr1aEPOYIXiwu8KOy38JE0g_Y5PvFzGQs8,60599
 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.43.dist-info/METADATA,sha256=uVSoZ70Gjq-JPFRWe6BGatP9poVGhZJS9eA7kE1yW2Y,1013
-foscat-3.0.43.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foscat-3.0.43.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.43.dist-info/RECORD,,
+foscat-3.0.45.dist-info/METADATA,sha256=XaUtkifjXPdA8GeTW-W2g7rfyhjtftQfIM88xxh4O20,1013
+foscat-3.0.45.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foscat-3.0.45.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.0.45.dist-info/RECORD,,