foscat 2025.9.4__py3-none-any.whl → 2025.9.5__py3-none-any.whl

foscat/FoCUS.py

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

foscat/Plot.py

@@ -1065,28 +1065,69 @@ def _spectrum_polar_to_cartesian_core(
     valid = np.isfinite(radial_index)
     try:
         from scipy.ndimage import map_coordinates
-        order = 3 if method.lower() == "bicubic" else 1
-        coords = np.vstack([radial_index.ravel(), angular_index.ravel()])
-        eps = 1e-6
-        coords[0, :] = np.where(np.isfinite(coords[0, :]),
-                                np.clip(coords[0, :], 0.0+eps, (ns-1)-eps), 0.0)
-        sampled = map_coordinates(
-            w, coords, order=order, mode="wrap", cval=fill_value, prefilter=True
-        ).reshape(n_pixels, n_pixels)
-        img = np.where(valid, sampled, fill_value)
+
+        if method.lower() == "bicubic":
+            # ===== Bicubic with circular angular wrap =====
+            # Pad the angular axis by K columns on both sides so that the cubic kernel
+            # has valid neighbors across the 0°/360° seam. K=2 is enough for a cubic kernel.
+            K = 2
+            # w has shape (Nscale, Norient)
+            w_pad = np.concatenate([w[:, -K:], w, w[:, :K]], axis=1)  # (ns, no+2K)
+
+            # Build coordinates for map_coordinates on the padded array:
+            # - radial index stays the same, clipped to [0, ns-1] (no wrap)
+            # - angular index is shifted by +K and wrapped into [0, no) before querying
+            order = 3
+            coords = np.vstack([radial_index.ravel(), angular_index.ravel()])
+
+            # clip the radial coordinate to the valid [eps, ns-1-eps] band
+            eps = 1e-6
+            coords[0, :] = np.where(
+                np.isfinite(coords[0, :]),
+                np.clip(coords[0, :], 0.0 + eps, (ns - 1) - eps),
+                0.0,
+            )
+
+            # wrap angular coordinate to [0, no) then shift by +K to address the padded array
+            ang = np.mod(coords[1, :], float(no)) + K  # [K, no+K)
+            coords[1, :] = ang
+
+            # Now sample the padded array; 'nearest' mode is fine thanks to explicit padding
+            sampled = map_coordinates(
+                w_pad, coords, order=order, mode="nearest", cval=fill_value, prefilter=True
+            ).reshape(n_pixels, n_pixels)
+
+            img = np.where(valid, sampled, fill_value)
+
+        else:
+            # ===== Bilinear (or other) without special padding =====
+            order = 1
+            coords = np.vstack([radial_index.ravel(), angular_index.ravel()])
+            eps = 1e-6
+            coords[0, :] = np.where(
+                np.isfinite(coords[0, :]),
+                np.clip(coords[0, :], 0.0 + eps, (ns - 1) - eps),
+                0.0,
+            )
+            # For non-bicubic, SciPy's mode="wrap" is sufficient on the angular axis
+            sampled = map_coordinates(
+                w, coords, order=order, mode="wrap", cval=fill_value, prefilter=True
+            ).reshape(n_pixels, n_pixels)
+            img = np.where(valid, sampled, fill_value)
+
     except Exception:
-        # bilinear fallback
+        # ---- Vectorized bilinear fallback with explicit angular wrap ----
         r_idx = np.floor(radial_index).astype(np.int64)
         t_idx = np.floor(angular_index).astype(np.int64)
-        r_idx = np.clip(r_idx, 0, ns-2)
+        r_idx = np.clip(r_idx, 0, ns - 2)
         t0 = np.mod(t_idx, no)
-        t1 = np.mod(t_idx+1, no)
+        t1 = np.mod(t_idx + 1, no)
         tr = np.clip(radial_index - r_idx, 0.0, 1.0)
         ta = np.clip(angular_index - t_idx, 0.0, 1.0)
         f00 = w[r_idx,     t0]
         f01 = w[r_idx,     t1]
-        f10 = w[r_idx+1,   t0]
-        f11 = w[r_idx+1,   t1]
+        f10 = w[r_idx + 1, t0]
+        f11 = w[r_idx + 1, t1]
         g0 = (1.0 - ta) * f00 + ta * f01
         g1 = (1.0 - ta) * f10 + ta * f11
         img = (1.0 - tr) * g0 + tr * g1

{foscat-2025.9.4.dist-info → foscat-2025.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foscat
-Version: 2025.9.4
+Version: 2025.9.5
 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.9.4.dist-info → foscat-2025.9.5.dist-info}/RECORD

@@ -4,12 +4,12 @@ foscat/BkTensorflow.py,sha256=iIdLx6VTOfOEocfZBOGyizQn5geDLTfdWWAwDeQr9YA,20056
 foscat/BkTorch.py,sha256=W3n3XkFw9oecmyfSWt2JbP5L5eKWn8AAu0RZx1yLQb0,31975
 foscat/CNN.py,sha256=4vky7jqTshL1aYLWsc-hQwf7gDjTVjL7I6HZiAsa6x4,5158
 foscat/CircSpline.py,sha256=CXi49FxF8ZoeZ17Ua8c1AZXe2B5ICEC9aCXb97atB3s,4028
-foscat/FoCUS.py,sha256=DFPzRMRHE7eUfXfqoqHiM0f4mAiOs_6GmUieipXplo4,105645
+foscat/FoCUS.py,sha256=uK9ehVEOG2EeIwztCrH2B7oE0uV9C6tOwnLs4RpuMHk,105645
 foscat/GCNN.py,sha256=q7yWHCMJpP7-m3WvR3OQnp5taeYWaMxIY2hQ6SIb9gs,4487
 foscat/HOrientedConvol.py,sha256=xMaS-zzoUyXisBCPsHBVpn54tuA9Qv3na-tT86Cwn7U,38744
 foscat/HealBili.py,sha256=YRPk9PO5G8NdwKeb33xiJs3_pMPAgIv5phCs8GT6LN0,12943
 foscat/HealSpline.py,sha256=YRotJ1NQuXYFyFiM8fp6qkATIwRJ8lqIVo4vGXpHO-w,7472
-foscat/Plot.py,sha256=a_NKE91F82qBeLNL3gy0qE06GCL-JbHgeIQ2iwIRPjY,47326
+foscat/Plot.py,sha256=IM4kHzOvaVDwKkfCy6NePPNq6lGBsMr5oXhrRsiMJHw,49144
 foscat/Softmax.py,sha256=UDZGrTroYtmGEyokGUVpwNO_cgbICi9QVuRr8Yx52_k,2917
 foscat/SphericalStencil.py,sha256=DFipxQWupYPBa_62CkuMe9K7HkLFiHteF7Q6lAs3TLQ,56714
 foscat/Spline1D.py,sha256=rKzzenduaZZ-yBDJd35it6Gyrj1spqb7hoIaUgISPzY,2983
@@ -31,8 +31,8 @@ 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.9.4.dist-info/licenses/LICENSE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
-foscat-2025.9.4.dist-info/METADATA,sha256=MznoPNHG--ttgyql7lKM2YZrrYz3AiHLag3yn2C04iM,7215
-foscat-2025.9.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-foscat-2025.9.4.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-2025.9.4.dist-info/RECORD,,
+foscat-2025.9.5.dist-info/licenses/LICENSE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
+foscat-2025.9.5.dist-info/METADATA,sha256=SPqwTwuI7oY7UydSzlwdTUbWEjE3R2OeeU5UgmgLejs,7215
+foscat-2025.9.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+foscat-2025.9.5.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-2025.9.5.dist-info/RECORD,,