Merge pull request #1172 from ToFuProject/Issue1171_MoveDiagExcludeOptics

Issue1171 move diag exclude optics

Author: Didou09

tofu/data/_class08_Diagnostic.py

@@ -1111,6 +1111,8 @@ def move_diagnostic_translate3d_by(
         key_cam=None,
         # new diag
         key_new=None,
+        # fixed_optics
+        fixed_optics=None,
         # move params
         vect_xyz=None,
         length=None,
@@ -1151,6 +1153,8 @@ def move_diagnostic_rotate3d_by(
         key_cam=None,
         # new diag
         key_new=None,
+        # fixed_optics
+        fixed_optics=None,
         # move params
         axis_pt=None,
         axis_vect=None,

tofu/data/_class08_move3d_check.py

@@ -17,6 +17,8 @@ def main(
     coll=None,
     key=None,
     key_cam=None,
+    # fixed_optics
+    fixed_optics=None,
     # new diag
     key_new=None,
     # move - translate
@@ -66,7 +68,30 @@ def main(
         excluded=lout,
     )
 
-    out = (key, key_cam, key_new)
+    # --------------
+    # fixed_optics
+    # --------------
+
+    if len(key_cam) == 0:
+        fixed_optics = None
+    else:
+        if fixed_optics is None:
+            fixed_optics = ()
+        if isinstance(fixed_optics, str):
+            fixed_optics = (fixed_optics,)
+
+        lok = set(np.concatenate([
+            coll.dobj[wdiag][key]['doptics'][kcam]['optics']
+            for kcam in key_cam
+        ]))
+        fixed_optics = tuple(ds._generic_check._check_var_iter(
+            fixed_optics, 'fixed_optics',
+            types=(list, tuple),
+            types_iter=str,
+            allowed=lok,
+        ))
+
+    out = (key, key_cam, key_new, fixed_optics)
 
     # --------------
     # move params
@@ -235,6 +260,12 @@ def _add_asis(
             if isinstance(dgeom0[kk], str):
                 dgeom[kk] = coll.ddata[kk]['data']
 
+            elif isinstance(dgeom0[kk], tuple):
+                if all([isinstance(vv, str) for vv in dgeom0[kk]]):
+                    for vv in dgeom0[kk]:
+                        cc = vv.split('_')[-1]
+                        dgeom[f"{kk}_{cc}"] = coll.ddata[vv]['data']
+
             else:
                 if dgeom0.get(kk) is not None:
                     dgeom[kk] = dgeom0[kk]

tofu/data/_class08_move_rotate3d_by.py

@@ -19,6 +19,8 @@ def main(
     key_cam=None,
     # new diag
     key_new=None,
+    # fixed_optics
+    fixed_optics=None,
     # move params
     axis_pt=None,
     axis_vect=None,
@@ -45,10 +47,13 @@ def main(
     # ----------
 
     (
-        key, key_cam, key_new,
+        key, key_cam, key_new, fixed_optics,
         angle, axis_pt, axis_vect,
     ) = _check.main(move='rotate', **locals())
 
+    if len(key_cam) == 0:
+        return
+
     # ----------
     # prepare
     # ----------
@@ -83,15 +88,20 @@ def main(
         doptics[kcam_new] = {}
         for kop in doptics0[kcam]['optics']:
 
-            # translate
-            kop_new = _rotate_optics(
-                coll=coll,
-                kop=kop,
-                axis_pt=axis_pt[kcam],
-                axis_vect=axis_vect[kcam],
-                angle=angle[kcam],
-                key_new=key_new,
-            )
+            if kop in fixed_optics:
+                kop_new = kop
+
+            else:
+                # rotate
+                kop_new = _rotate_optics(
+                    coll=coll,
+                    kop=kop,
+                    axis_pt=axis_pt[kcam],
+                    axis_vect=axis_vect[kcam],
+                    angle=angle[kcam],
+                    key_new=key_new,
+                )
+
             lop_new.append(kop_new)
 
         # doptics

tofu/data/_class08_move_translate3d_by.py

@@ -15,6 +15,8 @@ def main(
     key_cam=None,
     # new diag
     key_new=None,
+    # fixed_optics
+    fixed_optics=None,
     # move params
     vect_xyz=None,
     length=None,
@@ -40,10 +42,13 @@ def main(
     # ----------
 
     (
-        key, key_cam, key_new,
+        key, key_cam, key_new, fixed_optics,
         length, vect_xyz,
     ) = _check.main(move='translate', **locals())
 
+    if len(key_cam) == 0:
+        return
+
     # ----------
     # prepare
     # ----------
@@ -77,14 +82,19 @@ def main(
         doptics[kcam_new] = {}
         for kop in doptics0[kcam]['optics']:
 
-            # translate
-            kop_new = _translate_optics(
-                coll=coll,
-                kop=kop,
-                length=length[kcam],
-                vect_xyz=vect_xyz[kcam],
-                key_new=key_new,
-            )
+            if kop in fixed_optics:
+                kop_new = kop
+
+            else:
+                # translate
+                kop_new = _translate_optics(
+                    coll=coll,
+                    kop=kop,
+                    length=length[kcam],
+                    vect_xyz=vect_xyz[kcam],
+                    key_new=key_new,
+                )
+
             lop_new.append(kop_new)
 
         # doptics

tofu/data/_class8_check.py

@@ -749,13 +749,13 @@ def _get_default_cam(coll=None, key=None, key_cam=None, default=None):
     if isinstance(key_cam, str):
         key_cam = [key_cam]
 
-    key_cam = ds._generic_check._check_var_iter(
+    key_cam = list(ds._generic_check._check_var_iter(
         key_cam, 'key_cam',
-        types=list,
+        types=(list, tuple),
         types_iter=str,
         allowed=lok,
         default=key_cam_def,
-    )
+    ))
 
     return key, key_cam