foscat 3.0.22__py3-none-any.whl → 3.0.23__py3-none-any.whl

foscat/FoCUS.py

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

foscat/scat_cov.py

@@ -835,7 +835,7 @@ class scat_cov:
                             for i4 in range(tmp.shape[4]):
                                 dtmp=tmp[i0,i1,j1==i2,i3,i4]
                                 if norm:
-                                    dtmp=dtmp/ntmp[i0,i1,i2,i3]
+                                    dtmp=dtmp/(ntmp[i0,i1,i2,i3]*ntmp[i0,i1,j2[j1==i2],i3])
                                 if j2[j1==i2].shape[0]==1:
                                     ax1.plot(j2[j1==i2]+n,dtmp,'.', \
                                                  color=color, lw=lw)
@@ -859,7 +859,7 @@ class scat_cov:
                         for i3 in range(tmp.shape[3]):
                             dtmp=tmp[i0,i1,j1==i2,i3]
                             if norm:
-                                dtmp=dtmp/ntmp[i0,i1,i2]
+                                dtmp=dtmp/(ntmp[i0,i1,i2]*ntmp[i0,i1,j2[j1==i2]])
                             if j2[j1==i2].shape[0]==1:
                                 ax1.plot(j2[j1==i2]+n,dtmp,'.', \
                                          color=color, lw=lw)
@@ -914,7 +914,7 @@ class scat_cov:
         tabnx=[]
         tab2x=[]
         tab2nx=[]
-        ntmp=ntmp*ntmp
+        ntmp=ntmp
         if len(tmp.shape)>4:
             for i0 in range(tmp.shape[0]):
                 for i1 in range(tmp.shape[1]):
@@ -927,7 +927,7 @@ class scat_cov:
                                     for i5 in range(tmp.shape[5]):
                                         dtmp=tmp[i0,i1,idx,i3,i4,i5]
                                         if norm:
-                                            dtmp=dtmp/ntmp[i0,i1,i2,i3]
+                                            dtmp=dtmp/(ntmp[i0,i1,i2,i3]*ntmp[i0,i1,i2b,i3])
                                         if len(idx)==1:
                                             ax1.plot(np.arange(len(idx))+n,dtmp,'.', \
                                                      color=color, lw=lw)
@@ -954,7 +954,7 @@ class scat_cov:
                             for i3 in range(tmp.shape[3]):
                                 dtmp=tmp[i0,i1,idx,i3]
                                 if norm:
-                                    dtmp=dtmp/ntmp[i0,i1,i2]
+                                    dtmp=dtmp/(ntmp[i0,i1,i2]*ntmp[i0,i1,i2b])
                                 if len(idx)==1:
                                     ax1.plot(np.arange(len(idx))+n,dtmp,'.', \
                                              color=color, lw=lw)

{foscat-3.0.22.dist-info → foscat-3.0.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.22
+Version: 3.0.23
 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.22.dist-info → foscat-3.0.23.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=DcEX8X3CY6lc3j1XYtNmP-zIOsuRg9ohkDVhRBr_Io0,67309
+foscat/FoCUS.py,sha256=zQ3X_iFWofiJnB54Gb4SCD8carkIykXqSrhMbfWDWoc,67309
 foscat/GCNN.py,sha256=TEW81DGRM4WL7RzH50VKQ-_oHbl5i3iQKuhdkkgKEO8,3831
 foscat/GetGPUinfo.py,sha256=6sJWKO_OeiA0SoGQQdCT_h3D8rZtrv_4hpBc8H3nZls,731
 foscat/Softmax.py,sha256=aCghstI2fchd8FHsBUcmPR4FGlCH9DglS7XMEWlKr8A,2709
@@ -14,12 +14,12 @@ foscat/loss_backend_torch.py,sha256=Fj_W3VwGgeD79eQ4jOxOmhZ548UKDRUb3JjUo2-gSWM,
 foscat/scat.py,sha256=Ht_xyo7XKJJrUIbQIeucjhIrJo4RGrE63EyhTH8IYig,60061
 foscat/scat1D.py,sha256=7egOWL7GXcJEenl8r1DSdArpE1Yvywgo-vxHAQ1gMzY,46269
 foscat/scat2D.py,sha256=Xtisjc5KsbLQAlbn71P0Xg1UIu3r1gUKXoYG2vIMK1M,523
-foscat/scat_cov.py,sha256=k_fx8aajqaBCAPmaABM1h9dg96j4QckUFvYaGG2vufQ,108007
+foscat/scat_cov.py,sha256=62FqSBnU_Gow6YCwqJpQti6AyDOXqCICMLlqQIe9BLA,108094
 foscat/scat_cov1D.py,sha256=inAy_TWtUwJr6l9hX3u7r2Jud7DGy_CkjCfcjaUIdJI,58885
 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.22.dist-info/METADATA,sha256=ZCArmUPZoiAWE1AqaS3Eb_FDrcVoixDvK7VZfnAS_Gg,1013
-foscat-3.0.22.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foscat-3.0.22.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.22.dist-info/RECORD,,
+foscat-3.0.23.dist-info/METADATA,sha256=JnSj9sqewiygAjaD3RT_X6ju_0EF8g3G-lQ_HQMrGms,1013
+foscat-3.0.23.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+foscat-3.0.23.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.0.23.dist-info/RECORD,,

{foscat-3.0.22.dist-info → foscat-3.0.23.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