xcoll 0.3.6__py3-none-any.whl → 0.4.0__py3-none-any.whl

xcoll/colldb.py

@@ -1,6 +1,6 @@
 # copyright ############################### #
 # This file is part of the Xcoll Package.   #
-# Copyright (c) CERN, 2023.                 #
+# Copyright (c) CERN, 2024.                 #
 # ######################################### #
 
 import io
@@ -8,26 +8,22 @@ import json
 import numpy as np
 import pandas as pd
 
+import xtrack as xt
 
-#TODO: niet-active collimators op non-active etc (ook crystals)
+from .beam_elements import BlackAbsorber, EverestCollimator, EverestCrystal, collimator_classes, element_classes
+from .install import install_elements
+from .scattering_routines.everest.materials import SixTrack_to_xcoll
 
-def load_SixTrack_colldb(filename, *, emit):
-    print("Warning: Using 'xcoll.load_SixTrack_colldb()' is deprecated! "
-        + "Use 'xcoll.CollimatorDatabase.from_SixTrack()' instead.")
-    return CollimatorDatabase.from_SixTrack(file=filename, nemitt_x=emit, nemitt_y=emit)
 
-
-def _initialise_None(collimator):
-    fields = {'s_center':None, 'align_to': None, 's_align_front': None, 's_align_back': None }
-    fields.update({'gap_L': None, 'gap_R': None, 'angle_L': 0, 'angle_R': 0, 'offset': 0, 'parking': 1})
-    fields.update({'jaw_LU': None, 'jaw_RU': None, 'jaw_LD': None, 'jaw_RD': None, 'family': None, 'overwritten_keys': []})
-    fields.update({'side': 'both', 'material': None, 'stage': None, 'collimator_type': None, 'active': True})
-    fields.update({'active_length': 0, 'inactive_front': 0, 'inactive_back': 0, 'sigmax': None, 'sigmay': None})
-    fields.update({'crystal': None, 'bending_radius': None, 'xdim': 0, 'ydim': 0, 'miscut': 0, 'thick': 0})
+def _initialise_None(dct):
+    fields = {'gap': None, 'angle': 0, 'offset': 0, 'parking': 1, 'jaw': None, 'family': None}
+    fields.update({'overwritten_keys': [], 'side': 'both', 'material': None, 'stage': None})
+    fields.update({'length': 0, 'collimator_type': None, 'active': True, 'crystal': None, 'tilt': 0})
+    fields.update({'bending_radius': 0, 'bending_angle': 0, 'width': 0, 'height': 0, 'miscut': 0})
     for f, val in fields.items():
-        if f not in collimator.keys():
-            collimator[f] = val
-    for key in collimator.keys():
+        if f not in dct.keys():
+            dct[f] = val
+    for key in dct.keys():
         if key not in fields.keys():
             raise ValueError(f"Illegal setting {key} in collimator!")
 
@@ -47,7 +43,7 @@ def _get_coll_dct_by_beam(coll, beam):
             beam = f'b{beam}'
         beam = beam.lower()
     beam_in_db = list(coll.keys())
-    
+
     if beam_in_db == ['b1','b2']:
         if beam is None:
             raise ValueError("Need to specify a beam, because the given dict is for both beams!")
@@ -67,13 +63,88 @@ def _get_coll_dct_by_beam(coll, beam):
 
 class CollimatorDatabase:
 
-    _init_vars = ['collimator_dict', 'family_dict', 'beam', 'nemitt_x', 'nemitt_y', '_yaml_merged', 'ignore_crystals']
-    _init_var_defaults = {'family_dict': {}, 'beam': None, '_yaml_merged': False, 'ignore_crystals': True}
+    def __init__(self, **kwargs):
+        # Get all arguments
+        for key in ['collimator_dict', 'nemitt_x', 'nemitt_y']:
+            if key not in kwargs.keys():
+                raise ValueError(f"CollimatorDatabase is missing required argument '{key}'!")
+
+        self._parse_dict(kwargs['collimator_dict'],
+                         kwargs.get('family_dict', {}),
+                         kwargs.get('beam', None),
+                         kwargs.get('_yaml_merged', False),
+                         kwargs.get('ignore_crystals', True))
+        self.nemitt_x = kwargs['nemitt_x']
+        self.nemitt_y = kwargs['nemitt_y']
+        self.line = None
+
+
+    def _parse_dict(self, coll, fam, beam=None, _yaml_merged=False, ignore_crystals=True):
+        # We make all keys case-insensitive to avoid confusion between different conventions
+        coll = _dict_keys_to_lower(coll)
+        fam  = _dict_keys_to_lower(fam)
+
+        # The dictionary can be a CollimatorDatabase for a single beam (beam=None)
+        # or for both beams (beam='b1' or beam='b2)
+        coll = _get_coll_dct_by_beam(coll, beam)
+
+        # Apply family settings
+        crystals = []
+        for thiscoll, settings in coll.items():
+            settings = {k.lower(): v for k,v in settings.items()}
+            if 'family' in settings.keys() and settings['family'] is not None:
+                settings['family'] = settings['family'].lower()
+                thisfam = settings['family']
+                if thisfam not in fam.keys():
+                    raise ValueError(f"Collimator {thiscoll} depends on family {thisfam}, "
+                                   + f"but the latter is not defined!")
+
+                # Check if some family settings are overwritten for this collimator
+                # Only do this check if we didn't do a YAML merge earlier (because then it
+                # is already taken care of)
+                if not _yaml_merged:
+                    overwritten_keys = [key.lower() for key in settings.keys() if key in fam[thisfam]]
+                    if len(overwritten_keys) > 0:
+                        settings['overwritten_keys'] = overwritten_keys
+
+                # Load family settings, potentially overwriting settings for this collimator
+                settings = {**fam[thisfam], **settings}
+
+            else:
+                settings['family'] = None
+            coll[thiscoll] = settings
+
+            # Save list of crystals
+            if 'crystal' in settings:
+                if settings['crystal'] != 0.0:
+                    crystals += [thiscoll]
+                else:
+                    settings['crystal'] = None
+
+        # Remove crystals from colldb
+        if ignore_crystals:
+            for thiscoll in crystals:
+                del coll[thiscoll]
+
+        # Check that all collimators have gap settings
+        if not np.all(['gap' in val.keys() or 'jaw' in val.keys() for val in coll.values()]):
+            raise ValueError("Ill-defined CollimatorDatabase: Not all collimators have a gap or "
+                           + "jaw setting, (or the keys / structure of the dictionary is wrong)!")
+
+        # Update collimators with default values for missing keys
+        for name, collimator in coll.items():
+            # Change all values to lower case
+            for key, val in collimator.items():
+                collimator[key] = val.lower() if isinstance(val, str) else val
+            _initialise_None(collimator)
+
+        self._collimator_dict = coll
+        self._family_dict = fam
+
+    # =======================================
+    # ====== Loading/dumping functions ======
+    # =======================================
 
