foscat 2025.8.3__py3-none-any.whl → 2025.8.4__py3-none-any.whl

foscat/FoCUS.py

@@ -36,7 +36,7 @@ class FoCUS:
             mpi_rank=0
     ):
 
-        self.__version__ = "2025.08.3"
+        self.__version__ = "2025.08.4"
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION = TMPFILE_VERSION
         self.P1_dic = None
@@ -2380,9 +2380,11 @@ class FoCUS:
             res = v1 / vh
 
             oshape = [x.shape[0]] + [mask.shape[0]]
-            if len(x.shape)>1:
+            if len(x.shape) > 3:
                 oshape = oshape + list(x.shape[1:-2])
-
+            else:
+                oshape = oshape + [1]
+                
             if calc_var:
                 if self.backend.bk_is_complex(vtmp):
                     res2 = self.backend.bk_sqrt(

foscat/scat_cov.py

@@ -2763,34 +2763,6 @@ class funct(FOC.FoCUS):
 
                 nside = nside * 2
 
-            if self.KERNELSZ > 5 and not self.use_2D:
-                # if the kernel size is bigger than 3 increase the binning before smoothing
-                if self.use_2D:
-                    vmask = self.up_grade(
-                        vmask, I1.shape[-2] * 2, nouty=I1.shape[-1] * 2,axis=-2
-                    )
-                    I1 = self.up_grade(
-                        I1, I1.shape[-2] * 2, nouty=I1.shape[-1] * 2,axis=-2
-                    )
-                    if cross:
-                        I2 = self.up_grade(
-                            I2,
-                            I2.shape[-2] * 2,
-                            nouty=I2.shape[-1] * 2,axis=-2
-                        )
-                elif self.use_1D:
-                    vmask = self.up_grade(vmask, I1.shape[-1] * 2)
-                    I1 = self.up_grade(I1, I1.shape[-1] * 2)
-                    if cross:
-                        I2 = self.up_grade(I2, I2.shape[-1] * 2)
-                    nside = nside * 2
-                else:
-                    I1 = self.up_grade(I1, nside * 2)
-                    vmask = self.up_grade(vmask, nside * 2)
-                    if cross:
-                        I2 = self.up_grade(I2, nside * 2)
-                    nside = nside * 2
-
         # Normalize the masks because they have different pixel numbers
         # vmask /= self.backend.bk_reduce_sum(vmask, axis=1)[:, None]  # [Nmask, Npix]
 
@@ -4123,6 +4095,7 @@ class funct(FOC.FoCUS):
             get_variance=False,
             ref_sigma=None,
             iso_ang=False,
+            return_table=False,
     ):
         """
         Calculates the scattering correlations for a batch of images, including:
@@ -4257,7 +4230,7 @@ class funct(FOC.FoCUS):
                 )
                 print("\n\n==========")
             J = Jmax  # Number of steps for the loop on scales
-
+            
         L = self.NORIENT
         norm_factor_S3 = 1.0
 
@@ -4826,6 +4799,12 @@ class funct(FOC.FoCUS):
             if data2 is None:
                 if iso_ang:
                     if ref_sigma is not None:
+                        if return_table:
+                            return (S1_iso / ref_sigma["S1_sigma"]), \
+                                (S2_iso / ref_sigma["S2_sigma"]) , \
+                                (S3_iso / ref_sigma["S3_sigma"]) , \
+                                (S4_iso / ref_sigma["S4_sigma"]) 
+                        
                         for_synthesis = self.backend.backend.cat(
                             (
                                 mean_data / ref_sigma["std_data"],
@@ -4852,6 +4831,9 @@ class funct(FOC.FoCUS):
                             dim=-1,
                         )
                     else:
+                        if return_table:
+                            return S1_iso,S2_iso,S3_iso,S4_iso
+                        
                         for_synthesis = self.backend.backend.cat(
                             (
                                 mean_data / std_data,
@@ -4867,6 +4849,12 @@ class funct(FOC.FoCUS):
                         )
                 else:
                     if ref_sigma is not None:
+                        if return_table:
+                            return (S1 / ref_sigma["S1_sigma"]), \
+                                (S2 / ref_sigma["S2_sigma"]), \
+                                (S3 / ref_sigma["S3_sigma"]), \
+                                (S4 / ref_sigma["S4_sigma"])
+                        
                         for_synthesis = self.backend.backend.cat(
                             (
                                 mean_data / ref_sigma["std_data"],
@@ -4893,6 +4881,9 @@ class funct(FOC.FoCUS):
                             dim=-1,
                         )
                     else:
+                        if return_table:
+                            return S1,S2,S3,S4
+                        
                         for_synthesis = self.backend.backend.cat(
                             (
                                 mean_data / std_data,
@@ -4909,6 +4900,12 @@ class funct(FOC.FoCUS):
             else:
                 if iso_ang:
                     if ref_sigma is not None:
+                        if return_table:
+                            return (S1_iso / ref_sigma["S1_sigma"]), \
+                                (S2_iso / ref_sigma["S2_sigma"]), \
+                                (S3_iso / ref_sigma["S3_sigma"]), \
+                                (S4_iso / ref_sigma["S4_sigma"])
+                        
                         for_synthesis = self.backend.backend.cat(
                             (
                                 mean_data / ref_sigma["std_data"],
@@ -4937,6 +4934,9 @@ class funct(FOC.FoCUS):
                             dim=-1,
                         )
                     else:
+                        if return_table:
+                            return S1_iso,S2_iso,S3_iso,S4_iso
+                        
                         for_synthesis = self.backend.backend.cat(
                             (
                                 mean_data / std_data,
@@ -4954,6 +4954,12 @@ class funct(FOC.FoCUS):
                         )
                 else:
                     if ref_sigma is not None:
+                        if return_table:
+                            return (S1 / ref_sigma["S1_sigma"]), \
+                                (S2 / ref_sigma["S2_sigma"]), \
+                                (S3 / ref_sigma["S3_sigma"]), \
+                                (S4 / ref_sigma["S4_sigma"])
+                        
                         for_synthesis = self.backend.backend.cat(
                             (
                                 mean_data / ref_sigma["std_data"],
@@ -4982,6 +4988,9 @@ class funct(FOC.FoCUS):
                             dim=-1,
                         )
                     else:
+                        if return_table:
+                            return S1,S2,S3,S4
+                        
                         for_synthesis = self.backend.backend.cat(
                             (
                                 mean_data / std_data,
@@ -6684,6 +6693,9 @@ class funct(FOC.FoCUS):
                 grd_mask=l_grd_mask[k],
             )
 
+        if not self.use_2D:
+            self.clean_norm()
+            
         t2 = time.time()
         print("Total computation %.2fs" % (t2 - t1))
 

{foscat-2025.8.3.dist-info → foscat-2025.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foscat
-Version: 2025.8.3
+Version: 2025.8.4
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Author-email: Jean-Marc DELOUIS <jean.marc.delouis@ifremer.fr>
 Maintainer-email: Theo Foulquier <theo.foulquier@ifremer.fr>

{foscat-2025.8.3.dist-info → foscat-2025.8.4.dist-info}/RECORD

@@ -4,7 +4,7 @@ foscat/BkTensorflow.py,sha256=iIdLx6VTOfOEocfZBOGyizQn5geDLTfdWWAwDeQr9YA,20056
 foscat/BkTorch.py,sha256=fWkNTrgK1MkpkS-bNVmC0ihJY_WlPs98ndperSh63i8,19593
 foscat/CNN.py,sha256=4vky7jqTshL1aYLWsc-hQwf7gDjTVjL7I6HZiAsa6x4,5158
 foscat/CircSpline.py,sha256=CXi49FxF8ZoeZ17Ua8c1AZXe2B5ICEC9aCXb97atB3s,4028
-foscat/FoCUS.py,sha256=_PVSDd4W3surp_dolYUeo_kCd_7x8LohnosBPECvMRk,114643
+foscat/FoCUS.py,sha256=iXcj6qcYaiREEcozd4xHfr983CwWFxNxvGIqEJw-JMI,114717
 foscat/GCNN.py,sha256=q7yWHCMJpP7-m3WvR3OQnp5taeYWaMxIY2hQ6SIb9gs,4487
 foscat/HOrientedConvol.py,sha256=S4Ru4holHT0ux6oMttHrKrXtxF4kGeVvoWE8AQs-RhI,21619
 foscat/HealSpline.py,sha256=YRotJ1NQuXYFyFiM8fp6qkATIwRJ8lqIVo4vGXpHO-w,7472
@@ -22,13 +22,13 @@ foscat/loss_backend_torch.py,sha256=k3z18Dj3SaLKK6ZIKcm7GO4U_YKYVP6LtHG1aIbxkYk,
 foscat/scat.py,sha256=qGYiBIysPt65MdmF07WWA4piVlTfA9-lFDTaicnqC2w,72822
 foscat/scat1D.py,sha256=W5Uu6wdQ4ZsFKXpof0f1OBl-1wjJmW7ruvddRWxe7uM,53726
 foscat/scat2D.py,sha256=boKj0ASqMMSy7uQLK6hPniG87m3hZGJBYBiq5v8F9IQ,532
-foscat/scat_cov.py,sha256=ZJh-aZ_XgvOvsT8aeMgyp9q8bKnUf7hQtC9AGNW4GpI,270857
+foscat/scat_cov.py,sha256=QKPIjb5Tq00onp5uPX7qR6k5CoqUc_A1rrT3pDlnXyM,271522
 foscat/scat_cov1D.py,sha256=XOxsZZ5TYq8f34i2tUgIfzyaqaTDlICB3HzD2l_puro,531
 foscat/scat_cov2D.py,sha256=pAm0fKw8wyXram0TFbtw8tGcc8QPKuPXpQk0kh10r4U,7078
 foscat/scat_cov_map.py,sha256=9MzpwT2g9S3dmnjHEMK7PPLQ27oGQg2VFVsP_TDUU5E,2869
 foscat/scat_cov_map2D.py,sha256=zaIIYshXCqAeZ04I158GhD-Op4aoMlLnLEy7rxckVYY,2842
-foscat-2025.8.3.dist-info/licenses/LICENSE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
-foscat-2025.8.3.dist-info/METADATA,sha256=F6_v34qwWdIck5wGbKIKlrVs53dJo-SVITx8HpQf5AM,7215
-foscat-2025.8.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-foscat-2025.8.3.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-2025.8.3.dist-info/RECORD,,
+foscat-2025.8.4.dist-info/licenses/LICENSE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
+foscat-2025.8.4.dist-info/METADATA,sha256=ur8T9ywlSsVA5J7Bb1WwkwizQhwwaT1ncuEr4ofLYUw,7215
+foscat-2025.8.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+foscat-2025.8.4.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-2025.8.4.dist-info/RECORD,,