Merge pull request #1135 from ToFuProject/devel

Prepare 1.8.17

Author: Didou09

.github/workflows/test-complete-matrix.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest] 
+        os: [ubuntu-latest, macOS-latest]    # , windows-latest
         python-version: ['3.8', '3.9', '3.10', '3.11']
         exclude:
           - python-version: ['3.11']

requirements.txt

@@ -13,6 +13,6 @@ Polygon3
 
 ######## Requirements with Version Specifier ########
 datastock>=0.0.54
-bsplines2d>=0.0.27
+bsplines2d>=0.0.29
 spectrally>=0.0.9
 Cython>=0.26

setup.py

@@ -325,7 +325,7 @@ def get_version_tofu(path=_HERE):
         "Polygon3",
         "cython>=0.26",
         "datastock>=0.0.54",
-        "bsplines2d>=0.0.27",
+        "bsplines2d>=0.0.29",
         "spectrally>=0.0.9",
     ],
     python_requires=">=3.6",

tofu/data/_class02_sample.py

@@ -292,8 +292,8 @@ def main(
                 )(itoti)
 
             if out_l:
-                i1 = np.floor(itoti).astype(int)
-                i1[i1 == ioki.sum()] -= 1
+                i1 = np.floor(itoti - 1e-14).astype(int)
+                # i1[i1 == ioki.sum()] -= 1
 
                 llen[slin] = length1[sli2][i1]
                 lentot[slin] = length0[sli2][i1]

tofu/data/_class02_save2stp.py

@@ -1039,7 +1039,6 @@ def _get_data_polyline(
     iso=None,
 ):
 
-
     # ----------------
     # prepare
     # ----------------
@@ -1094,7 +1093,7 @@ def _get_data_polyline(
             ipts = i0_poly + np.arange(nptsi)
 
             col = dcolor[k0]
-            if color_by_pixel is not False and ii%2 == 1:
+            if color_by_pixel is not False and ii % 2 == 1:
                 col = np.r_[col]
                 icol = np.argmin(col)
                 col[icol] += (np.max(col) - col[icol]) * color_by_pixel

tofu/data/_class02_single_point_camera.py

@@ -456,6 +456,15 @@ def _rays_intersection(
         py = ptsy[0, ...]
         pz = ptsz[0, ...]
 
+        # safety check
+        if px.size <= 1:
+            msg = (
+                f"Intersection fof rays '{kray}' for single_pt_cam:\n"
+                "\t- Cannot compute intersection without at least 2 rays!\n"
+                f"\t- rays.shape = {px.shape}\n"
+            )
+            raise Exception(msg)
+
         # unit vectors
         vx, vy, vz = coll.get_rays_vect(
             kray,

tofu/data/_class08_Diagnostic.py

@@ -12,6 +12,7 @@
 # tofu
 from ._class07_Camera import Camera as Previous
 from . import _class8_check as _check
+from . import _class08_show as _show
 from . import _class8_compute as _compute
 from . import _class08_get_data as _get_data
 from . import _class08_concatenate_data as _concatenate
@@ -50,18 +51,6 @@
 class Diagnostic(Previous):
 
     _which_diagnostic = 'diagnostic'
-    _show_in_summary = 'all'
-
-    _dshow = dict(Previous._dshow)
-    _dshow.update({
-        'diagnostic': [
-            'is2d',
-            'spectro',
-            'PHA',
-            'camera',
-            'signal',
-        ],
-    })
 
     def add_diagnostic(
         self,
@@ -145,6 +134,22 @@ def remove_diagnostic(self, key=None, key_cam=None):
             key_cam=key_cam,
         )
 
+    # -------------------
+    # show
+    # -------------------
+
+    def _get_show_obj(self, which=None):
+        if which == self._which_diagnostic:
+            return _show._show
+        else:
+            return super()._get_show_obj(which)
+
+    def _get_show_details(self, which=None):
+        if which == self._which_diagnostic:
+            return _show._show_details
+        else:
+            super()._get_show_details(which)
+
     # -----------------
     # utilities
     # -----------------
@@ -559,6 +564,10 @@ def compute_diagnostic_vos(
         # spectro-only
         rocking_curve_fw=None,
         rocking_curve_max=None,
+        # cleanup
+        cleanup_pts=None,
+        cleanup_lamb=None,
+        compact_lamb=None,
         # bool
         check=None,
         verb=None,
@@ -605,6 +614,10 @@ def compute_diagnostic_vos(
             # spectro-only
             rocking_curve_fw=rocking_curve_fw,
             rocking_curve_max=rocking_curve_max,
+            # cleanup
+            cleanup_pts=cleanup_pts,
+            cleanup_lamb=cleanup_lamb,
+            compact_lamb=compact_lamb,
             # bool
             visibility=visibility,
             check=check,
@@ -1537,8 +1550,7 @@ def plot_diagnostic_geometrical_coverage(
         dmargin=None,
         tit=None,
         cmap=None,
-        vmin=None,
-        vmax=None,
+        dvminmax=None,
     ):
         """ Plot the geometrical coverage of a diagnostic, in a cross-section
 
@@ -1583,8 +1595,7 @@ def plot_diagnostic_geometrical_coverage(
             config=plot_config,
             dcolor=dcolor,
             cmap=cmap,
-            vmin=vmin,
-            vmax=vmax,
+            dvminmax=dvminmax,
             dax=dax,
             fs=fs,
             dmargin=dmargin,

tofu/data/_class08_interpolate_along_los.py

@@ -223,7 +223,7 @@ def main(
             )[key_coords]['data']
 
             # interpolate
-            q2dy = coll.interpolate_profile2d(
+            q2dy = coll.interpolate(
                 keys=key_integrand,
                 x0=Ri,
                 x1=pts_z,
@@ -239,13 +239,23 @@ def main(
             )[key_integrand]['data']
 
             # check shape
-            if q2dx['data'].shape != q2dy['data'].shape:
-                msg = "The two interpolated quantities must have same shape!"
+            if q2dx.shape != q2dy.shape:
+                msg = (
+                    "The two interpolated quantities must have same shape!\n"
+                    f"\t- '{key_coords}': {q2dx.shape}\n"
+                    f"\t- '{key_integrand}': {q2dy.shape}\n"
+                )
                 raise Exception(msg)
 
+            # axis_los
+            wbs = coll._which_bsplines
+            kbs = coll.ddata[key_integrand][wbs][0]
+            rbs = coll.dobj[wbs][kbs]['ref']
+            axis_los = coll.ddata[key_integrand]['ref'].index(rbs[0])
+
             # prepare
-            dx[kk] = np.full(q2d.shape, np.nan)
-            dy[kk] = np.full(q2d.shape, np.nan)
+            dx[kk] = np.full(q2dx.shape, np.nan)
+            dy[kk] = np.full(q2dx.shape, np.nan)
 
             # isok
             isok = np.isfinite(q2dx) & np.isfinite(q2dy) & np.isfinite(Ri)
@@ -307,6 +317,7 @@ def main(
 
     dind = _get_dind(
         coll=coll,
+        key_cam=key_cam,
         doptics=doptics,
         dx=dx,
         dy=dy,
@@ -574,7 +585,7 @@ def _interpolate_along_los_reshape(
                 else:
                     ref[ii] = 1
 
-        # None not macthing xdata (e.g.: domain)
+        # None not matching xdata (e.g.: domain)
         xdata = xdata.reshape(ref) * np.ones(ydata.shape)
 
     return xdata, ydata, axis_los
@@ -587,6 +598,7 @@ def _interpolate_along_los_reshape(
 
 def _get_dind(
     coll=None,
+    key_cam=None,
     doptics=None,
     dx=None,
     dy=None,
@@ -596,7 +608,7 @@ def _get_dind(
     #  loop on cameras
 
     dind = {}
-    for kcam in doptics.keys():
+    for kcam in key_cam:
 
         klos = doptics[kcam]['los']
 
@@ -636,8 +648,8 @@ def _get_dind(
         # -----------
         # safety check
 
-        lc = [np.any(inan[ind>=0]), (ind == -1).sum() < nnan]
-        if  any(lc):
+        lc = [np.any(inan[ind >= 0]), (ind == -1).sum() < nnan]
+        if any(lc):
             msg = (
                 "Inconsistent nans!\n"
                 f"\t- lc: {lc}\n"
@@ -669,7 +681,6 @@ def interpolate_along_los_plot(
     dax=None,
 ):
 
-
     # -------------
     # check inputs
     # -------------
@@ -814,4 +825,4 @@ def _plot_check(
         ) + str(err)
         raise Exception(msg)
 
-    return dcolor
+    return dcolor

tofu/data/_class08_save2json.py

@@ -136,7 +136,7 @@ def _extract_diagnostic(
     exdef = [
         'doptics',
         'signal',
-        'nb geom matrix'
+        'nb geom_matrix'
     ]
     if isinstance(excluded, str):
         excluded = [excluded]