foscat 3.1.3__py3-none-any.whl → 3.1.5__py3-none-any.whl

foscat/FoCUS.py

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

foscat/scat_cov.py

@@ -1958,16 +1958,12 @@ 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(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)
 
         #### COMPUTE S1, P00, C01 and C11
         nside_j3 = nside  # NSIDE start (nside_j3 = nside / 2^j3)

{foscat-3.1.3.dist-info → foscat-3.1.5.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=k1eQbNPEqnOkddd1Yun5prIhN_VB07bN9O-dx43k_68,86988
+foscat/FoCUS.py,sha256=7vHKstud04ZeVEDpE5TlNGgoU6Jr4WpSyO-I5chiqN0,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=I6WG6LRyPRhicH_mddTZpzDPmgiKv9_Dzc3auqpnAVY,119230
+foscat/scat_cov.py,sha256=1cnYxPqMRETZtSTbqWUbIbMHpiQLwW4E3YYSL1LdCyY,119130
 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.3.dist-info/METADATA,sha256=Zd_UGqYrPQkC8idPAA_x9g6W1olXc1QYYI488_qmY3A,1012
-foscat-3.1.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foscat-3.1.3.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.1.3.dist-info/RECORD,,
+foscat-3.1.5.dist-info/METADATA,sha256=FDjeYnvFnNQgEFY7UcuHQfZRGBxQ3C1iTmJC0f0qcJI,1012
+foscat-3.1.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foscat-3.1.5.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.1.5.dist-info/RECORD,,