foscat 3.0.18__tar.gz → 3.0.19__tar.gz

{foscat-3.0.18 → foscat-3.0.19}/PKG-INFO

@@ -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 → foscat-3.0.19}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='foscat',
-    version='3.0.18',
+    version='3.0.19',
     description='Generate synthetic Healpix or 2D data using Cross Scattering Transform' ,
     long_description='Utilize the Cross Scattering Transform (described in https://arxiv.org/abs/2207.12527) to synthesize Healpix or 2D data that is suitable for component separation purposes, such as denoising. \n A demo package for this process can be found at https://github.com/jmdelouis/FOSCAT_DEMO. \n Complete doc can be found at https://foscat-documentation.readthedocs.io/en/latest/index.html. \n\n List of developers : J.-M. Delouis, T. Foulquier, L. Mousset, T. Odaka, F. Paul, E. Allys ' ,
     license='MIT',

{foscat-3.0.18 → foscat-3.0.19}/src/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-3.0.18 → foscat-3.0.19}/src/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-3.0.18 → foscat-3.0.19}/src/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-3.0.18 → foscat-3.0.19}/src/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 → foscat-3.0.19}/src/foscat.egg-info/PKG-INFO

@@ -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