foscat 2025.3.0__tar.gz → 2025.5.0__tar.gz

{foscat-2025.3.0/src/foscat.egg-info → foscat-2025.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foscat
-Version: 2025.3.0
+Version: 2025.5.0
 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.3.0 → foscat-2025.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "foscat"
-version = "2025.03.0"
+version = "2025.05.0"
 description = "Generate synthetic Healpix or 2D data using Cross Scattering Transform"
 readme = "README.md"
 license = { text = "BSD-3-Clause" }

{foscat-2025.3.0 → foscat-2025.5.0}/src/foscat/BkBase.py

@@ -23,6 +23,15 @@ class BackendBase:
         self._fft_3_orient = {}
         self._fft_3_orient_C = {}
 
+    def to_dict(self):
+        return {
+            "name": self.BACKEND,
+            "mpi_rank": self.mpi_rank,
+            "all_type": self.all_type,
+            "gpupos": self.gpupos,
+            "silent": self.silent,
+        }
+
     def iso_mean(self, x, use_2D=False):
         shape = list(x.shape)
 

{foscat-2025.3.0 → foscat-2025.5.0}/src/foscat/FoCUS.py

@@ -35,7 +35,7 @@ class FoCUS:
         mpi_rank=0,
     ):
 
-        self.__version__ = "2025.03.0"
+        self.__version__ = "2025.05.0"
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION = TMPFILE_VERSION
         self.P1_dic = None

{foscat-2025.3.0 → foscat-2025.5.0}/src/foscat/scat_cov.py

@@ -3037,12 +3037,13 @@ class funct(FOC.FoCUS):
                         )
                     S2[j3] = s2
                 else:
-                    ### Normalize S2_cross
-                    if norm == "auto":
-                        s2 /= (P1_dic[j3] * P2_dic[j3]) ** 0.5
 
                     ### Store S2_cross as complex [Nbatch, Nmask, NS2, Norient3]
                     s2 = self.backend.bk_real(s2)
+                    
+                    ### Normalize S2_cross
+                    if norm == "auto":
+                        s2 /= (P1_dic[j3] * P2_dic[j3]) ** 0.5
 
                     S2.append(
                         self.backend.bk_expand_dims(s2, off_S2)
@@ -6045,13 +6046,12 @@ class funct(FOC.FoCUS):
         image2=None,
         mask=None,
         norm=None,
-        Auto=True,
         cmat=None,
         cmat2=None,
     ):
 
         res = self.eval(
-            image1, image2=image2, mask=mask, Auto=Auto, cmat=cmat, cmat2=cmat2
+            image1, image2=image2, mask=mask, cmat=cmat, cmat2=cmat2
         )
         return res.S0, res.S2, res.S1, res.S3, res.S4, res.S3P
 
@@ -6061,12 +6061,11 @@ class funct(FOC.FoCUS):
         image2=None,
         mask=None,
         norm=None,
-        Auto=True,
         cmat=None,
         cmat2=None,
     ):
         s0, s2, s1, s3, s4, s3p = self.eval_comp_fast(
-            image1, image2=image2, mask=mask, Auto=Auto, cmat=cmat, cmat2=cmat2
+            image1, image2=image2, mask=mask,  cmat=cmat, cmat2=cmat2
         )
         return scat_cov(
             s0, s2, s3, s4, s1=s1, s3p=s3p, backend=self.backend, use_1D=self.use_1D
@@ -6102,6 +6101,15 @@ class funct(FOC.FoCUS):
         if edge:
             self.purge_edge_mask()
 
+        def The_loss_ref_image(u, scat_operator, args):
+            input_image = args[0]
+            mask = args[1]
+                
+            loss = 1E-3*scat_operator.backend.bk_reduce_mean(
+                scat_operator.backend.bk_square(mask*(input_image - u))
+            )
+            return loss
+            
         def The_loss(u, scat_operator, args):
             ref = args[0]
             sref = args[1]
@@ -6338,8 +6346,16 @@ class funct(FOC.FoCUS):
                 loss = synthe.Loss(
                     The_lossX, self, ref, sref, use_variance, l_ref[k], l_jmax[k]
                 )
-
-            sy = synthe.Synthesis([loss])
+                
+            if input_image is not None:
+                # define a loss to minimize
+                loss_input = synthe.Loss(The_loss_ref_image, self, 
+                    self.backend.bk_cast(l_input_image[k]), 
+                    self.backend.bk_cast(l_in_mask[k]))
+                
+                sy = synthe.Synthesis([loss]) #,loss_input])
+            else:
+                sy = synthe.Synthesis([loss])
 
             # initialize the synthesised map
             if self.use_2D:

{foscat-2025.3.0 → foscat-2025.5.0}/src/foscat/scat_cov_map.py

@@ -29,7 +29,6 @@ class funct(scat.funct):
         image2=None,
         mask=None,
         norm=None,
-        Auto=True,
         calc_var=False,
         out_nside=None,
     ):
@@ -38,7 +37,6 @@ class funct(scat.funct):
             image2=image2,
             mask=mask,
             norm=norm,
-            Auto=Auto,
             calc_var=calc_var,
             out_nside=out_nside,
         )

{foscat-2025.3.0 → foscat-2025.5.0/src/foscat.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foscat
-Version: 2025.3.0
+Version: 2025.5.0
 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>