[#1037] Minor improvements to take segment into account

Author: Didou09

tofu/data/_class02_Rays.py

@@ -167,6 +167,7 @@ def get_rays_touch_dict(
         self,
         key=None,
         config=None,
+        segment=None,
         allowed=None,
         excluded=None,
     ):
@@ -190,6 +191,7 @@ def get_rays_touch_dict(
             coll=self,
             key=key,
             config=config,
+            segment=segment,
             allowed=allowed,
             excluded=excluded,
         )
@@ -550,4 +552,4 @@ def save_rays_to_stp(
             # saving
             pfe_save=pfe_save,
             overwrite=overwrite,
-        )
+        )

tofu/data/_class08_get_data.py

@@ -28,6 +28,9 @@ def main(
     key=None,
     key_cam=None,
     data=None,
+    # relevant for LOS data
+    segment=None,
+    # relevant for spectro data
     rocking_curve=None,
     units=None,
     default=None,
@@ -146,7 +149,7 @@ def main(
                     key=key,
                     key_cam=cc,
                     quantity=data,
-                    segment=-1,
+                    segment=segment,
                     lim_to_segments=False,
                 )
             if data in ['length', 'tangency_radius']:
@@ -161,9 +164,9 @@ def main(
                 vectx, vecty, vectz = coll.get_rays_vect(klos)
                 dvect = coll.get_camera_unit_vectors(cc)
                 sca = (
-                    dvect['nin_x'] * vectx
-                    + dvect['nin_y'] * vecty
-                    + dvect['nin_z'] * vectz
+                    dvect['nin_x'] * vectx[0, ...]
+                    + dvect['nin_y'] * vecty[0, ...]
+                    + dvect['nin_z'] * vectz[0, ...]
                 )
 
                 ddata[cc] = np.arccos(sca)
@@ -439,7 +442,6 @@ def _check(
         # allowable values
 
         lquant = ['etendue', 'amin', 'amax']  # 'los'
-        lcomp = ['length', 'tangency radius', 'alpha', 'alpha_pixel']
 
         # -------------
         # overall check
@@ -542,4 +544,4 @@ def _print(
         return msg
     else:
         print(msg)
-        return
+        return