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

foscat/FoCUS.py

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

foscat/scat_cov.py

@@ -1961,8 +1961,7 @@ class funct(FOC.FoCUS):
             if not cross:
                 s0,l_vs0 = self.masked_mean(I1,vmask,axis=1,calc_var=True)
             else:
-                s0,l_vs0 = self.masked_mean(I1-I2,vmask,axis=1,calc_var=True)
-                
+                s0,l_vs0 = self.masked_mean(self.backend.bk_L1(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)
 
@@ -2012,7 +2011,7 @@ class funct(FOC.FoCUS):
         
                 if cond_init_P1_dic:
                     # We fill P1_dic with P00 for normalisation of C01 and C11
-                    P1_dic[j3] = p00  # [Nbatch, Nmask, Norient3]
+                    P1_dic[j3] = self.backend.bk_real(p00)  # [Nbatch, Nmask, Norient3]
 
                 # We store P00_auto to return it [Nbatch, Nmask, NP00, Norient3]
                 if return_data:
@@ -2087,8 +2086,8 @@ class funct(FOC.FoCUS):
                             p1 = self.masked_mean(M1_square, vmask, axis=1,rank=j3)  # [Nbatch, Nmask, Norient3]
                             p2 = self.masked_mean(M2_square, vmask, axis=1,rank=j3)  # [Nbatch, Nmask, Norient3]
                     # We fill P1_dic with P00 for normalisation of C01 and C11
-                    P1_dic[j3] = p1  # [Nbatch, Nmask, Norient3]
-                    P2_dic[j3] = p2  # [Nbatch, Nmask, Norient3]
+                    P1_dic[j3] = self.backend.bk_real(p1)  # [Nbatch, Nmask, Norient3]
+                    P2_dic[j3] = self.backend.bk_real(p2)  # [Nbatch, Nmask, Norient3]
 
                 ### P00_cross = < (I1 * Psi_j3) (I2 * Psi_j3)^* >_pix
                 # z_1 x z_2^* = (a1a2 + b1b2) + i(b1a2 - a1b2)

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

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

@@ -1,6 +1,6 @@
 foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=vzp-sJlt4o0uspFqvGqD0LdI2MnNNV0BFQq76eqEfRo,86988
+foscat/FoCUS.py,sha256=t1OAAPmk42gtMBnTFpK9RJFpfJjuchK34Ug_8ui5kgo,86988
 foscat/GCNN.py,sha256=qyKJpv238rwXPIMRRw4opHKaS6JaDtpC63QNncydeD0,6706
 foscat/GetGPUinfo.py,sha256=c01MFYCk38niYCTp0vX3WP24zVDHIsex-Cu42hc9Q18,724
 foscat/Softmax.py,sha256=UDc8Kbl0qWfH1bqDDwfLnkxhON7p93ueZ-Qg2oY4Ke4,2874
@@ -14,13 +14,13 @@ 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=KQ8rNsgaePPnrbY4GdFaHIwh40U5d4NnRulY7QJwnG0,119127
+foscat/scat_cov.py,sha256=75z7aS7kt6pSZ38RJXgDKzpjFiyZojZgUFZSmZRv0T8,119196
 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.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,,
+foscat-3.1.6.dist-info/METADATA,sha256=Co4_CPQb6Klz7l2BkAJ2jE3vvb0-KvGnEuAt401m-zw,1012
+foscat-3.1.6.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+foscat-3.1.6.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.1.6.dist-info/RECORD,,

{foscat-3.1.4.dist-info → foscat-3.1.6.dist-info}/WHEEL

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