-    # -------------------------------
-    # ------ Loading functions ------
-    # -------------------------------
-    
     @classmethod
     def from_yaml(cls, file, **kwargs):
 
@@ -119,6 +190,8 @@ class CollimatorDatabase:
             coll_dct = _get_coll_dct_by_beam(dct['collimators'], beam)
             full_coll_dct = _get_coll_dct_by_beam(full_dct[collkey], beam)
             for coll, full_coll in zip(coll_dct.values(), full_coll_dct.values()):
+                if not isinstance(coll['gap'], (int,float)):
+                    coll['gap'] = None
                 if 'family' in coll.keys():
                     raise ValueError(f"Error in {coll}: Cannot use merging for families "
                                     + "and manually specify family as well!")
@@ -193,10 +266,10 @@ class CollimatorDatabase:
             family_settings = {}
             family_types = {}
             side = {}
-            cry_fields = ['bending_radius', 'xdim', 'ydim', 'thick', 'miscut', 'crystal']
+            cry_fields = ['bending_radius', 'width', 'height', 'thick', 'miscut', 'crystal']
             cry = {}
 
-            for l_no, line in enumerate(infile):
+            for line in infile:
                 if line.startswith('#'):
                     continue # Comment
                 sline = line.split()
@@ -224,16 +297,20 @@ class CollimatorDatabase:
 
         defaults = {}
         _initialise_None(defaults)
+        defaults['thick'] = 0
 
-        famdct = {key: {'gap': family_settings[key], 'stage': family_types[key]} for key in family_settings}
-        names = ['name', 'gap', 'material', 'active_length', 'angle', 'offset']
+        famdct = {key: {'gap': None if family_settings[key] > 900 else family_settings[key],
+                        'stage': family_types[key]} for key in family_settings}
+        names = ['name', 'gap', 'material', 'length', 'angle', 'offset']
 
         df = pd.read_csv(io.StringIO(coll_data_string), sep=r'\s+', index_col=False, names=names)
         df['family'] = df['gap'].copy()
         df['family'] = df['family'].apply(lambda s: None if re.match(r'^-?\d+(\.\d+)?$', str(s)) else s)
-        df.insert(5,'stage', df['gap'].apply(lambda s: family_types.get(s, 'UNKNOWN')))
+        df.insert(5,'stage', df['gap'].apply(lambda s: None if s in family_types else 'UNKNOWN'))
+
+        df['gap'] = df['gap'].apply(lambda s: None if not isinstance(s, str) and s > 900 else s)
+        df['gap'] = df['gap'].apply(lambda s: None if isinstance(s, str) else s)
 
-        df['gap'] = df['gap'].apply(lambda s: float(family_settings.get(s, s)))
         # TODO this breaks code if a key has upper case, e.g. gap_L
         df['name'] = df['name'].str.lower() # Make the names lowercase for easy processing
         df['parking'] = 0.025
@@ -243,6 +320,9 @@ class CollimatorDatabase:
             for key in cry_fields:
                 df[key] = [cry[name][key] if name in cry else defaults[key]
                            for name in df['name']]
