Issue1177 debug

tofu/data/_class08_Diagnostic.py

@@ -565,6 +565,7 @@ def compute_diagnostic_resolution(
     def add_rays_from_diagnostic(
         self,
         key=None,
+        key_cam=None,
         # sampling
         dsampling_pixel=None,
         dsampling_optics=None,
@@ -581,6 +582,7 @@ def add_rays_from_diagnostic(
         return _generate_rays.main(
             coll=self,
             key=key,
+            key_cam=key_cam,
             # sampling
             dsampling_pixel=dsampling_pixel,
             dsampling_optics=dsampling_optics,

tofu/data/_class08_generate_rays.py

@@ -24,6 +24,7 @@
 def main(
     coll=None,
     key=None,
+    key_cam=None,
     # to sample on a single optics
     key_optics=None,
     # sampling
@@ -73,13 +74,15 @@ def main(
 
     (
         key,
+        key_cam,
         dsampling_pixel,
         dsampling_optics,
         optics,
         store, strict, key_rays, overwrite,
     ) = _check(
         coll=coll,
         key=key,
+        key_cam=key_cam,
         # sampling
         dsampling_pixel=dsampling_pixel,
         dsampling_optics=dsampling_optics,
@@ -97,7 +100,6 @@ def main(
     # ---------------
 
     wdiag = 'diagnostic'
-    key_cam = coll.dobj[wdiag][key]['camera']
     doptics = coll.dobj[wdiag][key]['doptics']
 
     # ---------------
@@ -152,6 +154,7 @@ def main(
 def _check(
     coll=None,
     key=None,
+    key_cam=None,
     # sampling
     dsampling_pixel=None,
     dsampling_optics=None,
@@ -168,6 +171,7 @@ def _check(
     # key
     # ------------
 
+    # key
     wdiag = 'diagnostic'
     lok = list(coll.dobj.get(wdiag, {}).keys())
     key = ds._generic_check._check_var(
@@ -176,7 +180,18 @@ def _check(
         allowed=lok,
     )
 
-    key_cam = coll.dobj[wdiag][key]['camera']
+    # key_cam
+    lok = coll.dobj[wdiag][key]['camera']
+    if key_cam is None:
+        key_cam = lok
+    if isinstance(key_cam, str):
+        key_cam = [key_cam]
+    key_cam = ds._generic_check._check_var_iter(
+        key_cam, 'key_cam',
+        types=(list, tuple),
+        types_iter=str,
+        allowed=lok,
+    )
 
     # spectro ?
     spectro = coll.dobj[wdiag][key]['spectro']
@@ -295,6 +310,7 @@ def _check(
 
     return (
         key,
+        key_cam,
         dsampling_pixel, dsampling_optics,
         optics0,
         store, strict, key_rays, overwrite,

tofu/data/_class8_check.py

@@ -339,7 +339,7 @@ def _check_doptics_basics(
                     key=key,
                     doptics=doptics,
                     returnas=True,
-                    shape_cam=emsg,
+                    extra_msg=emsg,
                 )
                 raise err0 from err
 

tofu/physics_tools/__init__.py

@@ -3,3 +3,4 @@
 from . import electrons
 from .transmission import get_xray_transmission
 from .heat_transport_1d import main as heat_transport_1d
+from . import magnetic

tofu/physics_tools/magnetic/__init__.py

@@ -0,0 +1 @@
+from . import shielding

tofu/physics_tools/magnetic/shielding/__init__.py

@@ -0,0 +1,2 @@
+from ._single import main as single
+from ._double import main as double