Merge pull request #976 from ToFuProject/devel

Prepare 1.8.1

requirements.txt

@@ -1,14 +1,15 @@
 ####### Requirements without Version Specifiers #######
 scipy
 numpy
-# scikit-sparse    # does not work on windows, and requires "apt/brew install libsuitesparse-dev/suite-sparse" on linux / MacOs 
+# scikit-sparse    # does not work on windows, and requires "apt/brew install libsuitesparse-dev/suite-sparse" on linux / MacOs
 # scikit-umfpack   # similar issue
+setuptools!=65.*,!=74.*
 matplotlib
 contourpy
 requests
 svg.path
 Polygon3
 
 ######## Requirements with Version Specifier ########
-spectrally>=0.0.4
+spectrally>=0.0.6
 Cython>=0.26

setup.py

@@ -314,6 +314,7 @@ def get_version_tofu(path=_HERE):
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=[
+        "setuptools!=65.*,!=74.*",
         "numpy",
         "scipy",
         # "scikit-sparse",
@@ -324,7 +325,7 @@ def get_version_tofu(path=_HERE):
         "svg.path",
         "Polygon3",
         "cython>=0.26",
-        "spectrally>=0.0.4",
+        "spectrally>=0.0.6",
     ],
     python_requires=">=3.6",
 

tofu/data/_class08_Diagnostic.py

@@ -23,6 +23,7 @@
 from . import _class8_vos as _vos
 from . import _class8_vos_spectro_nobin_at_lamb as _vos_nobin_at_lamb
 from . import _class8_los_angles as _los_angles
+from . import _class08_generate_rays as _generate_rays
 from . import _class8_plane_perp_to_los as _planeperp
 from . import _class8_compute_signal as _compute_signal
 from . import _class8_compute_signal_moments as _signal_moments
@@ -367,6 +368,35 @@ def compute_diagnostic_solidangle_from_plane(
             vmax_plane=vmax_plane,
         )
 
+    # -----------------
+    # add rays from diag
+    # -----------------
+
+    def add_rays_from_diagnostic(
+        self,
+        key=None,
+        strategy=None,
+        nrays=None,
+        # storing
+        store=None,
+        config=None,
+        overwrite=None,
+    ):
+        return _generate_rays.main(
+            coll=self,
+            key=key,
+            strategy=strategy,
+            nrays=nrays,
+            # storing
+            store=store,
+            config=config,
+            overwrite=overwrite,
+        )
+
+    # -----------------
+    # solid angle from plane
+    # -----------------
+
     def plot_diagnostic_solidangle_from_plane(
         self,
         dout=None,