foscat 3.1.0__py3-none-any.whl → 3.1.1__py3-none-any.whl

foscat/FoCUS.py

@@ -33,7 +33,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.1.0'
+        self.__version__ = '3.1.1'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None
@@ -251,11 +251,17 @@ class FoCUS:
             if KERNELSZ==5:
                 xx=np.arange(5)-2
                 w=np.exp(-0.25*(xx)**2)
-                c=np.cos((xx)*np.pi/2)
-                s=np.sin((xx)*np.pi/2)
-                
-                self.ww_RealT[1]=self.backend.constant(np.array(w*c).reshape(xx.shape[0],1,1))
-                self.ww_ImagT[1]=self.backend.constant(np.array(w*s).reshape(xx.shape[0],1,1))
+                c=w*np.cos((xx)*np.pi/2)
+                s=w*np.sin((xx)*np.pi/2)
+
+                w=w/np.sum(w)
+                c=c-np.mean(c)
+                s=s-np.mean(s)
+                r=np.sum(np.sqrt(c*c+s*s))
+                c=c/r
+                s=s/r
+                self.ww_RealT[1]=self.backend.constant(np.array(c).reshape(xx.shape[0],1,1))
+                self.ww_ImagT[1]=self.backend.constant(np.array(s).reshape(xx.shape[0],1,1))
                 self.ww_SmoothT[1] = self.backend.constant(np.array(w).reshape(xx.shape[0],1,1))
             
         else:

{foscat-3.1.0.dist-info → foscat-3.1.1.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=cKSpfr-nwZbehAp3fIQ4BBQsqCtLMKVAGrK6ZYopTPs,86787
+foscat/FoCUS.py,sha256=i0sweBn8DtGTXpM2gzBbo5lfK-fmV0wnnLIBcmlNbuo,86950
 foscat/GCNN.py,sha256=qyKJpv238rwXPIMRRw4opHKaS6JaDtpC63QNncydeD0,6706
 foscat/GetGPUinfo.py,sha256=c01MFYCk38niYCTp0vX3WP24zVDHIsex-Cu42hc9Q18,724
 foscat/Softmax.py,sha256=UDc8Kbl0qWfH1bqDDwfLnkxhON7p93ueZ-Qg2oY4Ke4,2874
@@ -20,7 +20,7 @@ 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.0.dist-info/METADATA,sha256=xpGRlp6l3B2yur40tp_o8aCZfyH4WBDcms9VDOA7JY4,1012
-foscat-3.1.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foscat-3.1.0.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.1.0.dist-info/RECORD,,
+foscat-3.1.1.dist-info/METADATA,sha256=X-3R0BLNa3lSishwOWAD3To8lXRA1BrBY8NM8v4T2-Q,1012
+foscat-3.1.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foscat-3.1.1.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.1.1.dist-info/RECORD,,