foscat 2025.7.1__tar.gz → 2025.7.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. {foscat-2025.7.1/src/foscat.egg-info → foscat-2025.7.2}/PKG-INFO +1 -1
  2. {foscat-2025.7.1 → foscat-2025.7.2}/pyproject.toml +1 -1
  3. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/FoCUS.py +10 -4
  4. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/HealSpline.py +7 -2
  5. {foscat-2025.7.1 → foscat-2025.7.2/src/foscat.egg-info}/PKG-INFO +1 -1
  6. {foscat-2025.7.1 → foscat-2025.7.2}/LICENSE +0 -0
  7. {foscat-2025.7.1 → foscat-2025.7.2}/README.md +0 -0
  8. {foscat-2025.7.1 → foscat-2025.7.2}/setup.cfg +0 -0
  9. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/BkBase.py +0 -0
  10. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/BkNumpy.py +0 -0
  11. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/BkTensorflow.py +0 -0
  12. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/BkTorch.py +0 -0
  13. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/CNN.py +0 -0
  14. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/CircSpline.py +0 -0
  15. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/GCNN.py +0 -0
  16. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/Softmax.py +0 -0
  17. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/Spline1D.py +0 -0
  18. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/Synthesis.py +0 -0
  19. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/__init__.py +0 -0
  20. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/alm.py +0 -0
  21. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/backend.py +0 -0
  22. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/backend_tens.py +0 -0
  23. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/heal_NN.py +0 -0
  24. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/loss_backend_tens.py +0 -0
  25. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/loss_backend_torch.py +0 -0
  26. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/scat.py +0 -0
  27. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/scat1D.py +0 -0
  28. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/scat2D.py +0 -0
  29. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/scat_cov.py +0 -0
  30. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/scat_cov1D.py +0 -0
  31. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/scat_cov2D.py +0 -0
  32. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/scat_cov_map.py +0 -0
  33. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat/scat_cov_map2D.py +0 -0
  34. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat.egg-info/SOURCES.txt +0 -0
  35. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat.egg-info/dependency_links.txt +0 -0
  36. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat.egg-info/requires.txt +0 -0
  37. {foscat-2025.7.1 → foscat-2025.7.2}/src/foscat.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: foscat
3
- Version: 2025.7.1
3
+ Version: 2025.7.2
4
4
  Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
5
5
  Author-email: Jean-Marc DELOUIS <jean.marc.delouis@ifremer.fr>
6
6
  Maintainer-email: Theo Foulquier <theo.foulquier@ifremer.fr>
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "foscat"
3
- version = "2025.07.1"
3
+ version = "2025.07.2"
4
4
  description = "Generate synthetic Healpix or 2D data using Cross Scattering Transform"
5
5
  readme = "README.md"
6
6
  license = { text = "BSD-3-Clause" }
@@ -35,7 +35,7 @@ class FoCUS:
35
35
  mpi_rank=0
36
36
  ):
37
37
 
38
- self.__version__ = "2025.07.1"
38
+ self.__version__ = "2025.07.2"
39
39
  # P00 coeff for normalization for scat_cov
40
40
  self.TMPFILE_VERSION = TMPFILE_VERSION
41
41
  self.P1_dic = None
@@ -1691,9 +1691,10 @@ class FoCUS:
1691
1691
  except:
1692
1692
  lcell_ids=self.to_numpy(cell_ids)
1693
1693
  idx_map[lcell_ids]=np.arange(lcell_ids.shape[0],dtype='int32')
1694
-
1694
+
1695
1695
  lidx=np.where(idx_map[tmp[:,1]%(12*nside**2)]!=-1)[0]
1696
1696
  orientation=tmp[lidx,1]//(12*nside**2)
1697
+ orientation2=tmp[lidx,0]//(12*nside**2)
1697
1698
  tmp=tmp[lidx]
1698
1699
  wr=wr[lidx]
1699
1700
  wi=wi[lidx]
@@ -1703,16 +1704,21 @@ class FoCUS:
1703
1704
  wi[lidx]=0.0
1704
1705
  tmp[lidx,0]=0
1705
1706
  tmp[:,1]+=orientation*lcell_ids.shape[0]
1707
+ tmp[:,0]+=orientation2*lcell_ids.shape[0]
1706
1708
 
1707
1709
  idx_map=-np.ones([12*nside**2],dtype='int32')
1708
1710
  idx_map[lcell_ids]=np.arange(cell_ids.shape[0],dtype='int32')
1709
- lidx=np.where(idx_map[tmp2[:,1]]!=-1)[0]
1711
+ lidx=np.where(idx_map[tmp2[:,1]%(12*nside**2)]!=-1)[0]
1712
+ i_id=tmp2[lidx,1]//(12*nside**2)
1713
+ i_id2=tmp2[lidx,0]//(12*nside**2)
1710
1714
  tmp2=tmp2[lidx]
1711
1715
  ws=ws[lidx]
1712
- tmp2=idx_map[tmp2]
1716
+ tmp2=idx_map[tmp2%(12*nside**2)]
1713
1717
  lidx=np.where(tmp2[:,0]==-1)[0]
1714
1718
  ws[lidx]=0.0
1715
1719
  tmp2[lidx,0]=0
1720
+ tmp2[:,1]+=i_id*lcell_ids.shape[0]
1721
+ tmp2[:,0]+=i_id2*lcell_ids.shape[0]
1716
1722
 
1717
1723
  else:
1718
1724
  tmp = indice
@@ -6,11 +6,14 @@ import healpy as hp
6
6
 
7
7
  class heal_spline:
8
8
  def __init__(
9
- self,
10
- level):
9
+ self,
10
+ level,
11
+ gamma=1,
12
+ ):
11
13
  nside=2**level
12
14
  self.nside_store=2**(level//2)
13
15
  self.spline_tree={}
16
+ self.gamma=gamma
14
17
 
15
18
  self.nside=nside
16
19
  #compute colatitude
@@ -79,6 +82,8 @@ class heal_spline:
79
82
 
80
83
  hit=np.bincount(all_idx.flatten(),weights=www.flatten())
81
84
  www[hit[all_idx]<threshold]=0.0
85
+ if self.gamma!=1:
86
+ www=www**self.gamma
82
87
  www=www/np.sum(www,0)[None,:]
83
88
  return www,all_idx,heal_idx
84
89
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: foscat
3
- Version: 2025.7.1
3
+ Version: 2025.7.2
4
4
  Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
5
5
  Author-email: Jean-Marc DELOUIS <jean.marc.delouis@ifremer.fr>
6
6
  Maintainer-email: Theo Foulquier <theo.foulquier@ifremer.fr>
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes