added width and height

Author: andredonadon

xcoll/beam_elements/fluka.py

@@ -226,6 +226,7 @@ def __init__(self, **kwargs):
             import xcoll as xc
             to_assign = {}
             generic = False
+            import pdb; pdb.set_trace()
             if '_xobject' not in kwargs:
                 kwargs.setdefault('_tracking', True)
                 kwargs.setdefault('_acc_ionisation_loss', -1.)
@@ -252,6 +253,10 @@ def __init__(self, **kwargs):
                     side = kwargs.pop('side', None)
                     if side is None:
                         raise ValueError('Need to provide side!')
+                    if 'width' in kwargs:
+                        width = kwargs.pop('width', None)
+                    if 'height' in kwargs:
+                        height = kwargs.pop('height', None)
                     generic = True
             super().__init__(**kwargs)
             for key, val in to_assign.items():
@@ -262,7 +267,8 @@ def __init__(self, **kwargs):
                 side = self._get_side_from_input(side)
                 self.assembly = create_generic_assembly(is_crystal=True, material=material,
                                                         side=side, length=self.length,
-                                                        bending_radius=bending_radius)
+                                                        bending_radius=bending_radius,
+                                                        width=width, height=height)
             if not hasattr(self, '_equivalent_drift'):
                 self._equivalent_drift = xt.Drift(length=self.length)
 

xcoll/scattering_routines/fluka/fluka_input.py

@@ -160,8 +160,8 @@ def _element_dict_to_fluka(element_dict, dump=False):
                     offset   = (ee._jaw_LU + ee._jaw_LD + ee._jaw_RU + ee._jaw_RD) / 4
             tilt_1 = round(ee.tilt_L, 9)
             tilt_2 = round(ee.tilt_R, 9)
-        if abs(tilt_1) > 1.e-12 or abs(tilt_2) > 1.e-12:
-            raise NotImplementedError(f"Collimator {name}: Tilts are not (yet) supported in FLUKA-Xcoll!")
+        # if abs(tilt_1) > 1.e-12 or abs(tilt_2) > 1.e-12:
+            # raise NotImplementedError(f"Collimator {name}: Tilts are not (yet) supported in FLUKA-Xcoll!")
 
         if nsig is None:
             nsig = 1

xcoll/scattering_routines/fluka/generic_prototype.py

@@ -115,7 +115,8 @@ def _validate_kwargs(kwargs):
             if field not in kwargs:
                 raise ValueError(f"Need to provide {field}!")
         for field, opt_value in _generic_crystal_optional_fields.items():
-            kwargs.setdefault(field, opt_value)
+            if field not in kwargs:
+                kwargs.setdefault(field, opt_value)
     else:
         for field in _generic_required_fields:
             if field not in kwargs: