foscat 3.0.18__py3-none-any.whl → 3.0.19__py3-none-any.whl

foscat/FoCUS.py

@@ -5,7 +5,7 @@ import foscat.backend as bk
 from scipy.interpolate import griddata
 
 
-TMPFILE_VERSION='V2_6'
+TMPFILE_VERSION='V3_0'
 
 class FoCUS:
     def __init__(self,
@@ -32,7 +32,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.0.18'
+        self.__version__ = '3.0.19'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None
@@ -872,7 +872,7 @@ class FoCUS:
         except:
             if self.use_2D==False:
                 if self.KERNELSZ*self.KERNELSZ>12*nside*nside:
-                    l_kernel=2*nside
+                    l_kernel=3
                     
                 aa=np.cos(np.arange(self.NORIENT)/self.NORIENT*np.pi).reshape(1,self.NORIENT)
                 bb=np.sin(np.arange(self.NORIENT)/self.NORIENT*np.pi).reshape(1,self.NORIENT)
@@ -890,14 +890,19 @@ class FoCUS:
                     lidx=np.arange(12*nside*nside)
 
                 pw=np.pi/4.0
-                pw2=1/2.0
-        
+                pw2=1/2
+                amp=1.0
+                
                 if l_kernel==5:
                     pw=np.pi/4.0
-                    pw2=1/2.0
+                    pw2=1/2.25
+                    amp=1.0/9.2038
+                    
                 elif l_kernel==3:
-                    pw=1.0
+                    pw=1.0/np.sqrt(2)
                     pw2=1.0
+                    amp=1/8.45
+                    
                 elif l_kernel==7:
                     pw=np.pi/4.0
                     pw2=1.0/3.0
@@ -920,7 +925,7 @@ class FoCUS:
                     w=np.exp(-pw2*delta[pidx]*(nside**2))
                     pidx=pidx[np.argsort(-w)[0:l_kernel**2]]
                     pidx=pidx[np.argsort(lidx[pidx])]
-                    
+
                     w=np.exp(-pw2*delta[pidx]*(nside**2))
                     iwav[k]=lidx[pidx]
                     wwav[k]=w
@@ -935,7 +940,7 @@ class FoCUS:
                     wav[k,:,:]=(np.cos(xx*aa+yy*bb)+complex(0.0,1.0)*np.sin(xx*aa+yy*bb))*np.expand_dims(w,-1)
     
                 wav=wav-np.expand_dims(np.mean(wav,1),1)
-                wav=wav/np.expand_dims(np.std(wav,1),1)
+                wav=amp*wav/np.expand_dims(np.std(wav,1),1)
                 wwav=wwav/np.expand_dims(np.sum(wwav,1),1)
                 
                 nk=l_kernel*l_kernel

foscat/scat.py

@@ -3,6 +3,7 @@ import numpy as np
 import pickle
 import foscat.backend as bk
 import healpy as hp
+import sys
   
 # Vérifier si TensorFlow est importé et défini
 tf_defined = 'tensorflow' in sys.modules

foscat/scat_cov.py

@@ -3,6 +3,7 @@ import numpy as np
 import foscat.backend as bk
 import pickle
 import healpy as hp
+import sys
 
 # Vérifier si TensorFlow est importé et défini
 tf_defined = 'tensorflow' in sys.modules

foscat/scat_cov1D.py

@@ -3,6 +3,7 @@ import numpy as np
 import foscat.backend as bk
 import pickle
 import matplotlib.pyplot as plt
+import sys
 
 
 # Vérifier si TensorFlow est importé et défini

{foscat-3.0.18.dist-info → foscat-3.0.19.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=NJ7N1PLIo-BcG3KxtmjQ7BoFj_t73jlDPlNM_JvVsNc,67181
+foscat/FoCUS.py,sha256=wcdbL47CQYFeWDAo547fN-XCWNV-z5pbKdVyA2NUyvI,67309
 foscat/GCNN.py,sha256=TEW81DGRM4WL7RzH50VKQ-_oHbl5i3iQKuhdkkgKEO8,3831
 foscat/GetGPUinfo.py,sha256=6sJWKO_OeiA0SoGQQdCT_h3D8rZtrv_4hpBc8H3nZls,731
 foscat/Softmax.py,sha256=aCghstI2fchd8FHsBUcmPR4FGlCH9DglS7XMEWlKr8A,2709
@@ -10,15 +10,15 @@ foscat/backend.py,sha256=BJkx5CRxUHZr8WH4rvApuE8dIo1Y61fbtyfYhGByIIk,30402
 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=Fj_W3VwGgeD79eQ4jOxOmhZ548UKDRUb3JjUo2-gSWM,1755
-foscat/scat.py,sha256=q7vc-0ZXvRCo7oOCP7BGtT7G8q3FLSadYmZqOx1snXU,59795
+foscat/scat.py,sha256=24prtAb4BUM0MMlX9xP9M01GZK4Bf9LNb01HBLWBcaU,59806
 foscat/scat1D.py,sha256=OkDAzo3JXnIu57op6NpH7NU1g7ItDD7kOLuVnOvfN7Y,43859
 foscat/scat2D.py,sha256=Xtisjc5KsbLQAlbn71P0Xg1UIu3r1gUKXoYG2vIMK1M,523
-foscat/scat_cov.py,sha256=SQLg0u09fusPwAMDWnUcSlYKMLf6YOHnMETXJPFTP5Y,107188
-foscat/scat_cov1D.py,sha256=exPpf6_8p0PXxpsdUmlU_GAKAmyoT9z4wjVOCa0yRRY,58582
+foscat/scat_cov.py,sha256=GvVrNmJxS-3hVeuuiFk8lBoGMRSDllo_yIsTJ7DqRcQ,107199
+foscat/scat_cov1D.py,sha256=8ORwsfDfAt5f_q_YfLy7Wx9wgyXtE_1IV2IlznTFs8g,58593
 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.18.dist-info/METADATA,sha256=YFoojIRbGT3XY-kw68cF-1XiQmhNOirq15MjDoJKbkI,1013
-foscat-3.0.18.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-foscat-3.0.18.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.18.dist-info/RECORD,,
+foscat-3.0.19.dist-info/METADATA,sha256=yCqEA5pgPx2dqnwrFUEdrTSp8fPmpwEQl3lvRAoD4vY,1013
+foscat-3.0.19.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+foscat-3.0.19.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.0.19.dist-info/RECORD,,