foscat 3.1.2__py3-none-any.whl → 3.1.4__py3-none-any.whl

foscat/FoCUS.py

@@ -33,7 +33,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.1.2'
+        self.__version__ = '3.1.4'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None
@@ -1627,7 +1627,7 @@ class FoCUS:
 
     def diff_data(self,x,y,is_complex=True,sigma=None):
         if sigma is None:
-            if is_complex:
+            if self.backend.bk_is_complex(x):
                 r=self.backend.bk_square(self.backend.bk_real(x)-self.backend.bk_real(y))
                 i=self.backend.bk_square(self.backend.bk_imag(x)-self.backend.bk_imag(y))
                 return self.backend.bk_reduce_sum(r+i)
@@ -1635,7 +1635,7 @@ class FoCUS:
                 r=self.backend.bk_square(x-y)
                 return self.backend.bk_reduce_sum(r)
         else:
-            if is_complex:
+            if self.backend.bk_is_complex(x):
                 r=self.backend.bk_square((self.backend.bk_real(x)-self.backend.bk_real(y))/sigma)
                 i=self.backend.bk_square((self.backend.bk_imag(x)-self.backend.bk_imag(y))/sigma)
                 return self.backend.bk_reduce_sum(r+i)

foscat/backend.py

@@ -407,14 +407,17 @@ class foscat_backend:
     def bk_L1(self,x):
         if x.dtype==self.all_cbk_type:
             xr=self.bk_real(x)
-            xi=self.bk_imag(x)
+            #xi=self.bk_imag(x)
                 
             r=self.backend.sign(xr)*self.backend.sqrt(self.backend.sign(xr)*xr)
-            i=self.backend.sign(xi)*self.backend.sqrt(self.backend.sign(xi)*xi)
+            return r
+            #i=self.backend.sign(xi)*self.backend.sqrt(self.backend.sign(xi)*xi)
+            """
             if self.BACKEND==self.TORCH:
                 return r
             else:
                 return self.bk_complex(r,i)
+            """
         else:
             return self.backend.sign(x)*self.backend.sqrt(self.backend.sign(x)*x)
         

foscat/scat_cov.py

@@ -1958,16 +1958,13 @@ class funct(FOC.FoCUS):
         if return_data:
             s0=I1
         else:
-            if calc_var:
-                if not cross:
-                    s0,vs0 = self.masked_mean(I1,vmask,axis=1,calc_var=True)
-                else:
-                    s0,vs0 = self.masked_mean(I1-I2,vmask,axis=1,calc_var=True)
+            if not cross:
+                s0,l_vs0 = self.masked_mean(I1,vmask,axis=1,calc_var=True)
             else:
-                if not cross:
-                    s0 = self.masked_mean(I1,vmask,axis=1)
-                else:
-                    s0 = self.masked_mean(I1-I2,vmask,axis=1)
+                s0,l_vs0 = self.masked_mean(I1-I2,vmask,axis=1,calc_var=True)
+                
+            vs0=self.backend.bk_concat([l_vs0,l_vs0],1)
+            s0=self.backend.bk_concat([s0,l_vs0],1)
 
         #### COMPUTE S1, P00, C01 and C11
         nside_j3 = nside  # NSIDE start (nside_j3 = nside / 2^j3)
@@ -2257,7 +2254,7 @@ class funct(FOC.FoCUS):
                         if C01 is None:
                             C01 = self.backend.bk_expand_dims(c01,off_C01) # Add a dimension for NC01
                             if calc_var:
-                                VC01 = vself.backend.bk_expand_dims(vc01,off_C01) # Add a dimension for NC01
+                                VC01 = self.backend.bk_expand_dims(vc01,off_C01) # Add a dimension for NC01
                         else:
                             C01 = self.backend.bk_concat([C01, self.backend.bk_expand_dims(c01,off_C01)],axis=2)  # Add a dimension for NC01
                             if calc_var:

{foscat-3.1.2.dist-info → foscat-3.1.4.dist-info}/METADATA

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

{foscat-3.1.2.dist-info → foscat-3.1.4.dist-info}/RECORD

@@ -1,26 +1,26 @@
 foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=MuzYq3nqmo9Y_0mYw-o43oE92g6N6WLW-o8PoUdslC0,86950
+foscat/FoCUS.py,sha256=vzp-sJlt4o0uspFqvGqD0LdI2MnNNV0BFQq76eqEfRo,86988
 foscat/GCNN.py,sha256=qyKJpv238rwXPIMRRw4opHKaS6JaDtpC63QNncydeD0,6706
 foscat/GetGPUinfo.py,sha256=c01MFYCk38niYCTp0vX3WP24zVDHIsex-Cu42hc9Q18,724
 foscat/Softmax.py,sha256=UDc8Kbl0qWfH1bqDDwfLnkxhON7p93ueZ-Qg2oY4Ke4,2874
 foscat/Spline1D.py,sha256=9oeM8SSHjpfUE5z72YxGt1RVt22vJYM1zhHbNBW8phw,1232
 foscat/Synthesis.py,sha256=aqV_3Npcl2RQj-wxQ0hDMCo650lrN6YRaMd0fAoCrQ4,12615
 foscat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-foscat/backend.py,sha256=QHXqkeYkl7x4VxYNgIVZUPxyKwuQNiDLX7qDHghtKPw,33637
+foscat/backend.py,sha256=mIMVFNvGCXZeT8ocFOHf5Rcna0KTXGkYtyY6EpF1Coc,33692
 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=WYK3Cvgo4AvVFfLaE8daZP4N3QwLiVGB2QIj2GmfYVQ,2327
 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=1nvZIm1EfJubkwPN26NM1WnB-DDmw0EcF3dpvMwjc0o,119231
+foscat/scat_cov.py,sha256=KQ8rNsgaePPnrbY4GdFaHIwh40U5d4NnRulY7QJwnG0,119127
 foscat/scat_cov1D.old.py,sha256=KzvgMCwscgtfV2-Dd3YQoHbGly79WB-yU8o2vGyI_v0,60681
 foscat/scat_cov1D.py,sha256=6QiL4bPqTu2VvRXla7rL0dOpftSJC5FR7pl-guxusOE,536
 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.1.2.dist-info/METADATA,sha256=_BK582JqaSMt9tBgxKFxrzMirkLXCDmzMmwpENdRBYI,1012
-foscat-3.1.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foscat-3.1.2.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.1.2.dist-info/RECORD,,
+foscat-3.1.4.dist-info/METADATA,sha256=gCjcDVo7AtmckqZ0jCmF2XvzUsRISehRjqCYiV-Oa_I,1012
+foscat-3.1.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foscat-3.1.4.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.1.4.dist-info/RECORD,,