+            if not np.allclose(np.unique(df.thick.values), 0):
+                print("Warning: Keyword 'thick' is currently not supported in xcoll! Ignoring.")
+            df = df.drop('thick', axis=1)
             df['crystal'] = ['strip' if s==1 else s for s in df['crystal']]
             df['crystal'] = ['quasi-mosaic' if s==2 else s for s in df['crystal']]
         df['side'] = [side[name] if name in side else defaults['side']
@@ -250,13 +330,32 @@ class CollimatorDatabase:
         df['side'] = ['both'  if s==0 else s for s in df['side']]
         df['side'] = ['left'  if s==1 else s for s in df['side']]
         df['side'] = ['right' if s==2 else s for s in df['side']]
+        if not np.allclose(np.unique(df.offset.values), 0):
+            print("Warning: Keyword 'offset' is currently not supported in xcoll! Ignoring.")
+        df = df.drop('offset', axis=1)
         df = df.set_index('name')
-
-        return cls.from_dict({'collimators': df.transpose().to_dict(), 'families': famdct}, \
+        df = df.replace(np.nan, None)
+
+        colldict = df.transpose().to_dict()
+        # Remove Nonetype families
+        colldict = {coll: {kk: vv for kk, vv in coll_settings.items()
+                           if kk != 'family' or vv is not None}
+                    for coll, coll_settings in colldict.items()}
+        # Remove None gaps and stages if the collimator is assigned a family (they will be set in _parse_dict)
+        colldict = {coll: {kk: vv for kk, vv in coll_settings.items()
+                           if kk != 'gap' or vv is not None or 'family' not in coll_settings}
+                    for coll, coll_settings in colldict.items()}
+        colldict = {coll: {kk: vv for kk, vv in coll_settings.items()
+                           if kk != 'stage' or vv is not None or 'family' not in coll_settings}
+                    for coll, coll_settings in colldict.items()}
+
+        return cls.from_dict({'collimators': colldict, 'families': famdct}, \
                              ignore_crystals=ignore_crystals, **kwargs)
 
+    def to_pandas(self):
+        return pd.DataFrame(self._collimator_dict).transpose()
 
-    def write_to_yaml(self, out, lhc_style=True):
+    def to_yaml(self, out, lhc_style=True):
         """
         Writes a colldb in memory to disk in the yaml format.
 
@@ -286,18 +385,18 @@ class CollimatorDatabase:
                 formatted_key = f'{key}:'.ljust(key_width)
             #formatted_values = formatted_values.ljust(key_width)
             return f"{spacing}{formatted_key} {{ {formatted_values} }}\n"
-        
+
         def _print_values(keys, dct, file, spacing='', mapping=False):
             # Writes formatted dictionary entries to a file
             for key in keys:
                 file.write(_format_dict_entry(key, dct[key], spacing=spacing, mapping=mapping))
-        
+
         def _print_colls(colls, dcts, beam, file):
             # Filters and formats collimator data, then writes to a file
             coll_items_to_print = ['<<','gap','angle','material','active','length','side']
             file.write(f'  {beam}:\n')
             for coll in colls:
-                coll_dict = dcts._colldb.transpose().to_dict()[coll]
+                coll_dict = dcts.to_pandas().transpose().to_dict()[coll]
                 fam = coll_dict['family']
                 fam_keys = []
                 if fam is not None:
@@ -305,19 +404,19 @@ class CollimatorDatabase:
                     coll_dict = {**{'<<': '*'+fam}, **coll_dict}
                 temp_items_to_print = []
                 if coll_dict['crystal'] and str(coll_dict['crystal'])!='nan':
-                    temp_items_to_print = ['bending_radius','xdim','ydim','miscut','crystal', 'thick']
-                if coll_dict['angle_L'] == coll_dict['angle_R']:
-                    coll_dict.update({'angle': coll_dict['angle_L']})
-                else:
-                    temp_items_to_print = temp_items_to_print + ['angle_L','angle_R']
-                if coll_dict['gap_L'] == coll_dict['gap_R']:
-                    coll_dict.update({'gap': coll_dict['gap_L']})
-                elif coll_dict['gap_L'] is None and coll_dict['gap_R'] is not None:
-                    coll_dict.update({'gap': coll_dict['gap_R']})
-                elif coll_dict['gap_L'] is not None and coll_dict['gap_R'] is None:
-                    coll_dict.update({'gap': coll_dict['gap_L']})
-                else:
-                    temp_items_to_print = temp_items_to_print + ['gap_L','gap_R']
+                    temp_items_to_print = ['bending_radius','width','height','miscut','crystal']
+                # if 'angle_L' in coll_dict and coll_dict['angle_L'] == coll_dict['angle_R']:
+                #     coll_dict.update({'angle': coll_dict['angle_L']})
+                # else:
+                #     temp_items_to_print = temp_items_to_print + ['angle_L','angle_R']
+                # if coll_dict['gap_L'] == coll_dict['gap_R']:
+                #     coll_dict.update({'gap': coll_dict['gap_L']})
+                # elif coll_dict['gap_L'] is None and coll_dict['gap_R'] is not None:
+                #     coll_dict.update({'gap': coll_dict['gap_R']})
+                # elif coll_dict['gap_L'] is not None and coll_dict['gap_R'] is None:
+                #     coll_dict.update({'gap': coll_dict['gap_L']})
+                # else:
+                #     temp_items_to_print = temp_items_to_print + ['gap_L','gap_R']
                 value = {}
                 overwritten_keys = coll_dict['overwritten_keys']
                 for key, val in coll_dict.items():
@@ -326,8 +425,7 @@ class CollimatorDatabase:
                     if (key in coll_items_to_print+temp_items_to_print) and (key not in (set(fam_keys)-set(overwritten_keys))) and (val != 'both'):
                         value.update({key: val})
                 file.write(_format_dict_entry(coll, value, spacing='    '))
-            file.write('\n')   
-                                
+            file.write('\n')
 
         LHC_families = ['tcp3', 'tcsg3', 'tcsm3', 'tcla3', 'tcp7', 'tcsg7', 'tcsm7', 'tcla7', 'tcli', 'tdi', 'tcdq', 'tcstcdq', 'tcth1', 'tcth2', 'tcth5', 'tcth8', 'tctv1', 'tctv2', 'tctv5', 'tctv8', 'tclp', 'tcxrp', 'tcryo', 'tcl4', 'tcl5', 'tcl6', 'tct15', 'tct2', 'tct8', 'tcsp', 'tcld']
         with open(f'{out}.yaml', 'w') as file:
@@ -376,15 +474,15 @@ class CollimatorDatabase:
                     _print_values(self._family_dict.keys(), self._family_dict, file, spacing='  - &', mapping=True)
 
             # Emittance section
-            ex = self.emittance[0]
-            ey = self.emittance[1]
+            ex = self.nemitt_x
+            ey = self.nemitt_y
             file.write(f'\nemittance:\n  x: {ex}\n  y: {ey}\n')
 
             # Collimators section
             file.write('\ncollimators:\n')
             b1_colls, b2_colls, bx_colls = [], [], []
-            for coll in self._colldb.index:
-                if coll == 'tclia.4r2' or coll == 'tclia.4l8':
+            for coll in self.to_pandas().index:
+                if coll == 'tclia.4r2' or coll == 'tclia.4l8':    # TODO: hardcoded!!!
                     b1_colls.append(coll)
                     b2_colls.append(coll)
                 elif coll[-2:] == 'b1':
@@ -393,7 +491,7 @@ class CollimatorDatabase:
                     b2_colls.append(coll)
                 else:
                     bx_colls.append(coll)
-            
+
             # Handle special cases for collimators
             if (('tclia.4r2' in b1_colls) or ('tclia.4l8' in b1_colls)) and (len(b1_colls) <= 2):
                 b1_colls = []
@@ -409,702 +507,104 @@ class CollimatorDatabase:
                 _print_colls(bx_colls, self, 'bx', file)
                 print('WARNING -- some collimators could not be assigned to b1 or b2. Tracking might not work with those collimators. Please manually change the output file if necessary.')
 
-
-    def __init__(self, **kwargs):
-        # Get all arguments
-        for var in self._init_vars:
-            if var in self._init_var_defaults:
-                kwargs.setdefault(var, self._init_var_defaults[var])
-            elif var not in kwargs.keys():
-                raise ValueError(f"CollimatorDatabase is missing required argument '{var}'!")
-
-        self._optics = pd.DataFrame(columns=['x', 'px', 'y', 'py', 'betx', 'bety', 'alfx', 'alfy', 'dx', 'dy'])
-        self._parse_dict(kwargs['collimator_dict'], kwargs['family_dict'],
-                         kwargs['beam'], kwargs['_yaml_merged'], kwargs.get('ignore_crystals', True))
-        self.emittance = [kwargs['nemitt_x'], kwargs['nemitt_y']]
-        self._beta_gamma_rel = None
-
-
-    def __getitem__(self, name):
-        return CollimatorSettings(name, self._colldb)
-
-    def to_pandas(self):
-        return pd.DataFrame({
-                's_center':        self.s_center,
-                'gap':             self.gap,
-                'jaw':             self.jaw,
-                'beam_size':       self.beam_size,
-                'aligned_to':      self.align_to,
-                'angle':           self.angle,
-                'material':        self.material,
-#                 'offset':          self.offset,
-#                 'tilt':            self.tilt,
-                'stage':           self.stage,
-                'active_length':   self.active_length,
-                'collimator_type': self.collimator_type,
-            }, index=self.name)
-
-
-    def _parse_dict(self, coll, fam, beam=None, _yaml_merged=False, ignore_crystals=True):
-
-        # We make all keys case-insensitive to avoid confusion between different conventions
-        coll = _dict_keys_to_lower(coll)
-        fam  = _dict_keys_to_lower(fam)
-
-        # The dictionary can be a CollimatorDatabase for a single beam (beam=None)
-        # or for both beams (beam='b1' or beam='b2)
-        coll = _get_coll_dct_by_beam(coll, beam)
-
-        # Apply family settings
-        crystals = []
-        for thiscoll, settings in coll.items():
-            settings = {k.lower(): v for k,v in settings.items()}
-            if 'family' in settings.keys() and settings['family'] is not None:
-                settings['family'] = settings['family'].lower()
-                thisfam = settings['family']
-                if thisfam not in fam.keys():
-                    raise ValueError(f"Collimator {thiscoll} depends on family {thisfam}, "
-                                   + f"but the latter is not defined!")
-
-                # Check if some family settings are overwritten for this collimator
-                # Only do this check if we didn't do a YAML merge earlier (because then it
-                # is already taken care of)
-                if not _yaml_merged:
-                    overwritten_keys = [key.lower() for key in settings.keys() if key in fam[thisfam]]
-                    if len(overwritten_keys) > 0:
-                        settings['overwritten_keys'] = overwritten_keys
-
-                # Load family settings, potentially overwriting settings for this collimator
-                settings = {**fam[thisfam], **settings}
-
+    # ====================================
+    # ====== Installing collimators ======
+    # ====================================
+
+    def install_black_absorbers(self, line, names=None, *, verbose=False, need_apertures=True):
+        self.line = line
+        elements = []
+        if names is None:
+            names = self.collimator_names
+        for name in names:
+            if verbose: print(f"Installing {name:20} as BlackAbsorber")
+            el = BlackAbsorber(gap=self[name]['gap'], angle=self[name]['angle'],
+                               length=self[name]['length'], side=self[name]['side'],
+                               _tracking=False)
+
+            # Check that collimator is not installed as different type
+            # TODO: automatically replace collimator type and print warning
+            if isinstance(line[name], tuple(collimator_classes)):
+                raise ValueError(f"Trying to install {name} as {el.__class__.__name__},"
+                               + f" but it is already installed as {line[name].__class__.__name__}!\n"
+                               + f"Please reconstruct the line.")
+
+            # TODO: only allow Marker elements, no Drifts!!
+            #       How to do this with importing a line for MAD-X or SixTrack...?
+            elif not isinstance(line[name], (xt.Marker, xt.Drift)):
+                raise ValueError(f"Trying to install {name} as {el.__class__.__name__},"
+                               + f" but the line element to replace is not an xtrack.Marker "
+                               + f"(or xtrack.Drift)!\nPlease check the name, or correct the "
+                               + f"element.")
+            el.emittance = [self.nemitt_x, self.nemitt_y]
+            elements.append(el)
+        install_elements(line, names, elements, need_apertures=need_apertures)
+
+    def install_everest_collimators(self, line, names=None, *, verbose=False, need_apertures=True):
+        self.line = line
+        elements = []
+        if names is None:
+            names = self.collimator_names
+        for name in names:
+            mat = SixTrack_to_xcoll[self[name]['material']]
+            if self[name]['crystal'] is None:
+                if verbose: print(f"Installing {name:20} as EverestCollimator")
+                el = EverestCollimator(gap=self[name]['gap'], angle=self[name]['angle'],
+                                       length=self[name]['length'], side=self[name]['side'],
+                                       material=mat[0], _tracking=False)
             else:
-                settings['family'] = None
-            coll[thiscoll] = settings
-
-            # Save list of crystals
-            if 'crystal' in settings:
-                if settings['crystal'] != 0.0:
-                    crystals += [thiscoll]
-                else: 
-                    settings['crystal'] = None
-
-        # Remove crystals from colldb
-        if ignore_crystals:
-            for thiscoll in crystals:
-                del coll[thiscoll]
-
-        # Check that all collimators have gap settings
-        if not np.all(['gap' in val.keys() or 'opening' in val.keys() for val in coll.values()]):
-            raise ValueError("Ill-defined CollimatorDatabase: Not all collimators have a gap or "
-                           + "opening setting, (or the keys / structure of the dictionary is wrong)!")
-
-        # Update collimators with default values for missing keys
-        for collimator in coll.values():
-            # Change all values to lower case
-            for key, val in collimator.items():
-                collimator[key] = val.lower() if isinstance(val, str) else val
-            if 'length' in collimator.keys():
-                collimator['active_length'] = collimator.pop('length')
-            if 'gap' in collimator.keys():
-                if collimator['gap'] is not None and collimator['gap'] > 900:
-                    collimator['gap'] = None
-                if 'side' in collimator.keys() and collimator['side'] == 'left':
-                    collimator['gap_L'] = collimator.pop('gap')
-                    collimator['gap_R'] = None
-                elif 'side' in collimator.keys() and collimator['side'] == 'right':
-                    collimator['gap_L'] = None
-                    collimator['gap_R'] = collimator.pop('gap')
-                else:
-                    collimator['gap_L'] = collimator['gap']
-                    collimator['gap_R'] = collimator.pop('gap')
-            if 'angle' in collimator.keys():
-                collimator['angle_L'] = collimator['angle']
-                collimator['angle_R'] = collimator.pop('angle')
-            _initialise_None(collimator)
-
-        self._collimator_dict = coll
-        self._family_dict = fam
-        self._colldb = pd.DataFrame(coll).transpose()
-
-
-    @property
-    def name(self):
-        return self._colldb.index.values
-
-
-    # TODO: - VALIDATION OF TYPES (e.g. material, stage, align, ..)
-    #       - IMPLEMENTATION OF TILT
-    #       - CRYSTAL PROPERTIES: only valid if crystal == True (add mask to _set_property?)
-    #         make second dataframe for crystals
-    #       - show as __repr__
-
-    # The CollimatorDatabase class has the following fields (those marked
-    # with an * are set automatically and cannot be overwritten):
-    #   - name
-    #   - gap
-    #   - jaw *
-    #   - beam_size *
-    #   - s_center *
-    #   - angle
-    #   - material
-    #   - offset
-    #   - tilt
-    #   - stage
-    #   - side
-    #   - active_length
-    #   - inactive_front
-    #   - inactive_back
-    #   - total_length *
-    #   - collimator_type *
-    #   - betx
-    #   - bety
-    #   - x
-    #   - px
-    #   - y
-    #   - py
-    #   - gamma_rel
-    #   - emit
-
-    @property
-    def angle(self):
-#         angles = np.array([self._colldb.angle_L.values,self._colldb.angle_R.values])
-#         return pd.Series([ L if L == R else [L,R] for L, R in angles.T ], index=self._colldb.index, dtype=object)
-        return self._colldb['angle_L']
-
-    @angle.setter
-    def angle(self, angle):
-        self._set_property_LR('angle', angle)
-        self._compute_jaws()
-
-    @property
-    def material(self):
-        return self._colldb['material']
-
-    @material.setter
-    def material(self, material):
-        self._set_property('material', material)
-
-    @property
-    def offset(self):
-        return self._colldb['offset']
-
-    @offset.setter
-    def offset(self, offset):
-        self._set_property('offset', offset, single_default_allowed=True)
-        self._compute_jaws()
-
-    @property
-    def tilt(self):
-        tilts = np.array([self._colldb.tilt_L.values,self._colldb.tilt_R.values])
-        return pd.Series([ L if L == R else [L,R] for L, R in tilts.T ], index=self._colldb.index, dtype=object)
-
-    @tilt.setter
-    def tilt(self, tilts):
-        self._set_property_LR('tilt', tilts)
-        self._compute_jaws()
-
-    @property
-    def stage(self):
-        return self._colldb['stage']
-
-    @stage.setter
-    def stage(self, stage):
-        self._set_property('stage', stage)
-
-    @property
-    def parking(self):
-        return self._colldb['parking']
-
-    @parking.setter
-    def parking(self, parking):
-        self._set_property('parking', parking, single_default_allowed=True)
-        self._compute_jaws()
-
-    @property
-    def active(self):
-        return self._colldb['active']
-
-    @active.setter
-    def active(self, active):
-        self._set_property('active', active, single_default_allowed=True)
-
-#     @property
-#     def crystal(self):
-#         return self._colldb['crystal']
-
-#     @crystal.setter
-#     def crystal(self, crystal):
-#         self._set_property('crystal', crystal)
-
-#     @property
-#     def bend(self):
-#         return self._colldb['bend']
-
-#     @bend.setter
-#     def bend(self, bend):
-#         self._set_property('bend', bend)
-
-#     @property
-#     def xdim(self):
-#         return self._colldb['xdim']
-
-#     @xdim.setter
-#     def xdim(self, xdim):
-#         self._set_property('xdim', xdim)
-
-#     @property
-#     def ydim(self):
-#         return self._colldb['ydim']
-
-#     @ydim.setter
-#     def ydim(self, ydim):
-#         self._set_property('ydim', ydim)
-
-#     @property
-#     def miscut(self):
-#         return self._colldb['miscut']
-
-#     @miscut.setter
-#     def miscut(self, miscut):
-#         self._set_property('miscut', miscut)
-
-#     @property
-#     def thick(self):
-#         return self._colldb['thick']
-
-#     @thick.setter
-#     def thick(self, thick):
-#         self._set_property('thick', thick)
-
-    @property
-    def s_center(self):
-        return self._colldb['s_center']
-
-    @property
-    def collimator_type(self):
-        return self._colldb['collimator_type']
-
-    @property
-    def active_length(self):
-        return self._colldb['active_length']
-
-    @active_length.setter
-    def active_length(self, length):
-        self._set_property('active_length', length)
-        self.align_to = {}
-
-    @property
-    def inactive_front(self):
-        return self._colldb['inactive_front']
-
-    @inactive_front.setter
-    def inactive_front(self, length):
-        self._set_property('inactive_front', length)
-
-    @property
-    def inactive_back(self):
-        return self._colldb['inactive_back']
-
-    @inactive_back.setter
-    def inactive_back(self, length):
-        self._set_property('inactive_back', length)
-
-    @property
-    def total_length(self):
-        return self._colldb['active_length'] +  self._colldb['inactive_front'] + self._colldb['inactive_back']
-
-    @property
-    def gap(self):
-        gaps = np.array([self._colldb.gap_L.values,self._colldb.gap_R.values])
-        return pd.Series([ L if L == R else [L,R] for L, R in gaps.T ], index=self._colldb.index, dtype=object)
-
-    @gap.setter
-    def gap(self, gaps):
-        df = self._colldb
-        correct_format = False
-        # The variable gaps is a Series or a list
-        if isinstance(gaps, pd.Series) or isinstance(gaps, list) or isinstance(gaps, np.ndarray):
-            correct_format = True
-            if len(gaps) != len(self.name):
-                raise ValueError("The variable 'gaps' has a different length than the number "
-                                + "of collimators in the CollimatorDatabase. Use a dictionary instead.")
-            # Some of the gaps are list (e.g. two different values for both gaps): loop over gaps as dict
-            if any(hasattr(gap, '__iter__') for gap in gaps):
-                gaps = dict(zip(self.name, gaps))
-            # All gaps are single values: use pandas-style assignment
-            else:
-                # mask those that have an active side for the gap under consideration
-                # and have a setting less than 900; the others are set to None
-                mask_L = np.logical_and(df.side.isin(['both','left']), ~(gaps >= 900))
-                mask_R = np.logical_and(df.side.isin(['both','right']), ~(gaps >= 900))
-                df.loc[mask_L, 'gap_L'] = gaps[mask_L]
-                df.loc[~mask_L, 'gap_L'] = None
-                df.loc[mask_R, 'gap_R'] = gaps[mask_R]
-                df.loc[~mask_R, 'gap_R'] = None
-
-        # The variable gaps is a dictionary
-        if isinstance(gaps, dict):
-            correct_format = True
-            for name, gap in gaps.items():
-                if name not in self.name:
-                    raise ValueError(f"Collimator {name} not found in CollimatorDatabase!")
-                side = df.side[name]
-                if hasattr(gap, '__iter__'):
-                    if isinstance(gap, str):
-                        raise ValueError("The gap setting has to be a number!")
-                    elif len(gap) == 2:
-                        gap_L = gap[0]
-                        gap_R = gap[1]
-                        if side != 'both':
-                            if side == 'left' and gap_R is not None:
-                                print(f"Warning: collimator {name} is left-sided but a finite right gap is specified. "
-                                      + "Verify that this is what you want.")
-                            elif side == 'right' and gap_L is not None:
-                                print(f"Warning: collimator {name} is right-sided but a finite left gap is specified. "
-                                      + "Verify that this is what you want.")
-                    elif len(gap) == 1:
-                        gap_L = gap[0] if side in ['both','left'] else None
-                        gap_R = gap[0] if side in ['both','right'] else None
-                    else:
-                        raise ValueError("The gap setting must have one or two values (for the left and the right jaw)!")
-                else:
-                    gap_L = gap if side in ['both','left'] else None
-                    gap_R = gap if side in ['both','right'] else None
-                gap_L = None if (gap_L is not None and gap_L >= 900) else gap_L
-                gap_R = None if (gap_R is not None and gap_R >= 900) else gap_R
-                df.loc[name, 'gap_L'] = gap_L
-                df.loc[name, 'gap_R'] = gap_R
-
-        if not correct_format:
-            raise ValueError("Variable 'gaps' needs to be a pandas Series, dict, numpy array, or list!")
-
-        df.gap_L = df.gap_L.astype('object', copy=False)
-        df.gap_R = df.gap_R.astype('object', copy=False)
-        self._compute_jaws()
-
-    @property
-    def jaw(self):
-        jaws = list(np.array([
-                        self._colldb.jaw_LU.values,
-                        self._colldb.jaw_RU.values,
-                        self._colldb.jaw_LD.values,
-                        self._colldb.jaw_RD.values
-                    ]).T)
-        # Need special treatment if there are None's
-        def flip(jaw):
-            return None if jaw is None else -jaw
-        for i, jaw in enumerate(jaws):
-            # All 4 jaw points are the same
-            if jaw[0] == flip(jaw[1]) == jaw[2] == flip(jaw[3]):
-                jaws[i] = jaw[0]
-            # Upstream and downstream jaws are the same
-            # (all cases except angular alignment and/or tilt)
-            elif jaw[0] == jaw[2] and jaw[1] == jaw[3]:
-                jaws[i] = [ jaw[0], jaw[1] ]
-            else:
-                jaws[i] = [ [jaw[0],jaw[1]], [jaw[2],jaw[3]] ]
-        return pd.Series(jaws, index=self._colldb.index, dtype=object)
-
-    @property
-    def side(self):
-        return self._colldb.side
-
-    @side.setter
-    def side(self, sides):
-        self._set_property('side', sides, single_default_allowed=True)
-        self.gap = self.gap
-
-    @property
-    def gamma_rel(self):
-        return np.sqrt(self._beta_gamma_rel**2+1)
-
-    @gamma_rel.setter
-    def gamma_rel(self, gamma_rel):
-        self._beta_gamma_rel = np.sqrt(gamma_rel**2-1)
-        self._compute_jaws()
-
-    @property
-    def emittance(self):
-        return [self._emitx, self._emity]
-
-    @emittance.setter
-    def emittance(self, emit):
-        if hasattr(emit, '__iter__'):
-            if isinstance(emit, str):
-                raise ValueError(f"The 'emit' setting has to be a number!")
-            elif len(emit) == 2:
-                self._emitx = emit[0]
-                self._emity = emit[1]
-            elif len(emit) == 1:
-                self._emitx = emit[0]
-                self._emity = emit[0]
-            else:
-                raise ValueError(f"The 'emit' setting must have one or two values (for emitx and emity)!")
-        else:
-            self._emitx = emit
-            self._emity = emit
-        self._compute_jaws()
-
-    @property
-    def align_to(self):
-        return self._colldb.align_to
-
-    @align_to.setter
-    def align_to(self, align):
-        self._set_property('align_to', align, single_default_allowed=True, limit_to=['front', 'center', 'back', 'angular'])
-        if np.any(self.align_to == 'maximum'):
-            raise NotImplementedError
-        s_front = self.s_center - self.active_length/2
-        s_center = self.s_center
-        s_back = self.s_center + self.active_length/2
-        mask = self.align_to == 'front'
-        self._colldb.loc[mask,'s_align_front'] = s_front[mask]
-        self._colldb.loc[mask,'s_align_back']  = s_front[mask]
-        mask = self.align_to == 'center'
-        self._colldb.loc[mask,'s_align_front'] = s_center[mask]
-        self._colldb.loc[mask,'s_align_back']  = s_center[mask]
-        mask = self.align_to == 'back'
-        self._colldb.loc[mask,'s_align_front'] = s_back[mask]
-        self._colldb.loc[mask,'s_align_back']  = s_back[mask]
-        mask = self.align_to == 'angular'
-        self._colldb.loc[mask,'s_align_front'] = s_front[mask]
-        self._colldb.loc[mask,'s_align_back']  = s_back[mask]
-        self._compute_jaws()
-
-    # TODO: when does this need to be unset?
-    @property
-    def _optics_is_ready(self):
-        pos = set(self._colldb.s_align_front.values) | set(self._colldb.s_align_back.values)
-        return np.all([s in self._optics.index for s in pos]) and self._beta_gamma_rel is not None
-
-    @property
-    def betx(self):
-        vals = np.array([
-            [ self._optics.loc[s,'betx'] if s in self._optics.index else None for s in self._colldb.s_align_front.values ],
-            [ self._optics.loc[s,'betx'] if s in self._optics.index else None for s in self._colldb.s_align_back.values ]
-        ])
-        return pd.Series([ F if F == B else [F,B] for F,B in vals.T ], index=self._colldb.index, dtype=object)
-
-    @property
-    def bety(self):
-        vals = np.array([
-            [ self._optics.loc[s,'bety'] if s in self._optics.index else None for s in self._colldb.s_align_front.values ],
-            [ self._optics.loc[s,'bety'] if s in self._optics.index else None for s in self._colldb.s_align_back.values ]
-        ])
-        return pd.Series([ F if F == B else [F,B] for F,B in vals.T ], index=self._colldb.index, dtype=object)
-
-    @property
-    def alfx(self):
-        vals = np.array([
-            [ self._optics.loc[s,'alfx'] if s in self._optics.index else None for s in self._colldb.s_align_front.values ],
-            [ self._optics.loc[s,'alfx'] if s in self._optics.index else None for s in self._colldb.s_align_back.values ]
-        ])
-        return pd.Series([ F if F == B else [F,B] for F,B in vals.T ], index=self._colldb.index, dtype=object)   
-
-    @property
-    def alfy(self):
-        vals = np.array([
-            [ self._optics.loc[s,'alfy'] if s in self._optics.index else None for s in self._colldb.s_align_front.values ],
-            [ self._optics.loc[s,'alfy'] if s in self._optics.index else None for s in self._colldb.s_align_back.values ]
-        ])
-        return pd.Series([ F if F == B else [F,B] for F,B in vals.T ], index=self._colldb.index, dtype=object)
-    
-    @property
-    def dx(self):
-        vals = np.array([
-            [ self._optics.loc[s,'dx'] if s in self._optics.index else None for s in self._colldb.s_align_front.values ],
-            [ self._optics.loc[s,'dx'] if s in self._optics.index else None for s in self._colldb.s_align_back.values ]
-        ])
-        return pd.Series([ F if F == B else [F,B] for F,B in vals.T ], index=self._colldb.index, dtype=object)
-
-    @property
-    def dy(self):
-        vals = np.array([
-            [ self._optics.loc[s,'dy'] if s in self._optics.index else None for s in self._colldb.s_align_front.values ],
-            [ self._optics.loc[s,'dy'] if s in self._optics.index else None for s in self._colldb.s_align_back.values ]
-        ])
-        return pd.Series([ F if F == B else [F,B] for F,B in vals.T ], index=self._colldb.index, dtype=object)
-    
-    @property
-    def x(self):
-        vals = np.array([
-            [ self._optics.loc[s,'x'] if s in self._optics.index else None for s in self._colldb.s_align_front.values ],
-            [ self._optics.loc[s,'x'] if s in self._optics.index else None for s in self._colldb.s_align_back.values ]
-        ])
-        return pd.Series([ F if F == B else [F,B] for F,B in vals.T ], index=self._colldb.index, dtype=object)
-
-    @property
-    def px(self):
-        vals = np.array([
-            [ self._optics.loc[s,'px'] if s in self._optics.index else None for s in self._colldb.s_align_front.values ],
-            [ self._optics.loc[s,'px'] if s in self._optics.index else None for s in self._colldb.s_align_back.values ]
-        ])
-        return pd.Series([ F if F == B else [F,B] for F,B in vals.T ], index=self._colldb.index, dtype=object)
-
-    @property
-    def y(self):
-        vals = np.array([
-            [ self._optics.loc[s,'y'] if s in self._optics.index else None for s in self._colldb.s_align_front.values ],
-            [ self._optics.loc[s,'y'] if s in self._optics.index else None for s in self._colldb.s_align_back.values ]
-        ])
-        return pd.Series([ F if F == B else [F,B] for F,B in vals.T ], index=self._colldb.index, dtype=object)
-
-    @property
-    def py(self):
-        vals = np.array([
-            [ self._optics.loc[s,'py'] if s in self._optics.index else None for s in self._colldb.s_align_front.values ],
-            [ self._optics.loc[s,'py'] if s in self._optics.index else None for s in self._colldb.s_align_back.values ]
-        ])
-        return pd.Series([ F if F == B else [F,B] for F,B in vals.T ], index=self._colldb.index, dtype=object)
-
-    @property
-    def beam_size(self):
-        if self._optics_is_ready:
-            beam_size = np.array([self._beam_size_front,self._beam_size_back])
-            return pd.Series([ F if F == B else [F,B] for F, B in beam_size.T ], index=self._colldb.index, dtype=object)
+                if verbose: print(f"Installing {name:20} as EverestCrystal")
+                el = EverestCrystal(gap=self[name]['gap'], angle=self[name]['angle'],
+                                    length=self[name]['length'], side=self[name]['side'], material=mat[1],
+                                    lattice=self[name]['crystal'], bending_radius=self[name]['bending_radius'],
+                                    width=self[name]['width'], height=self[name]['height'],
+                                    miscut=self[name]['miscut'], _tracking=False)
+
+            # Check that collimator is not installed as different type
+            # TODO: automatically replace collimator type and print warning
+            if isinstance(line[name], tuple(collimator_classes)):
+                raise ValueError(f"Trying to install {name} as {el.__class__.__name__},"
+                               + f" but it is already installed as {line[name].__class__.__name__}!\n"
+                               + f"Please reconstruct the line.")
+
+            # TODO: only allow Marker elements, no Drifts!!
+            #       How to do this with importing a line for MAD-X or SixTrack...?
+            elif not isinstance(line[name], (xt.Marker, xt.Drift)):
+                raise ValueError(f"Trying to install {name} as {el.__class__.__name__},"
+                               + f" but the line element to replace is not an xtrack.Marker "
+                               + f"(or xtrack.Drift)!\nPlease check the name, or correct the "
+                               + f"element.")
+            el.emittance = [self.nemitt_x, self.nemitt_y]
+            elements.append(el)
+        install_elements(line, names, elements, need_apertures=need_apertures)
+
+    # ==================================
+    # ====== Accessing attributes ======
+    # ==================================
+
+    @property
+    def collimator_names(self):
+        return list(self._collimator_dict.keys())
+
+    @property
+    def collimator_families(self):
+        return self._family_dict.keys()
+
+    def __getattr__(self, name):
+        if name in self._family_dict:
+            return self._family_dict[name]
+        elif name in self._collimator_dict:
+            return self._collimator_dict[name]
         else:
-            return None
-
-    @property
-    def _beam_size_front(self):
-        # TODO: curretnly only for angle_L
-        df = self._colldb
-        opt = self._optics
-        betx = opt.loc[df.s_align_front,'betx'].astype(float)
-        bety = opt.loc[df.s_align_front,'bety'].astype(float)
-        sigmax = np.sqrt(betx*self._emitx/self._beta_gamma_rel)
-        sigmay = np.sqrt(bety*self._emity/self._beta_gamma_rel)
-        result = np.sqrt(
-                    (sigmax*np.cos(np.float_(df.angle_L.values)*np.pi/180))**2
-                    + (sigmay*np.sin(np.float_(df.angle_L.values)*np.pi/180))**2
-                )
-        result.index = self._colldb.index
-        return result
+            raise ValueError(f"Family nor collimator '{name}' found in CollimatorDatabase!")
 
-    @property
-    def _beam_size_back(self):
-        # TODO: curretnly only for angle_L
-        df = self._colldb
-        opt = self._optics
-        betx = opt.loc[df.s_align_back,'betx'].astype(float)
-        bety = opt.loc[df.s_align_back,'bety'].astype(float)
-        sigmax = np.sqrt(betx*self._emitx/self._beta_gamma_rel)
-        sigmay = np.sqrt(bety*self._emity/self._beta_gamma_rel)
-        result = np.sqrt(
-                    (sigmax*np.cos(np.float_(df.angle_L.values)*np.pi/180))**2
-                    + (sigmay*np.sin(np.float_(df.angle_L.values)*np.pi/180))**2
-                )
-        result.index = self._colldb.index
-        return result
-
-    # parking is defined with respect to closed orbit
-    # TODO: tilt
-    # 'upstr'  =>  'front'  en   'downstr'  =>  'back'
-    def _compute_jaws(self):
-        if self._optics_is_ready:
-            df = self._colldb
-            beam_size_front = self._beam_size_front
-            beam_size_back  = self._beam_size_back
-            jaw_LU = df['gap_L']*beam_size_front + self.offset
-            jaw_RU = df['gap_R']*beam_size_front - self.offset
-            jaw_LD = df['gap_L']*beam_size_back  + self.offset
-            jaw_RD = df['gap_R']*beam_size_back  - self.offset
-            df['jaw_LU'] = df['parking'] if df['gap_L'] is None else np.minimum(jaw_LU,df['parking'])
-            df['jaw_RU'] = -df['parking'] if df['gap_R'] is None else -np.minimum(jaw_RU,df['parking'])
-            df['jaw_LD'] = df['parking'] if df['gap_L'] is None else np.minimum(jaw_LD,df['parking'])
-            df['jaw_RD'] = -df['parking'] if df['gap_R'] is None else -np.minimum(jaw_RD,df['parking'])
-            # align crystals
-            opt = self._optics
-            df['align_angle'] = None
-            cry_mask = [c is not None for c in df.crystal]
-            df_cry = df[cry_mask]
-            if len(df_cry) > 0:
-                alfx = opt.loc[df_cry.s_align_front,'alfx'].astype(float).values
-                alfy = opt.loc[df_cry.s_align_front,'alfy'].astype(float).values
-                betx = opt.loc[df_cry.s_align_front,'betx'].astype(float).values
-                bety = opt.loc[df_cry.s_align_front,'bety'].astype(float).values
-                align_angle_x = -np.sqrt(self._emitx/self._beta_gamma_rel/betx)*alfx
-                align_angle_y = -np.sqrt(self._emity/self._beta_gamma_rel/bety)*alfy
-                align_angle = np.array([x if abs(ang) < 1e-6 else y
-                                        for x,y,ang in zip(align_angle_x,align_angle_y,df_cry.angle_L.values)])
-                df.loc[cry_mask, 'align_angle'] = align_angle*df_cry['gap_L']
-
-
-    # ---------------------------------------
-    # ------ Property setter functions ------
-    # ---------------------------------------
-
-    def _set_property(self, prop, vals, single_default_allowed=False, limit_to=[]):
-        df = self._colldb
-        if not isinstance(limit_to, (list, tuple, set)):
-            limit_to = [limit_to]
-        if isinstance(vals, dict):
-            for name, val in vals.items():
-                if name not in self.name:
-                    raise ValueError(f"Collimator {name} not found in CollimatorDatabase!")
-                if limit_to!=[] and val not in limit_to:
-                    raise ValueError(f"Cannot set {prop} to {val}. Choose from {limit_to}!")
-                df.loc[name, prop] = val
-        elif isinstance(vals, pd.Series) or isinstance(vals, list) or isinstance(vals, np.ndarray):
-            if len(vals) != len(self.name):
-                raise ValueError(f"The variable '{prop}' has a different length than the number of "
-                                + "collimators in the CollimatorDatabase. Use a dictionary instead.")
-            if limit_to!=[] and np.any([val not in limit_to for val in vals]):
-                raise ValueError(f"Cannot set {prop} to {vals}. Choose from {limit_to}!")
-            df[prop] = vals
+    def __getitem__(self, name):
+        if name in self._family_dict:
+            return self._family_dict[name]
+        elif name in self._collimator_dict:
+            return self._collimator_dict[name]
         else:
-            if single_default_allowed:
-                if limit_to!=[] and vals not in limit_to:
-                    raise ValueError(f"Cannot set {prop} to {vals}. Choose from {limit_to}!")
-                df[prop] = vals
-            else:
-                raise ValueError(f"Variable '{prop}' needs to be a pandas Series, dict, numpy array, or list!")
-
-
-    def _set_property_LR(self, prop, vals):
-        df = self._colldb
-        correct_format = False
-        # The variable vals is a Series or a list
-        if isinstance(vals, pd.Series) or isinstance(vals, list) or isinstance(vals, np.ndarray):
-            correct_format = True
-            if len(vals) != len(self.name):
-                raise ValueError(f"The variable '{prop}' has a different length than the number of "
-                                + "collimators in the CollimatorDatabase. Use a dictionary instead.")
-            # Some of the vals are list (e.g. two different values for both gaps): loop over vals as dict
-            if any(hasattr(val, '__iter__') for val in vals):
-                vals = dict(zip(self.name, vals))
-            # All gaps are single values: use pandas-style assignment
-            else:
-                df[prop + "_L"] = vals
-                df[prop + "_R"] = vals
+            raise ValueError(f"Family nor collimator '{name}' found in CollimatorDatabase!")
         
-        # The variable vals is a dictionary
-        if isinstance(vals, dict):
-            correct_format = True
-            for name, val in vals.items():
-                if name not in self.name:
-                    raise ValueError(f"Collimator {name} not found in CollimatorDatabase!")
-                if hasattr(val, '__iter__'):
-                    if isinstance(val, str):
-                        raise ValueError(f"The '{prop}' setting has to be a number!")
-                    elif len(val) == 2:
-                        val_L = val[0]
-                        val_R = val[1]
-                    elif len(val) == 1:
-                        val_L = val[0]
-                        val_R = val[0]
-                    else:
-                        raise ValueError(f"The '{prop}' setting must have one or two values (for the left and the right jaw)!")
-                else:
-                    val_L = val
-                    val_R = val
-                df.loc[name, prop + "_L"] = val_L
-                df.loc[name, prop + "_R"] = val_R
-
-        if not correct_format:
-            raise ValueError("Variable '{prop}' needs to be a pandas Series, dict, numpy array, or list!")
-
-        df[prop + "_L"] = df[prop + "_L"].astype('object', copy=False)
-        df[prop + "_R"] = df[prop + "_R"].astype('object', copy=False)
-        # Check if collimator active
-        # Check if gap is list (assymetric jaws)
+        
+