fiqus 2026.1.0__py3-none-any.whl → 2026.1.2__py3-none-any.whl

fiqus/mesh_generators/MeshMultipole.py

@@ -1,4 +1,6 @@
 import os
+import re
+
 import gmsh
 import copy
 import numpy as np
@@ -12,7 +14,7 @@ from fiqus.data import DataFiQuS as dF
 from fiqus.data import DataMultipole as dM
 from fiqus.data import RegionsModelFiQuS as rM
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('FiQuS')
 
 class Mesh:
     def __init__(self, data: dF.FDM() = None, mesh_folder: str = None,
@@ -36,7 +38,11 @@ class Mesh:
         self.occ = gmsh.model.occ
         self.mesh = gmsh.model.mesh
 
-        self.brep_iron_curves = {1: set(), 2: set(), 3: set(), 4: set()}
+        self.brep_curves = {}
+        for name in list(
+                set(self.data.magnet.geometry.electromagnetics.areas + self.data.magnet.geometry.thermal.areas)):
+            self.brep_curves[name] = {1: set(), 2: set(), 3: set(), 4: set()}
+
         self.mesh_parameters = dict.fromkeys(['SJ', 'SICN', 'SIGE', 'Gamma', 'nodes'])
         self.geom_files = os.path.join(os.path.dirname(self.mesh_folder), self.data.general.magnet_name)
         self.model_file = os.path.join(self.mesh_folder, self.data.general.magnet_name)
@@ -45,9 +51,11 @@ class Mesh:
         self.ins_type_cond = {}
         # Insulation sequence involving quench heaters (outlying or mid-layer/pole)
         qh_keys = {key: {} for key in range(1, self.data.quench_protection.quench_heaters.N_strips + 1)}
-        self.ins_type_qh = {'internal_double': {}, 'internal': copy.deepcopy(qh_keys), 'external': copy.deepcopy(qh_keys)}
+        self.ins_type_qh = {'internal_double': {}, 'internal': copy.deepcopy(qh_keys),
+                            'external': copy.deepcopy(qh_keys)}
         # Insulation sequence between blocks (layer-to-layer, pole-to-pole)
-        self.ins_type = {'mid_pole': {}, 'mid_winding': {}, 'mid_layer': {}, 'aux': {}}
+        self.ins_type = {'mid_pole': {}, 'mid_winding': {}, 'mid_layer': {}, 'aux': {}, 'collar': {}, 'poles': {}}
+
         self.qh_data, self.wedge_cond = {}, {}
 
         self.colors = {'wedges': [86, 180, 233],  # sky blue
@@ -63,7 +71,8 @@ class Mesh:
                        # key
                        'BHiron3': [220, 208, 46],  # dark yellow
                        # [230, 159, 0],  # orange
-                       # collar
+                       'BH_air': [255, 128, 0],  # also orange
+                       'Air': [255, 128, 0],  # also orange
                        'BHiron5': [204, 121, 167],  # hopbush
                        'BHiron6': [0, 114, 178],  # blue
                        'BHiron7': [204, 121, 167]}  # reddish purple
@@ -72,23 +81,30 @@ class Mesh:
         self.md = dM.MultipoleData()
         self.rc = dM.MultipoleRegionCoordinate()
         self.rm = rM.RegionsModel()
+        for name in self.brep_curves.keys():
+            self.brep_curves[name] = {1: set(), 2: set(), 3: set(), 4: set()}
         gmsh.clear()
 
     def ending_step(self, gui: bool = False):
         if gui:
             self.gu.launch_interactive_GUI()
         else:
-            gmsh.clear()
-            gmsh.finalize()
+            if gmsh.isInitialized():
+                gmsh.clear()
+                gmsh.finalize()
 
     def loadStrandPositions(self, run_type):
-        self.strands = json.load(open(f"{self.geom_files}_{run_type}.strs"))
+        with open(f"{self.geom_files}_{run_type}.strs", 'r') as f:
+            self.strands = json.load(f)
 
     def loadAuxiliaryFile(self, run_type):
         self.md = Util.read_data_from_yaml(f"{self.geom_files}_{run_type}.aux", dM.MultipoleData)
 
     def updateAuxiliaryFile(self, run_type):
         Util.write_data_to_yaml(f'{self.model_file}_{run_type}.aux', self.md.model_dump())
+        # md2 = Util.read_data_from_yaml(f"{self.geom_files}.aux", dM.MultipoleData)
+        # md2.domains.physical_groups = self.md.domains.physical_groups
+        # Util.write_data_to_yaml(f"{self.geom_files}.aux", md2.dict())
 
     def saveMeshFile(self, run_type):
         gmsh.write(f'{self.model_file}_{run_type}.msh')
@@ -99,11 +115,12 @@ class Mesh:
     def saveRegionCoordinateFile(self, run_type):
         Util.write_data_to_yaml(f'{self.model_file}_{run_type}.reco', self.rc.model_dump())
 
-    def getIronCurvesTags(self):
-        for quadrant, qq in self.md.geometries.iron.quadrants.items():
-            for _, area in qq.areas.items():
-                if area.surface:
-                    self.brep_iron_curves[quadrant] |= set(gmsh.model.getAdjacencies(2, area.surface)[1])
+    def getIronCurvesTags(self, physics_solved):
+        for t in self.data.magnet.geometry.electromagnetics.areas if physics_solved == 'EM' else self.data.magnet.geometry.thermal.areas:
+            for quadrant, qq in getattr(self.md.geometries, t).quadrants.items():
+                for ar_name, area in qq.areas.items():
+                    if area.surface and not re.match(r"^ar.h", ar_name):
+                        self.brep_curves[t][quadrant] |= set(gmsh.model.getAdjacencies(2, area.surface)[1])
 
     def defineMesh(self, geometry, mesh, run_type):
         thresholds = []
@@ -112,10 +129,14 @@ class Mesh:
         if mesh.conductors.field.enabled:
             distance_conductors = self.mesh.field.add("Distance")
             self.mesh.field.setNumbers(distance_conductors, "CurvesList",
-                                       [line for coil_nr, coil in self.md.geometries.coil.anticlockwise_order.coils.items() for layer_nr, layer in coil.layers.items()
-                                        for _, block_order in enumerate(layer) for _, line in self.md.geometries.coil.coils[coil_nr].poles[block_order.pole].layers[
-                                            layer_nr].windings[block_order.winding].blocks[block_order.block].half_turns.lines.items()]
-                                        )
+                                       [line for coil_nr, coil in
+                                        self.md.geometries.coil.anticlockwise_order.coils.items() for layer_nr, layer in
+                                        coil.layers.items()
+                                        for _, block_order in enumerate(layer) for _, line in
+                                        self.md.geometries.coil.coils[coil_nr].poles[block_order.pole].layers[
+                                            layer_nr].windings[block_order.winding].blocks[
+                                            block_order.block].half_turns.lines.items()]
+                                       )
             self.mesh.field.setNumber(distance_conductors, "Sampling", 100)
 
             threshold_conductors = self.mesh.field.add("Threshold")
@@ -130,8 +151,10 @@ class Mesh:
         if mesh.wedges.field.enabled:
             distance_wedges = self.mesh.field.add("Distance")
             self.mesh.field.setNumbers(distance_wedges, "CurvesList",
-                                       [line for _, coil in self.md.geometries.wedges.coils.items() for _, layer in coil.layers.items() for _, wdg in layer.wedges.items() for _, line in wdg.lines.items()]
-                                    )
+                                       [line for _, coil in self.md.geometries.wedges.coils.items() for _, layer in
+                                        coil.layers.items() for _, wdg in layer.wedges.items() for _, line in
+                                        wdg.lines.items()]
+                                       )
             self.mesh.field.setNumber(distance_wedges, "Sampling", 100)
 
             # raise Exception(f"cannot set threshold for wedges field: {[line for _, coil in self.md.geometries.wedges.coils.items() for _, layer in coil.layers.items() for _, wdg in layer.wedges.items() for _, line in wdg.lines.items()]}")
@@ -145,28 +168,37 @@ class Mesh:
             self.mesh.field.setNumber(threshold_wedges, "StopAtDistMax", 1)
             thresholds.append(threshold_wedges)
 
-        if geometry.with_iron_yoke:
-            distance_iron = self.mesh.field.add("Distance")
-            self.mesh.field.setNumbers(distance_iron, "CurvesList", [line for _, qq in self.brep_iron_curves.items() for line in qq])
-            self.mesh.field.setNumber(distance_iron, "Sampling", 100)
-
-            if mesh.iron_field.enabled:
-
-                threshold_iron = self.mesh.field.add("Threshold")
-                self.mesh.field.setNumber(threshold_iron, "InField", distance_iron)
-                self.mesh.field.setNumber(threshold_iron, "SizeMin", mesh.iron_field.SizeMin)
-                self.mesh.field.setNumber(threshold_iron, "SizeMax", mesh.iron_field.SizeMax)
-                self.mesh.field.setNumber(threshold_iron, "DistMin", mesh.iron_field.DistMin)
-                self.mesh.field.setNumber(threshold_iron, "DistMax", mesh.iron_field.DistMax)
-                # the iron field is typically rather coarse so that 'overwriting' other fields is not a problem
-                # its distMax however would need to be large for StopAtDistMax to be effective
-                #self.mesh.field.setNumber(threshold_iron, "StopAtDistMax", 1)
-                thresholds.append(threshold_iron)
+        for area in geometry.areas:
+            distance = self.mesh.field.add("Distance")
+            if not (area == 'collar' and self.data.magnet.mesh.thermal.collar.Enforce_TSA_mapping and run_type == 'TH'):
+                self.mesh.field.setNumbers(distance, "CurvesList",
+                                           [line for _, qq in self.brep_curves[area].items() for line in qq])
+            else:
+                # make sure this does not interfere with the enforced TSA mapping. Apply threshold to the inner collar points and the cooling holes
+                vals = [x for sublist in self.md.geometries.collar.inner_boundary_tags.values() for x in
+                        sublist]  ## flatten
+                self.mesh.field.setNumbers(distance, "PointsList", list(set([point[1] for point in
+                                                                             gmsh.model.getBoundary(
+                                                                                 [(1, line) for line in vals],
+                                                                                 combined=False, oriented=False)])))
+
+            self.mesh.field.setNumber(distance, "Sampling", 100)
+
+            k = area if area != 'iron_yoke' else 'iron_field'
+            if getattr(mesh, k).enabled:
+                threshold = self.mesh.field.add("Threshold")
+                self.mesh.field.setNumber(threshold, "InField", distance)
+                self.mesh.field.setNumber(threshold, "SizeMin", getattr(mesh, k).SizeMin)
+                self.mesh.field.setNumber(threshold, "SizeMax", getattr(mesh, k).SizeMax)
+                self.mesh.field.setNumber(threshold, "DistMin", getattr(mesh, k).DistMin)
+                self.mesh.field.setNumber(threshold, "DistMax", getattr(mesh, k).DistMax)
+                thresholds.append(threshold)
 
         if run_type == 'EM' and mesh.bore_field.enabled:
-
             distance_bore = self.mesh.field.add("Distance")
-            self.mesh.field.setNumbers(distance_bore, "PointsList", [pnt for pnt_name, pnt in self.md.geometries.air.points.items() if 'bore' in pnt_name])
+            self.mesh.field.setNumbers(distance_bore, "PointsList",
+                                       [pnt for pnt_name, pnt in self.md.geometries.air.points.items() if
+                                        'bore' in pnt_name])
             self.mesh.field.setNumber(distance_bore, "Sampling", 100)
 
             threshold_bore = self.mesh.field.add("Threshold")
@@ -178,11 +210,34 @@ class Mesh:
             self.mesh.field.setNumber(threshold_bore, "StopAtDistMax", 1)
             thresholds.append(threshold_bore)
 
+        if run_type == 'TH' and mesh.reference.enabled:  # add reference meshing between collar and insulation
+            """
+            (hardcoded) REFERENCE MESH for the FalconD-type magnet
+            """
+            if not 'collar' in geometry.areas:
+                raise Exception("Adding the reference segment without collar is not intended.")
+            distance_ref = self.mesh.field.add("Distance")
+            if self.data.general.magnet_name == 'TEST_MULTIPOLE_FALCOND_C_TSA_COLLAR_POLE':
+                lines = list(range(754, 855)) + list(range(910, 1011))
+                self.mesh.field.setNumbers(distance_ref, "CurvesList", lines)
+            else:
+                raise Exception("Reference meshing is not implemented for this magnet.")
+
+            self.mesh.field.setNumber(distance_ref, "Sampling", 100)
+
+            threshold_ref = self.mesh.field.add("Threshold")
+            self.mesh.field.setNumber(threshold_ref, "InField", distance_ref)
+            self.mesh.field.setNumber(threshold_ref, "SizeMin", mesh.reference.SizeMin)
+            self.mesh.field.setNumber(threshold_ref, "SizeMax", mesh.reference.SizeMax)
+            self.mesh.field.setNumber(threshold_ref, "DistMin", mesh.reference.DistMin)
+            self.mesh.field.setNumber(threshold_ref, "DistMax", mesh.reference.DistMax)
+            self.mesh.field.setNumber(threshold_ref, "StopAtDistMax", 1)
+            thresholds.append(threshold_ref)
+
         insulation_mesh_fields = []
         if run_type == 'TH':
             for coil_nr, coil in self.md.geometries.insulation.coils.items():
                 for _, group in coil.group.items():
-                    # Areas
                     for area_name, area in group.ins.areas.items():
                         if area_name.isdigit():
                             insulation_mesh_fields.append(self.mesh.field.add("Constant"))
@@ -206,40 +261,85 @@ class Mesh:
                             if mesh.model_dump().get('isothermal_conductors', False):
                                 elements = 1
                             elif any([i in line_key for i in ['i', 'o']]):
-                                elements = max(1, round(cable.bare_cable_height_mean / mesh.conductors.transfinite.curve_target_size_height))
+                                elements = max(1, round(
+                                    cable.bare_cable_height_mean / mesh.conductors.transfinite.curve_target_size_height))
                             elif any([i in line_key for i in ['l', 'h']]):
-                                elements = max(1, round(cable.bare_cable_width / mesh.conductors.transfinite.curve_target_size_width))
-                                
+                                elements = max(1, round(
+                                    cable.bare_cable_width / mesh.conductors.transfinite.curve_target_size_width))
+
                             self.mesh.setTransfiniteCurve(line, elements)
-                        if mesh.conductors.transfinite.enabled_for=='curves_and_surfaces' or mesh.model_dump().get('isothermal_conductors', False):
+                        if mesh.conductors.transfinite.enabled_for == 'curves_and_surfaces' or mesh.model_dump().get(
+                                'isothermal_conductors', False):
                             for _, area in winding.blocks[block_order.block].half_turns.areas.items():
                                 self.mesh.setTransfiniteSurface(area.surface)
                                 self.mesh.setRecombine(2, area.surface)
-        
+
         if 'insulation' in mesh.model_dump() and 'TSA' in mesh.model_dump()["insulation"]:
             # Apply transfinite curves to thin shell lines
             if geometry.use_TSA:
                 gts = self.md.geometries.thin_shells
-                conductor_target_sizes = {'width': mesh.conductors.transfinite.curve_target_size_width, 'height': mesh.conductors.transfinite.curve_target_size_height}
-                wedge_target_sizes = {'width': mesh.wedges.transfinite.curve_target_size_width, 'height': mesh.wedges.transfinite.curve_target_size_height}
-                for ts_group, side in zip([gts.mid_layers_ht_to_ht, gts.mid_layers_ht_to_wdg, gts.mid_layers_wdg_to_ht, gts.mid_layers_wdg_to_wdg,
-                                           gts.mid_poles, gts.mid_windings, gts.mid_turn_blocks, gts.mid_wedge_turn, gts.mid_layers_aux],
-                                          ['height', 'height', 'height', 'height', 'width', 'width', 'width', 'width', 'height']):
+                conductor_target_sizes = {'width': mesh.conductors.transfinite.curve_target_size_width,
+                                          'height': mesh.conductors.transfinite.curve_target_size_height}
+                wedge_target_sizes = {'width': mesh.wedges.transfinite.curve_target_size_width,
+                                      'height': mesh.wedges.transfinite.curve_target_size_height}
+                for ts_group, side in zip([gts.mid_layers_ht_to_ht, gts.mid_layers_ht_to_wdg, gts.mid_layers_wdg_to_ht,
+                                           gts.mid_layers_wdg_to_wdg,
+                                           gts.mid_poles, gts.mid_windings, gts.mid_turn_blocks, gts.mid_wedge_turn,
+                                           gts.mid_layers_aux],
+                                          ['height', 'height', 'height', 'height', 'width', 'width', 'width', 'width',
+                                           'height']):
                     for ts_name, ts in ts_group.items():
                         for _, line in ts.lines.items() if isinstance(ts, dM.Region) else ts.mid_layers.lines.items():
                             if mesh.isothermal_conductors or mesh.isothermal_wedges:
                                 elements = 1
                             else:
-                                coords = gmsh.model.getValue(1, line, [i[0] for i in gmsh.model.getParametrizationBounds(1, line)])
-                                target_size = wedge_target_sizes[side] if ts_name.count('w') == 2 else conductor_target_sizes[side]
+                                coords = gmsh.model.getValue(1, line, [i[0] for i in
+                                                                       gmsh.model.getParametrizationBounds(1, line)])
+                                target_size = wedge_target_sizes[side] if ts_name.count('w') == 2 else \
+                                conductor_target_sizes[side]
                                 elements = max(1, round(Func.points_distance(coords[:2], coords[3:-1]) / target_size))
-
                             # it's a wedge
-                            if ts_name.count('w') == 2 and mesh.wedges.transfinite.enabled_for in ['curves', 'curves_and_surfaces']:
+                            if ts_name.count('w') == 2 and mesh.wedges.transfinite.enabled_for in ['curves',
+                                                                                                   'curves_and_surfaces']:
                                 self.mesh.setTransfiniteCurve(line, elements)
-                            elif ts_name.count('w') != 2 and mesh.conductors.transfinite.enabled_for in ['curves', 'curves_and_surfaces']:
-                                self.mesh.setTransfiniteCurve(line, elements)   
-            # COMMENTED since this overwrites also the cable transfinite meshes and in general, 
+                            elif ts_name.count('w') != 2 and mesh.conductors.transfinite.enabled_for in ['curves',
+                                                                                                         'curves_and_surfaces']:
+                                self.mesh.setTransfiniteCurve(line, elements)
+
+            if geometry.use_TSA_new:
+                if not self.data.magnet.mesh.thermal.collar.Enforce_TSA_mapping:
+                    r_tmp = np.abs(Func.points_distance(coords[:2], [0, 0]))
+                    gts = self.md.geometries.thin_shells.collar_layers
+                    # conductor and wedge target sizes are defined above
+                    collar_size = None
+                    # accounts for the distance between the collar and the TSA line: should be col2 = col1*r2/r1. r_tmp is approx. distance outer ht to centre
+                    for ts_name, ts in gts.items():
+                        for name, line in ts.lines.items():
+                            coords = gmsh.model.getValue(1, line,
+                                                         [i[0] for i in gmsh.model.getParametrizationBounds(1, line)])
+                            if collar_size is None:
+                                collar_size = r_tmp / Func.points_distance(coords[:2], [0,
+                                                                                        0]) * self.data.magnet.mesh.thermal.collar.SizeMin
+                            target_size = min(
+                                wedge_target_sizes['width'] if ts_name.startswith('w') else conductor_target_sizes[
+                                    'width'], collar_size)
+                            elements = max(1, round(Func.points_distance(coords[:2], coords[3:-1]) / target_size))
+
+                            self.mesh.setTransfiniteCurve(line, elements)
+                else:  # since we force the mesh on the collar side anyway
+                    gts = self.md.geometries.thin_shells.collar_layers
+                    # conductor and wedge target sizes are defined above
+                    collar_size = self.data.magnet.mesh.thermal.collar.SizeMin
+                    for ts_name, ts in gts.items():
+                        for name, line in ts.lines.items():
+                            coords = gmsh.model.getValue(1, line,
+                                                         [i[0] for i in gmsh.model.getParametrizationBounds(1, line)])
+                            target_size = collar_size
+                            elements = max(1, round(Func.points_distance(coords[:2], coords[3:-1]) / target_size)) + 1
+                            if elements % 2 == 1: elements += 1
+                            self.mesh.setTransfiniteCurve(line, elements)
+
+            # COMMENTED since this overwrites also the cable transfinite meshes and in general,
             # restricting the insulation boundaries to be transfinite seems very restrictive due to their complex geometry
             # Apply transfinite curves to insulation boundaries
             # else:
@@ -264,24 +364,30 @@ class Mesh:
                     for layer_nr, layer in coil.layers.items():
                         for _, wedge in layer.wedges.items():
                             pnts = gmsh.model.getAdjacencies(1, wedge.lines['i'])[1]
-                            inner_height = Func.points_distance(gmsh.model.getValue(0, pnts[0], []), gmsh.model.getValue(0, pnts[1], []))
+                            inner_height = Func.points_distance(gmsh.model.getValue(0, pnts[0], []),
+                                                                gmsh.model.getValue(0, pnts[1], []))
                             pnts = gmsh.model.getAdjacencies(1, wedge.lines['l'])[1]
-                            width = Func.points_distance(gmsh.model.getValue(0, pnts[0], []), gmsh.model.getValue(0, pnts[1], []))
+                            width = Func.points_distance(gmsh.model.getValue(0, pnts[0], []),
+                                                         gmsh.model.getValue(0, pnts[1], []))
                             pnts = gmsh.model.getAdjacencies(1, wedge.lines['o'])[1]
-                            outer_height = Func.points_distance(gmsh.model.getValue(0, pnts[0], []), gmsh.model.getValue(0, pnts[1], []))
+                            outer_height = Func.points_distance(gmsh.model.getValue(0, pnts[0], []),
+                                                                gmsh.model.getValue(0, pnts[1], []))
                             for line_key, line in wedge.lines.items():
                                 if mesh.model_dump().get('isothermal_wedges', False):
                                     elements = 1
                                 elif 'i' in line_key:
-                                    elements = max(1, round(inner_height / mesh.wedges.transfinite.curve_target_size_height))
+                                    elements = max(1, round(
+                                        inner_height / mesh.wedges.transfinite.curve_target_size_height))
                                 elif 'o' in line_key:
-                                    elements = max(1, round((inner_height if mesh.wedges.transfinite.enabled_for in ['curves', 'curves_and_surfaces']
-                                                            else outer_height) / mesh.wedges.transfinite.curve_target_size_height))
+                                    elements = max(1, round((inner_height if mesh.wedges.transfinite.enabled_for in [
+                                        'curves', 'curves_and_surfaces']
+                                                             else outer_height) / mesh.wedges.transfinite.curve_target_size_height))
                                 elif any([i in line_key for i in ['l', 'h']]):
                                     elements = max(1, round(width / mesh.wedges.transfinite.curve_target_size_width))
                                 if mesh.wedges.transfinite.enabled_for in ['curves', 'curves_and_surfaces']:
                                     self.mesh.setTransfiniteCurve(line, elements)
-                            if mesh.wedges.transfinite.enabled_for=='curves_and_surfaces' or mesh.model_dump().get('isothermal_wedges', False):
+                            if mesh.wedges.transfinite.enabled_for == 'curves_and_surfaces' or mesh.model_dump().get(
+                                    'isothermal_wedges', False):
                                 self.mesh.setTransfiniteSurface(list(wedge.areas.values())[0].surface)
                                 self.mesh.setRecombine(2, list(wedge.areas.values())[0].surface)
 
@@ -291,31 +397,45 @@ class Mesh:
         """
         offset: int = 1 if 'symmetry' in geometry.model_dump() else int(1e6)
         pg_tag = offset
+        point_offset = 4000000
+        point_tag = offset
 
         # Create physical groups of iron yoke regions and block insulation
         pg = self.md.domains.physical_groups
-        for group_name, surfaces in self.md.domains.groups_entities.iron.items():
-            pg.iron.surfaces[group_name] = gmsh.model.addPhysicalGroup(2, surfaces, pg_tag)
-            gmsh.model.setPhysicalName(2, pg.iron.surfaces[group_name], group_name)
-            color = self.colors[group_name]
-            gmsh.model.setColor([(2, i) for i in surfaces], color[0], color[1], color[2])
-            pg_tag += 1
+        ge = self.md.domains.groups_entities
+
+        # Create the physical groups of iron + set color
+        group_keys = geometry.areas + ['ref_mesh']
+        for key in group_keys:
+            group_surfaces = getattr(ge, key)
+            pg_surfaces = getattr(pg, key).surfaces
+            for group_name, surfaces in group_surfaces.items():
+                pg_surfaces[group_name] = gmsh.model.addPhysicalGroup(2, surfaces, pg_tag)
+                gmsh.model.setPhysicalName(2, pg_surfaces[group_name], group_name)
+                if group_name not in self.colors:
+                    logger.warning(f"Color for group '{group_name}' not defined, using default color [0, 0, 0].")
+                color = self.colors.get(group_name, [0, 0, 0])
+                gmsh.model.setColor([(2, i) for i in surfaces], *color)
+                pg_tag += 1
 
-        # Create the physical group of air infinite
+        # Create the physical group of air infinite + set color of entities.air
         if 'symmetry' in geometry.model_dump():
             gmsh.model.setPhysicalName(0, gmsh.model.addPhysicalGroup(
-                0, [pnt for pnt_name, pnt in self.md.geometries.air.points.items() if 'bore_field' in pnt_name], pg_tag), 'bore_centers')
+                0, [pnt for pnt_name, pnt in self.md.geometries.air.points.items() if 'bore_field' in pnt_name],
+                pg_tag), 'bore_centers')
             pg_tag += 1
             pg.air_inf_bnd = gmsh.model.addPhysicalGroup(1, [self.md.geometries.air_inf.lines['outer']], pg_tag)
             gmsh.model.setPhysicalName(1, pg.air_inf_bnd, 'air_inf_bnd')
             pg_tag += 1
             pg.air_inf = gmsh.model.addPhysicalGroup(2, [self.md.geometries.air_inf.areas['outer'].surface], pg_tag)
             gmsh.model.setPhysicalName(2, pg.air_inf, 'air_inf')
-            gmsh.model.setColor([(2, self.md.geometries.air_inf.areas['outer'].surface)], self.colors['air_inf'][0], self.colors['air_inf'][1], self.colors['air_inf'][2])
+            gmsh.model.setColor([(2, self.md.geometries.air_inf.areas['outer'].surface)], self.colors['air_inf'][0],
+                                self.colors['air_inf'][1], self.colors['air_inf'][2])
             pg_tag += 1
-            pg.air = gmsh.model.addPhysicalGroup(2, self.md.domains.groups_entities.air, pg_tag)
+            pg.air = gmsh.model.addPhysicalGroup(2, ge.air, pg_tag)
             gmsh.model.setPhysicalName(2, pg.air, 'air')
-            gmsh.model.setColor([(2, i) for i in self.md.domains.groups_entities.air], self.colors['air'][0], self.colors['air'][1], self.colors['air'][2])
+            gmsh.model.setColor([(2, i) for i in ge.air], self.colors['air'][0], self.colors['air'][1],
+                                self.colors['air'][2])
             pg_tag += 1
 
         # Create physical groups of half turns
@@ -324,6 +444,7 @@ class Mesh:
             lyr_list_group.extend(['cl' + str(coil_nr) + 'ly' + str(lyr) for lyr in list(coil.layers.keys())])
             for layer_nr, layer in coil.layers.items():
                 ht_list_group = []
+                ht_nodes_group = []
                 for nr, block_order in enumerate(layer):
                     wnd = self.md.geometries.coil.coils[coil_nr].poles[block_order.pole].layers[
                         layer_nr].windings[block_order.winding]
@@ -348,35 +469,64 @@ class Mesh:
                         gmsh.model.setPhysicalName(2, ht_pg.tag, ht_key)
                         gmsh.model.setColor([(2, ht.surface)], color[0], color[1], color[2])
                         pg_tag += 1
+
                         # Assign thin-shell group
                         # the check for reversed block coil is not tested well
-                        if geometry.model_dump().get('correct_block_coil_tsa_checkered_scheme', False) and self.md.geometries.coil.coils[coil_nr].type == 'reversed-block-coil':
+                        if geometry.model_dump().get('correct_block_coil_tsa_checkered_scheme', False) and \
+                                self.md.geometries.coil.coils[coil_nr].type == 'reversed-block-coil':
                             azimuthal = 'a1' if list(wnd.blocks.keys()).index(block_nr) % 2 == 0 else 'a2'
                         else:
-                            azimuthal = 'a1' if lyr_list_group.index('cl' + str(coil_nr) + 'ly' + str(layer_nr)) % 2 == 0 else 'a2'
+                            azimuthal = 'a1' if lyr_list_group.index(
+                                'cl' + str(coil_nr) + 'ly' + str(layer_nr)) % 2 == 0 else 'a2'
                         radial = 'r1' if ht_list_group.index(ht_key) % 2 == 0 else 'r2'
                         ht_pg.group = radial + '_' + azimuthal
-                    if geometry.model_dump().get('use_TSA', False):
-                        # Create 1D physical groups of thin shells
-                        for ht_line_key, ht_line in block.half_turns.lines.items():
-                            ht_nr = ht_line_key[:-1]
-                            # Create half turn line groups
-                            line_pg = gmsh.model.addPhysicalGroup(1, [ht_line], pg_tag)
-                            gmsh.model.setPhysicalName(1, line_pg, ht_line_key)
-                            color = [0, 0, 0] if blk_pg.half_turns[int(ht_nr)].group[:2] == 'r1' else [150, 150, 150]
-                            gmsh.model.setColor([(1, ht_line)], color[0], color[1], color[2])
-                            pg_tag += 1
-                            # Store thin shell tags
-                            blk_pg.half_turns[int(ht_nr)].lines[ht_line_key[-1]] = line_pg
+
+                    # Create 1D physical groups of thin shells
+                    for ht_line_key, ht_line in block.half_turns.lines.items():
+                        ht_nr = ht_line_key[:-1]
+                        # Create half turn line groups
+                        line_pg = gmsh.model.addPhysicalGroup(1, [ht_line], pg_tag)
+                        gmsh.model.setPhysicalName(1, line_pg, ht_line_key)
+                        color = [0, 0, 0] if blk_pg.half_turns[int(ht_nr)].group[:2] == 'r1' else [150, 150, 150]
+                        gmsh.model.setColor([(1, ht_line)], color[0], color[1], color[2])
+                        pg_tag += 1
+                        # Store thin shell tags
+                        blk_pg.half_turns[int(ht_nr)].lines[ht_line_key[-1]] = line_pg
+
+                    # Add single_node per half turn for EM mesh
+                    for ht_key, ht in block.half_turns.areas.items():
+                        inner_line = \
+                        gmsh.model.getEntitiesForPhysicalGroup(1, blk_pg.half_turns[int(ht_key)].lines['i'])[0]
+                        inner_nodes = gmsh.model.getBoundary([(1, inner_line)])
+
+                        higher_line = \
+                        gmsh.model.getEntitiesForPhysicalGroup(1, blk_pg.half_turns[int(ht_key)].lines['h'])[0]
+                        higher_nodes = gmsh.model.getBoundary([(1, higher_line)])
+
+                        single_node = list(set(inner_nodes) & set(higher_nodes))[0][1]
+                        blk_pg.half_turns[int(ht_key)].single_node = gmsh.model.addPhysicalGroup(0, [single_node],
+                                                                                                 point_offset + point_tag,
+                                                                                                 f"{ht_key}_single_node")
+
+                        point_tag += 1
 
         # Create points region for projection
         if 'use_TSA' in geometry.model_dump():
-            self.md.domains.physical_groups.half_turns_points = gmsh.model.addPhysicalGroup(
-                0, [gmsh.model.getAdjacencies(1, gmsh.model.getAdjacencies(2, ht.surface)[1][0])[1][0]
-                    for coil_nr, coil in self.md.geometries.coil.anticlockwise_order.coils.items()
-                    for layer_nr, layer in coil.layers.items() for block_order in layer
-                    for ht_key, ht in self.md.geometries.coil.coils[coil_nr].poles[block_order.pole].layers[
-                        layer_nr].windings[block_order.winding].blocks[block_order.block].half_turns.areas.items()], int(4e6))
+            point_list = [gmsh.model.getAdjacencies(1, gmsh.model.getAdjacencies(2, ht.surface)[1][0])[1][0]
+                          for coil_nr, coil in self.md.geometries.coil.anticlockwise_order.coils.items()
+                          for layer_nr, layer in coil.layers.items() for block_order in layer
+                          for ht_key, ht in self.md.geometries.coil.coils[coil_nr].poles[block_order.pole].layers[
+                              layer_nr].windings[block_order.winding].blocks[
+                              block_order.block].half_turns.areas.items()]
+            ### add one point per wedge
+            wdg_points = []
+            for coil_nr, coil in self.md.geometries.wedges.coils.items():
+                for layer_nr, layer in coil.layers.items():
+                    for wedge_nr, wedge in layer.wedges.items():
+                        wdg_points.append(list(gmsh.model.getAdjacencies(2, wedge.areas[str(wedge_nr)].surface)[1])[0])
+
+            self.md.domains.physical_groups.half_turns_points = gmsh.model.addPhysicalGroup(0, wdg_points + point_list,
+                                                                                            int(4e6))
             gmsh.model.setPhysicalName(0, self.md.domains.physical_groups.half_turns_points, 'points')
 
         # Create physical groups of insulations
@@ -388,13 +538,16 @@ class Mesh:
                         if area_name.isdigit():
                             pg.insulations.surfaces[area_name] = gmsh.model.addPhysicalGroup(2, [area.surface], pg_tag)
                             gmsh.model.setPhysicalName(2, pg.insulations.surfaces[area_name], 'insul_' + area_name)
-                            gmsh.model.setColor([(2, area.surface)], self.colors['insul'][0], self.colors['insul'][1], self.colors['insul'][2])
+                            gmsh.model.setColor([(2, area.surface)], self.colors['insul'][0], self.colors['insul'][1],
+                                                self.colors['insul'][2])
                             pg_tag += 1
-                    
+
                     # Boundaries
                     area_name = list(group.ins.areas.keys())[0]  # todo: test for Mono
                     pg.insulations.curves['ext' + area_name] = gmsh.model.addPhysicalGroup(
-                        1, [bnd[1] for bnd in gmsh.model.getBoundary([(2, list(group.ins.areas.values())[0].surface)], combined=False, oriented=False)[:len(group.ins.lines)]], pg_tag)
+                        1, [bnd[1] for bnd in
+                            gmsh.model.getBoundary([(2, list(group.ins.areas.values())[0].surface)], combined=False,
+                                                   oriented=False)[:len(group.ins.lines)]], pg_tag)
                     gmsh.model.setPhysicalName(1, pg.insulations.curves['ext' + area_name], 'insul_ext' + area_name)
                     pg_tag += 1
                     # todo: NOT COMPLETED: would work if the tags were updated in the Geometry script after saving and loading brep
@@ -424,14 +577,13 @@ class Mesh:
                     else:
                         prev_group = prev_block_hts[list(prev_block_hts.keys())[0]].group
                         wedge_pg.group = ('r1' if prev_group[1] == '2' else 'r2') + prev_group[prev_group.index('_'):]
-                    if geometry.model_dump().get('use_TSA', False):
-                        # Create 1D physical groups of thin shells
-                        for line_key, line in wedge.lines.items():
-                            wedge_pg.lines[line_key] = gmsh.model.addPhysicalGroup(1, [line], pg_tag)
-                            gmsh.model.setPhysicalName(1, wedge_pg.lines[line_key], 'w' + str(wedge_nr) + line_key)
-                            color = [0, 0, 0] if wedge_pg.group[:2] == 'r1' else [150, 150, 150]
-                            gmsh.model.setColor([(1, line)], color[0], color[1], color[2])
-                            pg_tag += 1
+
+                    for line_key, line in wedge.lines.items():
+                        wedge_pg.lines[line_key] = gmsh.model.addPhysicalGroup(1, [line], pg_tag)
+                        gmsh.model.setPhysicalName(1, wedge_pg.lines[line_key], 'w' + str(wedge_nr) + line_key)
+                        color = [0, 0, 0] if wedge_pg.group[:2] == 'r1' else [150, 150, 150]
+                        gmsh.model.setColor([(1, line)], color[0], color[1], color[2])
+                        pg_tag += 1
 
         # Create physical groups of thin shells
         if geometry.model_dump().get('use_TSA', False):
@@ -441,8 +593,11 @@ class Mesh:
             for ts_name, ts in gts.mid_layers_ht_to_ht.items():
                 blk_i, blk_o = ts_name[:ts_name.index('_')], ts_name[ts_name.index('_') + 1:]
                 for coil_nr, coil in self.md.geometries.coil.anticlockwise_order.coils.items():
-                    if (any(int(blk_i) == blk_order.block for blk_order in self.md.geometries.coil.anticlockwise_order.coils[coil_nr].layers[1]) and
-                            any(int(blk_o) == blk_order.block for blk_order in self.md.geometries.coil.anticlockwise_order.coils[coil_nr].layers[1])):  # block-coil mid-pole case
+                    if (any(int(blk_i) == blk_order.block for blk_order in
+                            self.md.geometries.coil.anticlockwise_order.coils[coil_nr].layers[1]) and
+                            any(int(blk_o) == blk_order.block for blk_order in
+                                self.md.geometries.coil.anticlockwise_order.coils[coil_nr].layers[
+                                    1])):  # block-coil mid-pole case
                         block_coil_flag = True
                 for line_name, line in ts.mid_layers.lines.items():
                     line_pg = gmsh.model.addPhysicalGroup(1, [line], pg_tag)
@@ -470,7 +625,8 @@ class Mesh:
                     gmsh.model.setPhysicalName(1, line_pg, line_name)
                     pg_tag += 1
                     pg.wedges[int(wdg[1:])].mid_layer_lines.outer[line_name] = line_pg
-                    ht = line_name[:line_name.index('_')] if line_name[line_name.index('_') + 1:] == wdg else line_name[line_name.index('_') + 1:]
+                    ht = line_name[:line_name.index('_')] if line_name[line_name.index('_') + 1:] == wdg else line_name[
+                        line_name.index('_') + 1:]
                     pg.blocks[int(blk)].half_turns[int(ht)].mid_layer_lines.inner[line_name] = line_pg
 
             # Create physical groups of block-to-wedge mid-layer lines
@@ -481,7 +637,8 @@ class Mesh:
                     gmsh.model.setPhysicalName(1, line_pg, line_name)
                     pg_tag += 1
                     pg.wedges[int(wdg[1:])].mid_layer_lines.inner[line_name] = line_pg
-                    ht = line_name[:line_name.index('_')] if line_name[line_name.index('_') + 1:] == wdg else line_name[line_name.index('_') + 1:]
+                    ht = line_name[:line_name.index('_')] if line_name[line_name.index('_') + 1:] == wdg else line_name[
+                        line_name.index('_') + 1:]
                     pg.blocks[int(blk)].half_turns[int(ht)].mid_layer_lines.outer[line_name] = line_pg
 
             # Create physical groups of wedge-to-wedge mid-layer lines
@@ -495,7 +652,8 @@ class Mesh:
 
             # Create non-mid-layer thin shells
             for ts_group_name, ts_group in zip(['mid_pole', 'mid_winding', 'mid_turn', 'mid_turn', 'aux'],
-                                               [gts.mid_poles, gts.mid_windings, gts.mid_turn_blocks, gts.mid_wedge_turn, gts.mid_layers_aux]):
+                                               [gts.mid_poles, gts.mid_windings, gts.mid_turn_blocks,
+                                                gts.mid_wedge_turn, gts.mid_layers_aux]):
                 for ts_name, ts in ts_group.items():
                     if '_' in ts_name:
                         el_name1, el_name2 = ts_name.split('_')
@@ -510,11 +668,81 @@ class Mesh:
                             ht1 = int(list(ts.points.keys())[0][:-1])
                         else:
                             ht1, ht2 = line_name.split('_')
-                            pg.blocks[int(el_name2)].half_turns[int(ht2)].__dict__[ts_group_name + '_lines'][line_name] = line_pg
+                            pg.blocks[int(el_name2)].half_turns[int(ht2)].__dict__[ts_group_name + '_lines'][
+                                line_name] = line_pg
                         if ts_name[0] == 'w':
                             pg.wedges[int(el_name1)].__dict__[ts_group_name + '_lines'][line_name] = line_pg
                         else:
-                            pg.blocks[int(el_name1)].half_turns[int(ht1)].__dict__[ts_group_name + '_lines'][line_name] = line_pg
+                            pg.blocks[int(el_name1)].half_turns[int(ht1)].__dict__[ts_group_name + '_lines'][
+                                line_name] = line_pg
+
+        # Create physical groups for TSL
+        # add the physical group inner collar lines, only nonempty for the thermal solution with collar
+        lines = []
+        for quad, tags in self.md.geometries.collar.outer_boundary_tags.items():
+            if 'poles' in self.data.magnet.geometry.thermal.areas:
+                lines.extend(tags[:-1])  # skip the last line, this is the line between the pole and collar
+            else:
+                lines.extend(tags)
+        gmsh.model.occ.synchronize()
+        tag = gmsh.model.addPhysicalGroup(1, lines)
+        gmsh.model.setPhysicalName(1, tag, "outer_col")
+        pg.outer_col = tag
+        gmsh.model.occ.synchronize()
+
+        if geometry.model_dump().get('use_TSA_new', False):
+            # line names are defined earlier when creating the geometry (so wedge and coil names are already separated)
+            # f'{ht_nr}_x' for ht to mid and f'w{wedge_idx}_x' for wdg to mid
+            # poles look like f'p{pole_idx}_x'
+            layer = self.md.geometries.thin_shells.collar_layers
+            for name, l in layer.items():
+                line = l.lines['1']  # default line name, contains only one line
+                line_pg = gmsh.model.addPhysicalGroup(1, [line])
+                gmsh.model.setPhysicalName(1, line_pg, name)
+                color = [0, 0, 0]
+                gmsh.model.setColor([(1, line)], color[0], color[1], color[2])
+                # self.ins_type_col['mid_lines'][name] = line_pg
+                self.ins_type['collar'][name] = line_pg
+
+            # only apply to TSA
+            # add the physical group inner collar lines
+            lines = []
+            for quad, tags in self.md.geometries.collar.inner_boundary_tags.items():
+                lines.extend(tags)
+            gmsh.model.occ.synchronize()
+            tag = gmsh.model.addPhysicalGroup(1, lines)
+            gmsh.model.setPhysicalName(1, tag, "inner_col")
+            pg.inner_col = tag
+            gmsh.model.occ.synchronize()
+
+            # do the same for the poles, if they are defined
+            if 'poles' in self.data.magnet.geometry.thermal.areas:
+                layer = self.md.geometries.thin_shells.pole_layers
+                for name, l in layer.items():
+                    line = l.lines['1']  # default line name, contains only one line
+                    line_pg = gmsh.model.addPhysicalGroup(1, [line])
+                    gmsh.model.setPhysicalName(1, line_pg, name)
+                    color = [0, 0, 0]
+                    gmsh.model.setColor([(1, line)], color[0], color[1], color[2])
+                    self.ins_type['poles'][name] = line_pg
+
+                lines = []
+                for quad, tags in self.brep_curves['poles'].items():
+                    lines.extend(tags)
+                    # maybe only select the lines relevant for TSA?
+                gmsh.model.occ.synchronize()
+                tag = gmsh.model.addPhysicalGroup(1, lines)
+                gmsh.model.setPhysicalName(1, tag, "pole_boundary")
+                pg.poles.curves["bdry"] = tag
+                gmsh.model.occ.synchronize()
+
+        # Create physical group of collar cooling boudnary
+        if self.data.magnet.solve.thermal.collar_cooling.enabled and 'use_TSA' in geometry.model_dump():
+            ## make physical group for collar cooling
+            tag = gmsh.model.addPhysicalGroup(1, self.md.geometries.collar.cooling_tags)
+            gmsh.model.setPhysicalName(1, tag, "collar cooling")
+            pg.collar_cooling = tag
+            gmsh.model.occ.synchronize()
 
         # Create physical groups of symmetric boundaries
         if geometry.model_dump().get('symmetry', 'none') != 'none':
@@ -524,8 +752,8 @@ class Mesh:
                     line_tags_normal_free = self.md.domains.groups_entities.symmetric_boundaries.y
                     line_tags_tangent_free = self.md.domains.groups_entities.symmetric_boundaries.x
                 elif len(self.md.geometries.coil.coils[1].poles) == 4:  # todo: think about other multi-pole types
-                    line_tags_tangent_free = self.md.domains.groups_entities.symmetric_boundaries.x +\
-                                         self.md.domains.groups_entities.symmetric_boundaries.y
+                    line_tags_tangent_free = self.md.domains.groups_entities.symmetric_boundaries.x + \
+                                             self.md.domains.groups_entities.symmetric_boundaries.y
             elif geometry.symmetry == 'x':
                 if 'solenoid' in self.md.geometries.coil.coils[1].type:
                     line_tags_normal_free = self.md.domains.groups_entities.symmetric_boundaries.x
@@ -551,18 +779,21 @@ class Mesh:
         qh = self.data.quench_protection.quench_heaters
 
         def _store_qh_data(position, thin_shell, ts_tag):
-            qh_ins = self.ins_type_qh[position][qh.ids[ht_index]]
+            qh_ins = self.ins_type_qh[position][qh.iQH_toHalfTurn_From[ht_index]]
             if thin_shell not in qh_ins: qh_ins[thin_shell] = []
             qh_ins[thin_shell].append(ts_tag)
-            if thin_shell not in self.qh_data[qh.ids[ht_index]]:
-                self.qh_data[qh.ids[ht_index]][thin_shell] = {'conductor': blk_pg.conductor, 'ht_side': qh_side}
+            if thin_shell not in self.qh_data[qh.iQH_toHalfTurn_From[ht_index]]:
+                self.qh_data[qh.iQH_toHalfTurn_From[ht_index]][thin_shell] = {'conductor': blk_pg.conductor,
+                                                                              'ht_side': qh_side}
 
         def _store_ts_tags(pg_el, geom_ts_name='', geom_ts_name2=None, ts_grp='', lines='', lines_side=None):
             geom_ts = self.md.geometries.thin_shells.model_dump()[geom_ts_name]
-            for ln_name, ln_tag in (pg_el.model_dump()[lines][lines_side] if lines_side else pg_el.model_dump()[lines]).items():
+            for ln_name, ln_tag in (
+            pg_el.model_dump()[lines][lines_side] if lines_side else pg_el.model_dump()[lines]).items():
                 for ts_name in ts_groups[ts_grp]:
                     if ts_name in geom_ts:
-                        if ln_name in (geom_ts[ts_name][geom_ts_name2]['lines'] if geom_ts_name2 else geom_ts[ts_name]['lines']):
+                        if ln_name in (
+                        geom_ts[ts_name][geom_ts_name2]['lines'] if geom_ts_name2 else geom_ts[ts_name]['lines']):
                             if ts_name not in self.ins_type[ts_grp]: self.ins_type[ts_grp][ts_name] = []
                             self.ins_type[ts_grp][ts_name].append(ln_tag)
                             break
@@ -570,21 +801,30 @@ class Mesh:
         # Collect thin shell tags
         # Half turns
         for blk_pg_nr, blk_pg in pg.blocks.items():
-            ts_groups = {'mid_wedge_turn': [ts_name for ts_name in self.md.geometries.thin_shells.mid_wedge_turn if blk_pg_nr == int(ts_name.split('_')[1])],
+            ts_groups = {'mid_wedge_turn': [ts_name for ts_name in self.md.geometries.thin_shells.mid_wedge_turn if
+                                            blk_pg_nr == int(ts_name.split('_')[1])],
                          'aux': [ts_name for ts_name in ins_th.mid_layer if str(blk_pg_nr) in ts_name.split('_')],
-                         'mid_winding': [ts_name for ts_name in ins_th.mid_winding if blk_pg_nr == int(ts_name.split('_')[0])],
-                         'mid_pole': [ts_name for ts_name in ins_th.mid_pole if blk_pg_nr == int(ts_name.split('_')[0])],
-                         'mid_layer': [ts_name for ts_name in ins_th.mid_layer if ts_name[0] != 'w' and blk_pg_nr == int(ts_name.split('_')[0])
-                                       or ts_name[0] == 'w' and ts_name.split('_')[1][0] != 'w' and blk_pg_nr == int(ts_name.split('_')[1])],
-                         'mid_layer_qh_i': [ts_name for ts_name in ins_th.mid_layer if ts_name.split('_')[1][0] != 'w' and blk_pg_nr == int(ts_name.split('_')[1])]}
+                         'mid_winding': [ts_name for ts_name in ins_th.mid_winding if
+                                         blk_pg_nr == int(ts_name.split('_')[0])],
+                         'mid_pole': [ts_name for ts_name in ins_th.mid_pole if
+                                      blk_pg_nr == int(ts_name.split('_')[0])],
+                         'mid_layer': [ts_name for ts_name in ins_th.mid_layer if
+                                       ts_name[0] != 'w' and blk_pg_nr == int(ts_name.split('_')[0])
+                                       or ts_name[0] == 'w' and ts_name.split('_')[1][0] != 'w' and blk_pg_nr == int(
+                                           ts_name.split('_')[1])],
+                         'mid_layer_qh_i': [ts_name for ts_name in ins_th.mid_layer if
+                                            ts_name.split('_')[1][0] != 'w' and blk_pg_nr == int(
+                                                ts_name.split('_')[1])]}
             ht_list = list(blk_pg.half_turns.keys())
             self.ins_type_cond[str(blk_pg_nr)] = {'inner': [], 'outer': [], 'higher': [], 'lower': [], 'mid_turn': []}
             for ht_nr, ht in blk_pg.half_turns.items():
-                if ht_nr in qh.turns and qh.N_strips > 0:  # check if a quench heater strip touches the current half-turn
-                    ht_index = qh.turns.index(ht_nr)
+                if ht_nr in qh.iQH_toHalfTurn_To and qh.N_strips > 0:  # check if a quench heater strip touches the current half-turn
+                    ht_index = qh.iQH_toHalfTurn_To.index(ht_nr)
                     qh_side = qh.turns_sides[ht_index]
-                    if qh.ids[ht_index] not in self.qh_data: self.qh_data[qh.ids[ht_index]] = {}
-                else: qh_side = ''
+                    if qh.iQH_toHalfTurn_From[ht_index] not in self.qh_data: self.qh_data[
+                        qh.iQH_toHalfTurn_From[ht_index]] = {}
+                else:
+                    qh_side = ''
 
                 # find conductor type of ht adjacent to wedge
                 if ht_list.index(ht_nr) == len(ht_list) - 1 and ht.mid_turn_lines:
@@ -594,7 +834,8 @@ class Mesh:
                                 self.wedge_cond[int(ts_name[1:ts_name.index('_')])] = blk_pg.conductor
                                 break
 
-                self.ins_type_cond[str(blk_pg_nr)]['mid_turn'].extend(list(ht.mid_turn_lines.values()))  # mid-turn insulation
+                self.ins_type_cond[str(blk_pg_nr)]['mid_turn'].extend(
+                    list(ht.mid_turn_lines.values()))  # mid-turn insulation
 
                 if ht.aux_lines:  # outer mid-layer insulation
                     _store_ts_tags(ht, geom_ts_name='mid_layers_aux', ts_grp='aux', lines='aux_lines')
@@ -606,12 +847,14 @@ class Mesh:
                                 ts_lines = self.md.geometries.thin_shells.mid_layers_ht_to_ht[ts_name].mid_layers.lines
                             elif ts_name in self.md.geometries.thin_shells.mid_layers_wdg_to_ht:
                                 ts_lines = self.md.geometries.thin_shells.mid_layers_wdg_to_ht[ts_name].lines
-                            else: ts_lines = []
+                            else:
+                                ts_lines = []
                             if line_name in ts_lines:
                                 _store_qh_data('internal', ts_name, line_tag)
                                 break
                 elif ht.mid_layer_lines.inner:  # block-coil (!) inner mid-layer insulation
-                    _store_ts_tags(ht, geom_ts_name='mid_layers_ht_to_ht', geom_ts_name2='mid_layers', ts_grp='mid_layer', lines='mid_layer_lines', lines_side='inner')
+                    _store_ts_tags(ht, geom_ts_name='mid_layers_ht_to_ht', geom_ts_name2='mid_layers',
+                                   ts_grp='mid_layer', lines='mid_layer_lines', lines_side='inner')
                 elif not ht.mid_layer_lines.inner and qh_side == 'i':  # quench heater inner insulation
                     _store_qh_data('external', blk_pg_nr, ht.lines['i'])
                 elif not ht.mid_layer_lines.inner:  # inner insulation
@@ -624,7 +867,8 @@ class Mesh:
                                 ts_lines = self.md.geometries.thin_shells.mid_layers_ht_to_ht[ts_name].mid_layers.lines
                             elif ts_name in self.md.geometries.thin_shells.mid_layers_ht_to_wdg:
                                 ts_lines = self.md.geometries.thin_shells.mid_layers_ht_to_wdg[ts_name].lines
-                            else: ts_lines = []
+                            else:
+                                ts_lines = []
                             if line_name in ts_lines:
                                 _store_qh_data('internal', ts_name, line_tag)
                                 break
@@ -635,7 +879,8 @@ class Mesh:
                                 ts_lines = self.md.geometries.thin_shells.mid_layers_ht_to_ht[ts_name].mid_layers.lines
                             elif ts_name in self.md.geometries.thin_shells.mid_layers_ht_to_wdg:
                                 ts_lines = self.md.geometries.thin_shells.mid_layers_ht_to_wdg[ts_name].lines
-                            else: ts_lines = []
+                            else:
+                                ts_lines = []
                             if line_name in ts_lines:
                                 if ts_name not in self.ins_type['mid_layer']: self.ins_type['mid_layer'][ts_name] = []
                                 self.ins_type['mid_layer'][ts_name].append(line_tag)
@@ -651,20 +896,29 @@ class Mesh:
                 # mid-winding insulation
                 _store_ts_tags(ht, geom_ts_name='mid_windings', ts_grp='mid_winding', lines='mid_winding_lines')
 
-                if ht_list.index(ht_nr) == 0 and len(ht.mid_turn_lines) + len(ht.mid_winding_lines) + len(ht.mid_pole_lines) == 1:  # lower angle external side insulation
-                    if qh_side == 'l': _store_qh_data('external', blk_pg_nr, ht.lines['l'])
-                    else: self.ins_type_cond[str(blk_pg_nr)]['lower'].append(ht.lines['l'])
-                if ht_list.index(ht_nr) == len(ht_list) - 1 and len(ht.mid_turn_lines) + len(ht.mid_winding_lines) + len(ht.mid_pole_lines) == 1:  # higher angle external side insulation
-                    if qh_side == 'h': _store_qh_data('external', blk_pg_nr, ht.lines['h'])
-                    else: self.ins_type_cond[str(blk_pg_nr)]['higher'].append(ht.lines['h'])
+                if ht_list.index(ht_nr) == 0 and len(ht.mid_turn_lines) + len(ht.mid_winding_lines) + len(
+                        ht.mid_pole_lines) == 1:  # lower angle external side insulation
+                    if qh_side == 'l':
+                        _store_qh_data('external', blk_pg_nr, ht.lines['l'])
+                    else:
+                        self.ins_type_cond[str(blk_pg_nr)]['lower'].append(ht.lines['l'])
+                if ht_list.index(ht_nr) == len(ht_list) - 1 and len(ht.mid_turn_lines) + len(
+                        ht.mid_winding_lines) + len(ht.mid_pole_lines) == 1:  # higher angle external side insulation
+                    if qh_side == 'h':
+                        _store_qh_data('external', blk_pg_nr, ht.lines['h'])
+                    else:
+                        self.ins_type_cond[str(blk_pg_nr)]['higher'].append(ht.lines['h'])
 
         # Wedges
         for wdg_pg_nr, wdg_pg in pg.wedges.items():
             ts_groups = {'aux': [ts_name for ts_name in ins_th.mid_layer if 'w' + str(wdg_pg_nr) in ts_name.split('_')],
-                         'mid_layer': [ts_name for ts_name in ins_th.mid_layer if 'w' + str(wdg_pg_nr) == ts_name.split('_')[0]]}
-            self.ins_type_cond['w' + str(wdg_pg_nr)] = {'inner': [], 'outer': [], 'higher': [], 'lower': [], 'mid_turn': []}
+                         'mid_layer': [ts_name for ts_name in ins_th.mid_layer if
+                                       'w' + str(wdg_pg_nr) == ts_name.split('_')[0]]}
+            self.ins_type_cond['w' + str(wdg_pg_nr)] = {'inner': [], 'outer': [], 'higher': [], 'lower': [],
+                                                        'mid_turn': []}
             if wdg_pg.aux_lines: _store_ts_tags(wdg_pg, geom_ts_name='mid_layers_aux', ts_grp='aux', lines='aux_lines')
-            if not wdg_pg.mid_layer_lines.inner: self.ins_type_cond['w' + str(wdg_pg_nr)]['inner'].append(wdg_pg.lines['i'])
+            if not wdg_pg.mid_layer_lines.inner: self.ins_type_cond['w' + str(wdg_pg_nr)]['inner'].append(
+                wdg_pg.lines['i'])
             if wdg_pg.mid_layer_lines.outer:
                 for line_name, line_tag in wdg_pg.mid_layer_lines.outer.items():
                     for ts_name in ts_groups['mid_layer']:
@@ -672,12 +926,14 @@ class Mesh:
                             ts_lines = self.md.geometries.thin_shells.mid_layers_wdg_to_ht[ts_name].lines
                         elif ts_name in self.md.geometries.thin_shells.mid_layers_wdg_to_wdg:
                             ts_lines = self.md.geometries.thin_shells.mid_layers_wdg_to_wdg[ts_name].lines
-                        else: ts_lines = []
+                        else:
+                            ts_lines = []
                         if line_name in ts_lines:
                             if ts_name not in self.ins_type['mid_layer']: self.ins_type['mid_layer'][ts_name] = []
                             self.ins_type['mid_layer'][ts_name].append(line_tag)
                             break
-            else: self.ins_type_cond['w' + str(wdg_pg_nr)]['outer'].append(wdg_pg.lines['o'])
+            else:
+                self.ins_type_cond['w' + str(wdg_pg_nr)]['outer'].append(wdg_pg.lines['o'])
 
         # Collect common thin shells for double qh mid-layers
         for qh_nr, ts_groups in self.ins_type_qh['internal'].items():
@@ -689,22 +945,28 @@ class Mesh:
                         common_tags = list(set(tags) & set(tags2))
                         for tag in common_tags:
                             tags.remove(tag), tags2.remove(tag)
-                            if self.qh_data[qh_nr2][ts]['ht_side'] == 'i': qh_name = str(qh_nr) + '_' + str(qh_nr2)
-                            else: qh_name = str(qh_nr2) + '_' + str(qh_nr)
-                            if qh_name not in self.ins_type_qh['internal_double']: self.ins_type_qh['internal_double'][qh_name] = {}
+                            if self.qh_data[qh_nr2][ts]['ht_side'] == 'i':
+                                qh_name = str(qh_nr) + '_' + str(qh_nr2)
+                            else:
+                                qh_name = str(qh_nr2) + '_' + str(qh_nr)
+                            if qh_name not in self.ins_type_qh['internal_double']: self.ins_type_qh['internal_double'][
+                                qh_name] = {}
                             qh_ins_id = self.ins_type_qh['internal_double'][qh_name]
                             if ts not in qh_ins_id: qh_ins_id[ts] = []
                             qh_ins_id[ts].append(tag)
 
     def assignRegionsTags(self, geometry, mesh):
         def _get_input_insulation_data(i_name, i_type=None):
-            ow_idx = next((index for index, couple in enumerate(self.data.magnet.solve.thermal.insulation_TSA.block_to_block.blocks_connection_overwrite)
+            ow_idx = next((index for index, couple in enumerate(
+                self.data.magnet.solve.thermal.insulation_TSA.block_to_block.blocks_connection_overwrite)
                            if all(element in couple for element in i_name.split('_'))), None)
-            if i_type == 'mid_winding': mid_mat, mid_th = [self.data.magnet.solve.wedges.material], []
+            if i_type == 'mid_winding':
+                mid_mat, mid_th = [self.data.magnet.solve.wedges.material], []
             elif ow_idx is not None:
                 mid_mat = self.data.magnet.solve.thermal.insulation_TSA.block_to_block.materials_overwrite[ow_idx]
                 mid_th = self.data.magnet.solve.thermal.insulation_TSA.block_to_block.thicknesses_overwrite[ow_idx]
-            else: mid_mat, mid_th = [self.data.magnet.solve.thermal.insulation_TSA.block_to_block.material], []
+            else:
+                mid_mat, mid_th = [self.data.magnet.solve.thermal.insulation_TSA.block_to_block.material], []
             return mid_mat, mid_th
 
         def _compute_insulation_thicknesses(tot_th, known_ins_th):
@@ -712,12 +974,17 @@ class Mesh:
                 mid_lyrs = [Func.sig_dig(tot_th - known_ins_th) / len(mid_materials)] * len(mid_materials)
             elif None in mid_thicknesses:
                 input_ths = sum([th for th in mid_thicknesses if th is not None])
-                mid_lyrs = [th if th is not None else Func.sig_dig(tot_th - known_ins_th - input_ths) / mid_thicknesses.count(None) for th in mid_thicknesses]
-            else: mid_lyrs = mid_thicknesses
+                mid_lyrs = [
+                    th if th is not None else Func.sig_dig(tot_th - known_ins_th - input_ths) / mid_thicknesses.count(
+                        None) for th in mid_thicknesses]
+            else:
+                mid_lyrs = mid_thicknesses
             zeros = [nbr for nbr, th in enumerate(mid_lyrs) if th < 1e-8]
             if tot_th - known_ins_th - sum(mid_lyrs) < -1e-8:
-                raise ValueError("Layer-to-layer insulation exceeds the space between blocks: check 'solve'->'insulation_TSA'->'block_to_block'->'thicknesses_overwrite'")
-            else: return mid_lyrs, zeros
+                raise ValueError(
+                    "Layer-to-layer insulation exceeds the space between blocks: check 'solve'->'insulation_TSA'->'block_to_block'->'thicknesses_overwrite'")
+            else:
+                return mid_lyrs, zeros
 
         pg = self.md.domains.physical_groups
         qh = self.data.quench_protection.quench_heaters
@@ -725,9 +992,9 @@ class Mesh:
         # Air and air far field
         if 'bore_field' in mesh.model_dump():
             self.rm.air_far_field.vol.radius_out = float(abs(max(gmsh.model.getValue(0, gmsh.model.getAdjacencies(
-                    1, self.md.geometries.air_inf.lines['outer'])[1][0], []), key=abs)))
+                1, self.md.geometries.air_inf.lines['outer'])[1][0], []), key=abs)))
             self.rm.air_far_field.vol.radius_in = float(abs(max(gmsh.model.getValue(0, gmsh.model.getAdjacencies(
-                    1, self.md.geometries.air_inf.lines['inner'])[1][0], []), key=abs)))
+                1, self.md.geometries.air_inf.lines['inner'])[1][0], []), key=abs)))
             self.rm.air.vol.name = "Air"
             self.rm.air.vol.number = pg.air
             self.rm.air_far_field.vol.names = ["AirInf"]
@@ -757,31 +1024,46 @@ class Mesh:
             if 'bore_field' in mesh.model_dump():
                 initial_current = self.data.power_supply.I_initial
                 self.rm.powered[group].vol.currents = []
+                self.rm.powered[group].curve.names = []
+                self.rm.powered[group].curve.numbers = []
+            self.rm.powered[group].surf_in.names = []
+            self.rm.powered[group].surf_in.numbers = []
+            if geometry.with_wedges:
+                self.rm.induced[group].surf_in.names = []
+                self.rm.induced[group].surf_in.numbers = []
             if geometry.model_dump().get('use_TSA', False):
-                self.rm.powered[group].surf_in.names = []
-                self.rm.powered[group].surf_in.numbers = []
                 self.rm.powered[group].surf_out.names = []
                 self.rm.powered[group].surf_out.numbers = []
                 if geometry.with_wedges:
-                    self.rm.induced[group].surf_in.names = []
-                    self.rm.induced[group].surf_in.numbers = []
                     self.rm.induced[group].surf_out.names = []
                     self.rm.induced[group].surf_out.numbers = []
-        if geometry.with_iron_yoke:
-            self.rm.iron_yoke.vol.names = []
-            self.rm.iron_yoke.vol.numbers = []
+
+        for attr in geometry.areas:
+            h = getattr(self.rm, attr).vol
+            h.names = []
+            h.numbers = []
+
+        # initialise reference
+        if self.data.magnet.mesh.thermal.reference.enabled:
+            self.rm.ref_mesh.vol.names = []
+            self.rm.ref_mesh.vol.numbers = []
+
+        self.rm.thin_shells.normals_directed['azimuthally'] = []
+        self.rm.thin_shells.normals_directed['radially'] = []
+
         if geometry.model_dump().get('use_TSA', False):
             unique_thin_shells = []
             self.rm.thin_shells.second_group_is_next['azimuthally'] = []
             self.rm.thin_shells.second_group_is_next['radially'] = []
-            self.rm.thin_shells.normals_directed['azimuthally'] = []
-            self.rm.thin_shells.normals_directed['radially'] = []
         else:
             self.rm.insulator.vol.names = []
             self.rm.insulator.vol.numbers = []
             self.rm.insulator.surf.names = []
             self.rm.insulator.surf.numbers = []
 
+        # always
+        if 'collar' in geometry.areas:
+            self.rm.thin_shells.bdry_curves['outer_collar'] = [pg.outer_col]
         if geometry.model_dump().get('use_TSA', False):
             # Categorize insulation types
             min_h = mesh.insulation.global_size
@@ -790,36 +1072,80 @@ class Mesh:
             #     min_h = min([self.data.conductors[conductor].cable.th_insulation_along_height,
             #                  self.data.conductors[conductor].cable.th_insulation_along_width, min_h])
             min_h_QH = mesh.insulation.TSA.global_size_QH if mesh.insulation.TSA.global_size_QH else min_h
+            min_h_COL = mesh.insulation.TSA.global_size_COL if mesh.insulation.TSA.global_size_QH else min_h
 
             # Conductor insulation layers
+            max_layer = len(
+                [k for k in self.md.geometries.coil.coils[1].poles[1].layers.keys()])  # todo: more elegant way ?
             for el, ins in self.ins_type_cond.items():
-                cond = self.data.conductors[self.wedge_cond[int(el[1:])]].cable if 'w' in el else self.data.conductors[pg.blocks[int(el)].conductor].cable
+                cond = self.data.conductors[self.wedge_cond[int(el[1:])]].cable if 'w' in el else self.data.conductors[
+                    pg.blocks[int(el)].conductor].cable
                 for ins_side, tags in ins.items():
                     if tags:
                         side_ins_type = [cond.material_insulation]
-                        if ins_side in ['inner', 'outer']: side_ins = [cond.th_insulation_along_width]
-                        elif ins_side in ['higher', 'lower']: side_ins = [cond.th_insulation_along_height]
+                        if ins_side in ['inner', 'outer']:
+                            side_ins = [cond.th_insulation_along_width]
+                        elif ins_side in ['higher', 'lower']:
+                            side_ins = [cond.th_insulation_along_height]
                         else:  # mid_turn
                             side_ins = [cond.th_insulation_along_height, cond.th_insulation_along_height]
                             side_ins_type.append(cond.material_insulation)
-                        if ins_side[0] in 'iohl' and el + ins_side[0] in self.data.magnet.solve.thermal.insulation_TSA.exterior.blocks:
-                            add_mat_idx = self.data.magnet.solve.thermal.insulation_TSA.exterior.blocks.index(el + ins_side[0])
-                            side_ins.extend(self.data.magnet.solve.thermal.insulation_TSA.exterior.thicknesses_append[add_mat_idx])
-                            side_ins_type.extend(self.data.magnet.solve.thermal.insulation_TSA.exterior.materials_append[add_mat_idx])
+                        if ins_side[0] in 'iohl' and el + ins_side[
+                            0] in self.data.magnet.solve.thermal.insulation_TSA.exterior.blocks:
+                            add_mat_idx = self.data.magnet.solve.thermal.insulation_TSA.exterior.blocks.index(
+                                el + ins_side[0])
+                            side_ins.extend(
+                                self.data.magnet.solve.thermal.insulation_TSA.exterior.thicknesses_append[add_mat_idx])
+                            side_ins_type.extend(
+                                self.data.magnet.solve.thermal.insulation_TSA.exterior.materials_append[add_mat_idx])
                             if ins_side[0] in 'il': side_ins.reverse(), side_ins_type.reverse()
                         self.rm.thin_shells.insulation_types.layers_number.append(0)
                         self.rm.thin_shells.insulation_types.thin_shells.append(list(set(tags)))
                         self.rm.thin_shells.insulation_types.thicknesses.append([])
                         self.rm.thin_shells.insulation_types.layers_material.append([])
+                        if ins_side == 'outer':  # scale thin shell lines linked to the collar
+                            if el[0] == 'w':  # no wedge correction
+                                DUMMY = 1.0
+                                self.rm.thin_shells.insulation_types.correction_factors.append(DUMMY)
+                            else:
+                                bare_to_ins = (self.data.conductors[
+                                                   pg.blocks[int(el)].conductor].cable.bare_cable_height_high + 2 *
+                                               self.data.conductors[
+                                                   pg.blocks[int(el)].conductor].cable.th_insulation_along_height) / \
+                                              self.data.conductors[
+                                                  pg.blocks[int(el)].conductor].cable.bare_cable_height_high
+                                for key, ht in pg.blocks[int(el)].half_turns.items():  # try only first key
+                                    if str(ht.group[-1]) == str(max_layer):  # ensure outer layer !
+                                        DUMMY = float(self.data.magnet.mesh.thermal.insulation.TSA.scale_factor_radial)
+                                        if DUMMY < 0.0:  # default value
+                                            DUMMY = bare_to_ins
+                                    else:  # inner layer
+                                        # print(ht.lines['o']) #-> without the break this prints the linetags of the desired lines
+                                        # we are within the ins_side = "outer" loop so
+                                        DUMMY = bare_to_ins
+                                    self.rm.thin_shells.insulation_types.correction_factors.append(
+                                        DUMMY)  # default value if not outer layer
+                                    break  # break after first key
+                        elif ins_side[0] in 'hl':  # hl, long ht side adjacent to the poles
+                            DUMMY = float(self.data.magnet.mesh.thermal.insulation.TSA.scale_factor_azimuthal)
+                            if DUMMY < 0.0:  # default value
+                                DUMMY = 1.0
+                            self.rm.thin_shells.insulation_types.correction_factors.append(DUMMY)
+                        else:
+                            self.rm.thin_shells.insulation_types.correction_factors.append(1.0)  # default value
                         for nr, ins_lyr in enumerate(side_ins):
                             tsa_layers = max(mesh.insulation.TSA.minimum_discretizations, round(ins_lyr / min_h))
                             self.rm.thin_shells.insulation_types.layers_number[-1] += tsa_layers
-                            self.rm.thin_shells.insulation_types.thicknesses[-1].extend([ins_lyr / tsa_layers] * tsa_layers)
-                            self.rm.thin_shells.insulation_types.layers_material[-1].extend([side_ins_type[nr]] * tsa_layers)
+                            self.rm.thin_shells.insulation_types.thicknesses[-1].extend(
+                                [ins_lyr / tsa_layers] * tsa_layers)
+                            self.rm.thin_shells.insulation_types.layers_material[-1].extend(
+                                [side_ins_type[nr]] * tsa_layers)
 
             # Mid-pole, mid-winding, and mid-layer insulation layers
             ins_th_dict = self.md.geometries.thin_shells.ins_thickness.model_dump()
             for ins_type, ins in self.ins_type.items():
+                if ins_type in ['collar', 'poles']:
+                    continue  # these are added later
                 for ins_name, tags in ins.items():
                     # Get conductors insulation
                     if ins_name.count('w') == 2:
@@ -841,7 +1167,9 @@ class Mesh:
                         cond_ins1, cond_ins2 = cond1.th_insulation_along_height, cond2.th_insulation_along_height
                     # Get insulation layer thickness
                     mid_materials, mid_thicknesses = _get_input_insulation_data(ins_name, i_type=ins_type)
-                    ins_thickness = ins_th_dict['mid_layer'][ins_name] / 2 if ins_type == 'aux' else ins_th_dict[ins_type][ins_name]
+                    # for aux: 1/2 due to triangular insulation shape, 1/2 because the triangle height is half the radial distance between the points of the ht insulation
+                    ins_thickness = 1 / 2 * ins_th_dict['mid_layer'][ins_name] / 2 if ins_type == 'aux' else \
+                    ins_th_dict[ins_type][ins_name]
                     mid_lyr_th, null_idx = _compute_insulation_thicknesses(ins_thickness, cond_ins1 + cond_ins2)
                     for idx in null_idx: mid_lyr_th.pop(idx), mid_materials.pop(idx)
                     side_ins = [cond_ins1] + mid_lyr_th + [cond_ins2]
@@ -852,11 +1180,14 @@ class Mesh:
                     self.rm.thin_shells.insulation_types.thin_shells.append(list(set(tags)))
                     self.rm.thin_shells.insulation_types.thicknesses.append([])
                     self.rm.thin_shells.insulation_types.layers_material.append([])
+                    self.rm.thin_shells.insulation_types.correction_factors.append(1.0)  # default value
+
                     for nr, ins_lyr in enumerate(side_ins):
                         tsa_layers = max(mesh.insulation.TSA.minimum_discretizations, round(ins_lyr / min_h))
                         self.rm.thin_shells.insulation_types.layers_number[-1] += tsa_layers
                         self.rm.thin_shells.insulation_types.thicknesses[-1].extend([ins_lyr / tsa_layers] * tsa_layers)
-                        self.rm.thin_shells.insulation_types.layers_material[-1].extend([side_ins_type[nr]] * tsa_layers)
+                        self.rm.thin_shells.insulation_types.layers_material[-1].extend(
+                            [side_ins_type[nr]] * tsa_layers)
 
             # Quench heater insulation layers
             for ins_type, ins in self.ins_type_qh.items():
@@ -866,30 +1197,54 @@ class Mesh:
                         if tags:
                             if ins_type == 'external':
                                 data = self.qh_data[qh_nr]
-                                if str(ts_name) + data[ts_name]['ht_side'] in self.data.magnet.solve.thermal.insulation_TSA.exterior.blocks:
-                                    add_mat_idx = self.data.magnet.solve.thermal.insulation_TSA.exterior.blocks.index(str(ts_name) + data[ts_name]['ht_side'])
-                                    additional_ths = self.data.magnet.solve.thermal.insulation_TSA.exterior.thicknesses_append[add_mat_idx]
-                                    additional_mats = self.data.magnet.solve.thermal.insulation_TSA.exterior.materials_append[add_mat_idx]
-                                else: additional_ths, additional_mats = [], []
+                                if str(ts_name) + data[ts_name][
+                                    'ht_side'] in self.data.magnet.solve.thermal.insulation_TSA.exterior.blocks:
+                                    add_mat_idx = self.data.magnet.solve.thermal.insulation_TSA.exterior.blocks.index(
+                                        str(ts_name) + data[ts_name]['ht_side'])
+                                    additional_ths = \
+                                    self.data.magnet.solve.thermal.insulation_TSA.exterior.thicknesses_append[
+                                        add_mat_idx]
+                                    additional_mats = \
+                                    self.data.magnet.solve.thermal.insulation_TSA.exterior.materials_append[add_mat_idx]
+                                else:
+                                    additional_ths, additional_mats = [], []
                                 cond = self.data.conductors[data[ts_name]['conductor']].cable
-                                ht_ins_th = cond.th_insulation_along_width if data[ts_name]['ht_side'] in 'io' else cond.th_insulation_along_height
-                                side_ins = [ht_ins_th] + [h_ins for h_ins in qh.h_ins[qh_nr - 1]] + [qh.h[qh_nr - 1]] + [h_ground_ins for h_ground_ins in qh.h_ground_ins[qh_nr - 1]] + additional_ths
-                                side_ins_type = [cond.material_insulation] + [type_ins for type_ins in qh.type_ins[qh_nr - 1]] + ['SS'] +\
-                                                [type_ground_ins for type_ground_ins in qh.type_ground_ins[qh_nr - 1]] + additional_mats
+                                ht_ins_th = cond.th_insulation_along_width if data[ts_name][
+                                                                                  'ht_side'] in 'io' else cond.th_insulation_along_height
+                                side_ins = [ht_ins_th] + [s_ins for s_ins in qh.s_ins[qh_nr - 1]] + [
+                                    qh.h[qh_nr - 1]] + [s_ins_He for s_ins_He in
+                                                        qh.s_ins_He[qh_nr - 1]] + additional_ths
+                                side_ins_type = [cond.material_insulation] + [type_ins for type_ins in
+                                                                              qh.type_ins[qh_nr - 1]] + ['SS'] + \
+                                                [type_ins_He for type_ins_He in
+                                                 qh.type_ins_He[qh_nr - 1]] + additional_mats
                                 if data[ts_name]['ht_side'] in 'il': side_ins.reverse(), side_ins_type.reverse()
                                 qh_list = [qh_nr]
                             elif ins_type == 'internal':
                                 data = self.qh_data[qh_nr]
                                 cond = self.data.conductors[data[ts_name]['conductor']].cable
-                                cond2 = self.data.conductors[self.wedge_cond[int(ts_name.split('_')[0][1:])] if 'w' in ts_name
-                                                             else pg.blocks[int(ts_name.split('_')[1]) if data[ts_name]['ht_side'] == 'o' else int(ts_name.split('_')[0])].conductor].cable
-                                side_ins_qh = [h_ins for h_ins in qh.h_ins[qh_nr - 1]] + [qh.h[qh_nr - 1]] + [h_ground_ins for h_ground_ins in qh.h_ground_ins[qh_nr - 1]]
+                                cond2 = self.data.conductors[
+                                    self.wedge_cond[int(ts_name.split('_')[0][1:])] if 'w' in ts_name
+                                    else pg.blocks[
+                                        int(ts_name.split('_')[1]) if data[ts_name]['ht_side'] == 'o' else int(
+                                            ts_name.split('_')[0])].conductor].cable
+                                side_ins_qh = [s_ins for s_ins in qh.s_ins[qh_nr - 1]] + [qh.h[qh_nr - 1]] + [s_ins_He
+                                                                                                              for
+                                                                                                              s_ins_He
+                                                                                                              in
+                                                                                                              qh.s_ins_He[
+                                                                                                                  qh_nr - 1]]
                                 mid_lyr_th, null_idx = _compute_insulation_thicknesses(
-                                    ins_th_dict['mid_layer'][ts_name], sum([cond.th_insulation_along_width, cond2.th_insulation_along_width] + side_ins_qh))
+                                    ins_th_dict['mid_layer'][ts_name], sum([cond.th_insulation_along_width,
+                                                                            cond2.th_insulation_along_width] + side_ins_qh))
                                 for idx in null_idx: mid_lyr_th.pop(idx), mid_materials.pop(idx)
-                                side_ins = [cond.th_insulation_along_width] + side_ins_qh + mid_lyr_th + [cond2.th_insulation_along_width]
-                                side_ins_type = [cond.material_insulation] + [type_ins for type_ins in qh.type_ins[qh_nr - 1]] + ['SS'] +\
-                                                [type_ground_ins for type_ground_ins in qh.type_ground_ins[qh_nr - 1]] + mid_materials + [cond2.material_insulation]
+                                side_ins = [cond.th_insulation_along_width] + side_ins_qh + mid_lyr_th + [
+                                    cond2.th_insulation_along_width]
+                                side_ins_type = [cond.material_insulation] + [type_ins for type_ins in
+                                                                              qh.type_ins[qh_nr - 1]] + ['SS'] + \
+                                                [type_ins_He for type_ins_He in
+                                                 qh.type_ins_He[qh_nr - 1]] + mid_materials + [
+                                                    cond2.material_insulation]
                                 if data[ts_name]['ht_side'] == 'i': side_ins.reverse(), side_ins_type.reverse()
                                 qh_list = [qh_nr]
                             elif ins_type == 'internal_double':
@@ -897,16 +1252,28 @@ class Mesh:
                                 data, data2 = self.qh_data[qh_nr1], self.qh_data[qh_nr2]
                                 cond = self.data.conductors[data[ts_name]['conductor']].cable
                                 cond2 = self.data.conductors[data2[ts_name]['conductor']].cable
-                                side_ins_qh = [h_ins for h_ins in qh.h_ins[qh_nr1 - 1]] + [qh.h[qh_nr1 - 1]] + [h_ground_ins for h_ground_ins in qh.h_ground_ins[qh_nr1 - 1]]
-                                side_ins_qh2 = [h_ground_ins for h_ground_ins in qh.h_ground_ins[qh_nr2 - 1][::-1]] + [qh.h[qh_nr2 - 1]] + [h_ins for h_ins in qh.h_ins[qh_nr2 - 1][::-1]]
+                                side_ins_qh = [s_ins for s_ins in qh.s_ins[qh_nr1 - 1]] + [qh.h[qh_nr1 - 1]] + [s_ins_He
+                                                                                                                for
+                                                                                                                s_ins_He
+                                                                                                                in
+                                                                                                                qh.s_ins_He[
+                                                                                                                    qh_nr1 - 1]]
+                                side_ins_qh2 = [s_ins_He for s_ins_He in qh.s_ins_He[qh_nr2 - 1][::-1]] + [
+                                    qh.h[qh_nr2 - 1]] + [s_ins for s_ins in qh.s_ins[qh_nr2 - 1][::-1]]
                                 mid_lyr_th, null_idx = _compute_insulation_thicknesses(
-                                    ins_th_dict['mid_layer'][ts_name], sum([cond.th_insulation_along_width, cond2.th_insulation_along_width] + side_ins_qh + side_ins_qh2))
+                                    ins_th_dict['mid_layer'][ts_name], sum([cond.th_insulation_along_width,
+                                                                            cond2.th_insulation_along_width] + side_ins_qh + side_ins_qh2))
                                 for idx in null_idx: mid_lyr_th.pop(idx), mid_materials.pop(idx)
-                                side_ins = [cond.th_insulation_along_width] + side_ins_qh + mid_lyr_th + side_ins_qh2 + [cond2.th_insulation_along_width]
-                                side_ins_type = [cond.material_insulation] + [type_ins for type_ins in qh.type_ins[qh_nr1 - 1]] + ['SS'] +\
-                                                [type_ground_ins for type_ground_ins in qh.type_ground_ins[qh_nr1 - 1]] + mid_materials +\
-                                                [type_ground_ins for type_ground_ins in qh.type_ground_ins[qh_nr2 - 1][::-1]] + ['SS'] +\
-                                                [type_ins for type_ins in qh.type_ins[qh_nr2 - 1][::-1]] + [cond2.material_insulation]
+                                side_ins = [cond.th_insulation_along_width] + side_ins_qh + mid_lyr_th + side_ins_qh2 + [
+                                    cond2.th_insulation_along_width]
+                                side_ins_type = [cond.material_insulation] + [type_ins for type_ins in
+                                                                              qh.type_ins[qh_nr1 - 1]] + ['SS'] + \
+                                                [type_ins_He for type_ins_He in
+                                                 qh.type_ins_He[qh_nr1 - 1]] + mid_materials + \
+                                                [type_ins_He for type_ins_He in qh.type_ins_He[qh_nr2 - 1][::-1]] + [
+                                                    'SS'] + \
+                                                [type_ins for type_ins in qh.type_ins[qh_nr2 - 1][::-1]] + [
+                                                    cond2.material_insulation]
                                 qh_list = [qh_nr1, qh_nr2]
                             qh_labels = [1 if m == 'SS' else None for m in side_ins_type]
                             ss_indexes = [index for index, value in enumerate(qh_labels) if value == 1]
@@ -916,13 +1283,148 @@ class Mesh:
                             self.rm.thin_shells.quench_heaters.thicknesses.append([])
                             self.rm.thin_shells.quench_heaters.layers_material.append([])
                             self.rm.thin_shells.quench_heaters.label.append([])
+                            self.rm.thin_shells.quench_heaters.correction_factors.append(1.0)  # default value
                             for nr, ins_lyr in enumerate(side_ins):
-                                tsa_layers = max(mesh.insulation.TSA.minimum_discretizations_QH, round(ins_lyr / min_h_QH))
+                                tsa_layers = max(mesh.insulation.TSA.minimum_discretizations_QH,
+                                                 round(ins_lyr / min_h_QH))
                                 self.rm.thin_shells.quench_heaters.layers_number[-1] += tsa_layers
-                                self.rm.thin_shells.quench_heaters.thicknesses[-1].extend([ins_lyr / tsa_layers] * tsa_layers)
-                                self.rm.thin_shells.quench_heaters.layers_material[-1].extend([side_ins_type[nr]] * tsa_layers)
+                                self.rm.thin_shells.quench_heaters.thicknesses[-1].extend(
+                                    [ins_lyr / tsa_layers] * tsa_layers)
+                                self.rm.thin_shells.quench_heaters.layers_material[-1].extend(
+                                    [side_ins_type[nr]] * tsa_layers)
                                 self.rm.thin_shells.quench_heaters.label[-1].extend([qh_labels[nr]] * tsa_layers)
 
+            if geometry.model_dump().get('use_TSA_new', False):  # collar
+                total_ins_th_dict = self.md.geometries.thin_shells.ins_thickness.collar
+                for ins_name, tags in self.ins_type['collar'].items():  # self.ins_type_col['mid_lines']
+                    qh_th = 0.0  # todo, correct for thickness, total ins th already takes into account the insulation layer but not qh
+                    residual_th = total_ins_th_dict[ins_name] - qh_th
+                    side_ins = [residual_th]  # only one layer of insulation, as the other layer is captured in QH
+                    # Get insulation materials
+                    side_ins_type = [self.data.magnet.solve.thermal.insulation_TSA.between_collar.material]
+
+                    self.rm.thin_shells.collar.layers_number.append(0)
+                    self.rm.thin_shells.collar.thin_shells.append([tags])
+                    self.rm.thin_shells.collar.thicknesses.append([])
+                    self.rm.thin_shells.collar.layers_material.append([])
+
+                    cond_name = next(iter(self.data.conductors.keys()))
+                    ins_to_bare_ratio = (self.data.conductors[cond_name].cable.bare_cable_height_high + 2 *
+                                         self.data.conductors[cond_name].cable.th_insulation_along_height) / \
+                                        self.data.conductors[cond_name].cable.bare_cable_height_high
+                    DUMMY = float(self.data.magnet.mesh.thermal.insulation.TSA.scale_factor_radial)
+                    if DUMMY < 0.0:  # default value
+                        DUMMY = ins_to_bare_ratio  # ins to bare scaling
+                    self.rm.thin_shells.insulation_types.correction_factors.append(DUMMY)
+
+                    for nr, ins_lyr in enumerate(side_ins):
+                        tsa_layers = max(mesh.insulation.TSA.minimum_discretizations_COL, round(ins_lyr / min_h_COL))
+                        self.rm.thin_shells.collar.layers_number[-1] += tsa_layers
+                        self.rm.thin_shells.collar.thicknesses[-1].extend([ins_lyr / tsa_layers] * tsa_layers)
+                        self.rm.thin_shells.collar.layers_material[-1].extend([side_ins_type[nr]] * tsa_layers)
+
+                # mid collar groups
+
+                self.rm.thin_shells.ts_collar_groups['1_1'] = []
+                self.rm.thin_shells.ts_collar_groups['2_1'] = []
+                self.rm.thin_shells.ts_collar_groups['1_2'] = []
+                self.rm.thin_shells.ts_collar_groups['2_2'] = []
+
+                max_layer = len([k for k in self.md.geometries.coil.coils[1].poles[1].layers.keys()])
+                for blk_nr, blk in self.md.domains.physical_groups.blocks.items():  # only need this for the outer layer :)
+                    for ht_nr, el in blk.half_turns.items():
+                        if str(el.group[-1]) == str(
+                                max_layer):  #### 2nd index is swapped due to the checkboard pattern -> otherwise we have to swap it in the .pro file
+                            self.rm.thin_shells.ts_collar_groups[
+                                el.group[1] + '_' + str(1 + int(el.group[-1]) % 2)].append(
+                                self.ins_type['collar'][f'{ht_nr}_x'])  # self.ins_type_col['mid_lines']
+
+                # wedges
+                for wdg_nr, el in self.md.domains.physical_groups.wedges.items():
+                    if str(el.group[-1]) == str(max_layer):
+                        self.rm.thin_shells.ts_collar_groups[el.group[1] + '_' + str(1 + int(el.group[-1]) % 2)].append(
+                            self.ins_type['collar'][f'w{wdg_nr}_x'])  # self.ins_type_col['mid_lines']
+
+                # collar
+                self.rm.thin_shells.bdry_curves['collar'] = [pg.inner_col]
+
+            if geometry.model_dump().get('use_TSA', False):  # poles
+                total_ins_th_dict = self.md.geometries.thin_shells.ins_thickness.poles
+                for ins_name, tags in self.ins_type['poles'].items():
+                    other_corrections = 0.0  # assuming the other corrections are zero #debug
+                    residual_th = total_ins_th_dict[ins_name] - other_corrections
+                    side_ins = [residual_th]
+                    side_ins_type = [self.data.magnet.solve.thermal.insulation_TSA.between_collar.material]
+                    # assuming the insulation between the pole and ht are the same as for the collar
+
+                    self.rm.thin_shells.poles.layers_number.append(0)
+                    self.rm.thin_shells.poles.thin_shells.append([tags])
+                    self.rm.thin_shells.poles.thicknesses.append([])
+                    self.rm.thin_shells.poles.layers_material.append([])
+
+                    # Scaling to the pole lines (2nd insulation layer)
+                    if ins_name.startswith('pw'):  # wedge pole line
+                        DUMMY = 1.0  # default
+                    elif ins_name.endswith('_r'):  # radial line -> halfturn
+                        DUMMY = float(self.data.magnet.mesh.thermal.insulation.TSA.scale_factor_radial)
+                        if DUMMY < 0.0: DUMMY = ins_to_bare_ratio  # default value
+                    else:  # pole lines
+                        DUMMY = float(self.data.magnet.mesh.thermal.insulation.TSA.scale_factor_azimuthal)
+                        if DUMMY < 0.0: DUMMY = 1.0  # default value
+                    self.rm.thin_shells.poles.correction_factors.append(DUMMY)
+
+                    for nr, ins_lyr in enumerate(side_ins):
+                        tsa_layers = max(mesh.insulation.TSA.minimum_discretizations,
+                                         round(ins_lyr / min_h))  # use default TSA
+                        self.rm.thin_shells.poles.layers_number[-1] += tsa_layers
+                        self.rm.thin_shells.poles.thicknesses[-1].extend([ins_lyr / tsa_layers] * tsa_layers)
+                        self.rm.thin_shells.poles.layers_material[-1].extend([side_ins_type[nr]] * tsa_layers)
+
+                # checkboard pattern to link with the hts
+                self.rm.thin_shells.ts_pole_groups['a_1_1'] = []
+                self.rm.thin_shells.ts_pole_groups['a_2_1'] = []
+                self.rm.thin_shells.ts_pole_groups['a_1_2'] = []
+                self.rm.thin_shells.ts_pole_groups['a_2_2'] = []
+                self.rm.thin_shells.ts_pole_groups['r_1_2'] = []
+                self.rm.thin_shells.ts_pole_groups['r_2_2'] = []
+                self.rm.thin_shells.ts_pole_groups['r_1_1'] = []  # empty
+                self.rm.thin_shells.ts_pole_groups['r_2_1'] = []  # empty
+
+                for key, tag in self.ins_type['poles'].items():
+                    alignment = key[-1]  # either r or a aligned lines
+                    # find the corresponding half turn
+                    nr = key[1:key.index('_')]
+                    if nr.startswith('w'):
+                        # wedge to pole line
+                        for _, gr in self.md.domains.physical_groups.wedges.items():
+                            # for name, tag in gr.aux_lines.items():
+                            tag = gr.aux_lines.get(nr)
+                            if tag is not None:
+                                group = gr.group
+                                group = group[1] + '_' + str(1 + int(group[-1]) % 2)
+                                line_tag = self.ins_type['poles'][f'p{nr}_r']  # need to get the correct tag
+                                self.rm.thin_shells.ts_pole_groups['a_' + group].append(line_tag)
+
+                    else:
+                        ht_nr = int(nr)
+                        for blk_nr, blk in self.md.domains.physical_groups.blocks.items():  # only need this for the outer layer :)
+                            el = blk.half_turns.get(ht_nr, None)
+                            if el is not None:
+                                break
+                        # alignment : direction of the normal vecetor
+                        if alignment == 'r':  #### 2nd index is swapped -> radial difference (inner to outer)
+                            group = el.group[1] + '_' + str(
+                                1 + int(el.group[-1]) % 2)  # group  = el.group[1] + '_' + el.group[-1] #
+                            self.rm.thin_shells.ts_pole_groups['a_' + group].append(tag)
+                        elif alignment == 'a':  #### 1st index is swapped -> azimuthal difference (left to right)
+                            group = str(1 + int(el.group[1]) % 2) + '_' + el.group[
+                                -1]  # el.group[1] + '_' + el.group[-1] #
+                            self.rm.thin_shells.ts_pole_groups['r_' + group].append(tag)
+                # save boundary line for the TSA
+                tag = pg.poles.curves.get("bdry", None)
+                if tag is not None:
+                    self.rm.thin_shells.bdry_curves['poles'] = [tag]
+
         # Powered
         for blk_nr, blk in pg.blocks.items():
             ht_list = list(blk.half_turns.keys())
@@ -933,24 +1435,33 @@ class Mesh:
                 self.rm.powered[ht.group].vol.numbers.append(ht.tag)
                 if 'bore_field' in mesh.model_dump():
                     self.rm.powered[ht.group].vol.currents.append(initial_current * (1 if blk.current_sign > 0 else -1))
+                    self.rm.powered[ht.group].curve.names.append(ht_name)
+                    self.rm.powered[ht.group].curve.numbers.append(ht.single_node)
+
+                for line in ['l', 'i', 'o', 'h']:
+                    # Bare edges
+                    self.rm.powered[ht.group].surf_in.names.append(ht_name + line)
+                    self.rm.powered[ht.group].surf_in.numbers.append(ht.lines[line])
+                    if line in 'io':
+                        self.rm.thin_shells.normals_directed['radially'].append(ht.lines[line])
+                    else:
+                        self.rm.thin_shells.normals_directed['azimuthally'].append(ht.lines[line])
+
                 if geometry.model_dump().get('use_TSA', False):
-                    for line in ['l', 'i', 'o', 'h']:
-                        # Bare edges
-                        self.rm.powered[ht.group].surf_in.names.append(ht_name + line)
-                        self.rm.powered[ht.group].surf_in.numbers.append(ht.lines[line])
-                        if line in 'io': self.rm.thin_shells.normals_directed['radially'].append(ht.lines[line])
-                        else: self.rm.thin_shells.normals_directed['azimuthally'].append(ht.lines[line])
                     # Auxiliary thin shells
                     for line_name, line_tag in ht.aux_lines.items():
-                        self.rm.powered[ht.group].surf_in.names.append(line_name)
-                        self.rm.powered[ht.group].surf_in.numbers.append(line_tag)
+                        # update this must be _out instead of in to be not assigned to bare_layers_{i}_{j} in the .pro
+                        # (not used in my example, since ht.aux_lines is empty)
+                        self.rm.powered[ht.group].surf_out.names.append(line_name)
+                        self.rm.powered[ht.group].surf_out.numbers.append(line_tag)
                         self.rm.thin_shells.normals_directed['radially'].append(line_tag)
                     # Thin shells
                     for line_name, line_tag in dict(ht.mid_layer_lines.inner, **ht.mid_layer_lines.outer).items():
                         self.rm.powered[ht.group].surf_out.names.append(line_name)
                         self.rm.powered[ht.group].surf_out.numbers.append(line_tag)
                         self.rm.thin_shells.normals_directed['radially'].append(line_tag)
-                    for line_name, line_tag in dict(ht.mid_pole_lines, **ht.mid_winding_lines, **ht.mid_turn_lines).items():
+                    for line_name, line_tag in dict(ht.mid_pole_lines, **ht.mid_winding_lines,
+                                                    **ht.mid_turn_lines).items():
                         self.rm.powered[ht.group].surf_out.names.append(line_name)
                         self.rm.powered[ht.group].surf_out.numbers.append(line_tag)
                         self.rm.thin_shells.normals_directed['azimuthally'].append(line_tag)
@@ -959,14 +1470,16 @@ class Mesh:
                     if ht.group[1] == '2':
                         # mid-turn thin shells precede r2
                         for line_name, line_tag in ht.mid_turn_lines.items():
-                            if (ht_list.index(ht_nr) != 0 and int(line_name[line_name.index('_') + 1:]) == ht_nr) or\
+                            if (ht_list.index(ht_nr) != 0 and int(line_name[line_name.index('_') + 1:]) == ht_nr) or \
                                     (ht_list.index(ht_nr) == 0 and 'w' in line_name):
                                 self.rm.thin_shells.second_group_is_next['azimuthally'].append(line_tag)
                         # mid-pole thin shells precede r2
                         if ht_list.index(ht_nr) == 0 and ht.mid_pole_lines:
-                            self.rm.thin_shells.second_group_is_next['azimuthally'].append(list(ht.mid_pole_lines.values())[0])
+                            self.rm.thin_shells.second_group_is_next['azimuthally'].append(
+                                list(ht.mid_pole_lines.values())[0])
                         # conductor edges precede r2
-                        elif ht_list.index(ht_nr) == 0 and len(ht.mid_turn_lines) + len(ht.mid_winding_lines) + len(ht.mid_pole_lines) == 1:
+                        elif ht_list.index(ht_nr) == 0 and len(ht.mid_turn_lines) + len(ht.mid_winding_lines) + len(
+                                ht.mid_pole_lines) == 1:
                             self.rm.thin_shells.second_group_is_next['azimuthally'].append(ht.lines['l'])
                         # mid-winding thin shells precede r2
                         for line_name, line_tag in ht.mid_winding_lines.items():
@@ -998,19 +1511,22 @@ class Mesh:
                 wdg_name = f"w{wdg_nr}_{'EM' if 'bore_field' in mesh.model_dump() else 'TH'}"
                 self.rm.induced[wdg.group].vol.names.append(wdg_name)
                 self.rm.induced[wdg.group].vol.numbers.append(wdg.tag)
+                for line in ['l', 'i', 'o', 'h']:
+                    self.rm.induced[wdg.group].surf_in.names.append(wdg_name + line)
+                    self.rm.induced[wdg.group].surf_in.numbers.append(wdg.lines[line])
+
                 if geometry.model_dump().get('use_TSA', False):
                     # Bare edges
                     for line in ['l', 'i', 'o', 'h']:
-                        self.rm.induced[wdg.group].surf_in.names.append(wdg_name + line)
-                        self.rm.induced[wdg.group].surf_in.numbers.append(wdg.lines[line])
                         if line in 'io':
                             self.rm.thin_shells.normals_directed['radially'].append(wdg.lines[line])
                         else:
                             self.rm.thin_shells.normals_directed['azimuthally'].append(wdg.lines[line])
                     # Auxiliary thin shells
                     for line_name, line_tag in wdg.aux_lines.items():
-                        self.rm.induced[wdg.group].surf_in.names.append(line_name)
-                        self.rm.induced[wdg.group].surf_in.numbers.append(line_tag)
+                        # update this must be _out instead of in to be not assigned to bare_layers_{i}_{j} in the .pro
+                        self.rm.induced[wdg.group].surf_out.names.append(line_name)
+                        self.rm.induced[wdg.group].surf_out.numbers.append(line_tag)
                         self.rm.thin_shells.normals_directed['radially'].append(line_tag)
                     # Thin shells
                     for line_name, line_tag in dict(wdg.mid_layer_lines.inner, **wdg.mid_layer_lines.outer).items():
@@ -1045,20 +1561,29 @@ class Mesh:
                 self.rm.insulator.surf.names.append('ins' + group_name)
                 self.rm.insulator.surf.numbers.append(curve)
 
-        # Iron
-        for group_name, surface in pg.iron.surfaces.items():
-            self.rm.iron_yoke.vol.names.append(group_name)
-            self.rm.iron_yoke.vol.numbers.append(surface)
+        for attr in geometry.areas:
+            for group_name, surface in getattr(pg, attr).surfaces.items():
+                h = getattr(self.rm, attr).vol
+                h.names.append(group_name)
+                h.numbers.append(surface)
+
+        if self.data.magnet.mesh.thermal.reference.enabled:
+            if not pg.ref_mesh.surfaces == {}:
+                for name, num in pg.ref_mesh.surfaces.items():
+                    self.rm.ref_mesh.vol.names.append(name)
+                    self.rm.ref_mesh.vol.numbers.append(num)
 
         # Boundary conditions
         if 'insulation' in mesh.model_dump() and 'TSA' in mesh.model_dump()["insulation"]:
             # Initialize lists
-            for bc_data, bc_rm in zip(self.data.magnet.solve.thermal.overwrite_boundary_conditions, self.rm.boundaries.thermal):  # b.c. type
+            for bc_data, bc_rm in zip(self.data.magnet.solve.thermal.overwrite_boundary_conditions,
+                                      self.rm.boundaries.thermal):  # b.c. type
                 bc_rm[1].bc.names = []
                 bc_rm[1].bc.numbers = []
                 if bc_data[0] == 'cooling':
                     bc_rm[1].bc.values = []
-                    for group in ['1_r1_a1', '2_r1_a1', '1_r2_a1', '2_r2_a1', '1_r1_a2', '2_r1_a2', '1_r2_a2', '2_r2_a2']:
+                    for group in ['1_r1_a1', '2_r1_a1', '1_r2_a1', '2_r2_a1', '1_r1_a2', '2_r1_a2', '1_r2_a2',
+                                  '2_r2_a2']:
                         bc_rm[1].groups[group] = []
                 else:
                     bc_rm[1].bc.value = []
@@ -1067,8 +1592,10 @@ class Mesh:
 
             # Apply general cooling and adiabatic
             if self.data.magnet.solve.thermal.He_cooling.enabled:
-                cooling_side = {'i': any(coil_side in self.data.magnet.solve.thermal.He_cooling.sides for coil_side in ['inner', 'external']),
-                                'o': any(coil_side in self.data.magnet.solve.thermal.He_cooling.sides for coil_side in ['outer', 'external']),
+                cooling_side = {'i': any(coil_side in self.data.magnet.solve.thermal.He_cooling.sides for coil_side in
+                                         ['inner', 'external']),
+                                'o': any(coil_side in self.data.magnet.solve.thermal.He_cooling.sides for coil_side in
+                                         ['outer', 'external']),
                                 'hl': self.data.magnet.solve.thermal.He_cooling.sides == 'external'}
             else:
                 cooling_side = {'i': False, 'o': False, 'hl': False}
@@ -1077,48 +1604,74 @@ class Mesh:
                 line_tag = tag if tag else el.lines[side]
                 bnd_list_names[bc_type].append(name + side)
                 bnd_list_numbers[bc_type].append(line_tag)
-                if side in 'io': new_group = el.group[:3] + 'a1' if el.group[4] == '2' else el.group[:3] + 'a2'
-                else: new_group = 'r1' + el.group[2:] if el.group[1] == '2' else 'r2' + el.group[2:]
+                if side in 'io':
+                    new_group = el.group[:3] + 'a1' if el.group[4] == '2' else el.group[:3] + 'a2'
+                else:
+                    new_group = 'r1' + el.group[2:] if el.group[1] == '2' else 'r2' + el.group[2:]
                 bc_rm[bc_type].groups[new_group].append(line_tag)
                 for group_name, group in self.rm.thin_shells.groups.items():
                     if line_tag in group:
                         bc_rm[bc_type].groups[el.group[0] + '_' + new_group].append(line_tag)
                         break
 
-            bc_rm = {'Robin': self.rm.boundaries.thermal.cooling, 'Neumann': self.rm.boundaries.thermal.heat_flux}
+            bc_rm = {'Robin': self.rm.boundaries.thermal.cooling, 'Neumann': self.rm.boundaries.thermal.heat_flux,
+                     'collar': self.rm.boundaries.thermal.collar}
             bnd_list_names = {'Robin': [], 'Neumann': []}
             bnd_list_numbers = {'Robin': [], 'Neumann': []}
+            DISABLE_BNDRY_COND = False  # debug: this should always be false
             if geometry.model_dump().get('use_TSA', False):
                 # Half turn boundaries
                 for coil_nr, coil in self.md.geometries.coil.anticlockwise_order.coils.items():
                     for lyr_nr, orders in coil.layers.items():
                         for order in orders:
                             ht_list = list(pg.blocks[order.block].half_turns.keys())
-                            for ht_nr, ht in pg.blocks[order.block].half_turns.items():
+                            for ht_nr, ht in pg.blocks[
+                                order.block].half_turns.items():  # apply bdry condition if no TSL
                                 if not ht.mid_layer_lines.inner:
-                                    __assign_bnd_tag(ht, 'ht' + str(ht_nr), 'i', 'Robin' if cooling_side['i'] else 'Neumann')
+                                    __assign_bnd_tag(ht, 'ht' + str(ht_nr), 'i',
+                                                     'Robin' if cooling_side['i'] else 'Neumann')
                                 if not ht.mid_layer_lines.outer:
-                                    __assign_bnd_tag(ht, 'ht' + str(ht_nr), 'o', 'Robin' if cooling_side['o'] else 'Neumann')
-                                if ht_list.index(ht_nr) == 0 and len(ht.mid_turn_lines) + len(ht.mid_winding_lines) + len(ht.mid_pole_lines) == 1:
-                                    __assign_bnd_tag(ht, 'ht' + str(ht_nr), 'l', 'Robin' if cooling_side['hl'] else 'Neumann')
-                                if ht_list.index(ht_nr) == len(ht_list) - 1 and len(ht.mid_turn_lines) + len(ht.mid_winding_lines) + len(ht.mid_pole_lines) == 1:
-                                    __assign_bnd_tag(ht, 'ht' + str(ht_nr), 'h', 'Robin' if cooling_side['hl'] else 'Neumann')
+                                    if DISABLE_BNDRY_COND and self.data.magnet.geometry.thermal.use_TSA_new and \
+                                            ht.group[4] == max_layer:  # do not add new boundary condition:
+                                        logger.warning("\033[93m DISABLING NEUMANN CONDITION")
+                                    else:
+                                        __assign_bnd_tag(ht, 'ht' + str(ht_nr), 'o',
+                                                         'Robin' if cooling_side['o'] else 'Neumann')
+                                if ht_list.index(ht_nr) == 0 and len(ht.mid_turn_lines) + len(
+                                        ht.mid_winding_lines) + len(ht.mid_pole_lines) == 1:
+                                    __assign_bnd_tag(ht, 'ht' + str(ht_nr), 'l',
+                                                     'Robin' if cooling_side['hl'] else 'Neumann')
+                                if ht_list.index(ht_nr) == len(ht_list) - 1 and len(ht.mid_turn_lines) + len(
+                                        ht.mid_winding_lines) + len(ht.mid_pole_lines) == 1:
+                                    __assign_bnd_tag(ht, 'ht' + str(ht_nr), 'h',
+                                                     'Robin' if cooling_side['hl'] else 'Neumann')
                                 if ht.aux_lines:
-                                    __assign_bnd_tag(ht, 'ht' + str(ht_nr), 'o', 'Robin' if cooling_side['hl'] else 'Neumann', list(ht.aux_lines.values())[0])
+                                    __assign_bnd_tag(ht, 'ht' + str(ht_nr), 'o',
+                                                     'Robin' if cooling_side['hl'] else 'Neumann',
+                                                     list(ht.aux_lines.values())[0])
+
                 # Wedge boundaries
                 for wdg_nr, wdg in pg.wedges.items():
                     if not wdg.mid_layer_lines.inner:
                         __assign_bnd_tag(wdg, 'wd' + str(wdg_nr), 'i', 'Robin' if cooling_side['i'] else 'Neumann')
                     if not wdg.mid_layer_lines.outer:
-                        __assign_bnd_tag(wdg, 'wd' + str(wdg_nr), 'o', 'Robin' if cooling_side['o'] else 'Neumann')
+                        if DISABLE_BNDRY_COND and self.data.magnet.geometry.thermal.use_TSA_new and wdg.group[
+                            4] == max_layer:
+                            logger.warning("\033[93m DISABLING NEUMANN CONDITION")
+                        else:
+                            __assign_bnd_tag(wdg, 'wd' + str(wdg_nr), 'o', 'Robin' if cooling_side['o'] else 'Neumann')
                     if wdg.aux_lines:
-                        __assign_bnd_tag(wdg, 'wd' + str(wdg_nr), 'o', 'Robin' if cooling_side['hl'] else 'Neumann', list(wdg.aux_lines.values())[0])
-            else:  # insulation case
+                        __assign_bnd_tag(wdg, 'wd' + str(wdg_nr), 'o', 'Robin' if cooling_side['hl'] else 'Neumann',
+                                         list(wdg.aux_lines.values())[0])
+
+            else:  # insulation case, no TSA
                 for curves_group, tag in pg.insulations.curves.items():
                     if self.data.magnet.solve.thermal.He_cooling.enabled:
-                        if self.data.magnet.solve.thermal.He_cooling.sides == 'external': bc_type = 'Robin'
+                        if self.data.magnet.solve.thermal.He_cooling.sides == 'external':
+                            bc_type = 'Robin'
                         else:
-                            raise ValueError(f"Cooling side '{self.data.magnet.solve.thermal.He_cooling.sides}' is not supported for meshed insulation models.")
+                            raise ValueError(
+                                f"Cooling side '{self.data.magnet.solve.thermal.He_cooling.sides}' is not supported for meshed insulation models.")
                         # bc_type = 'Robin' if (self.data.magnet.solve.thermal.He_cooling.sides == 'external' or
                         #                       ('inner' in self.data.magnet.solve.thermal.He_cooling.sides and curves_group[-1] == 'i') or
                         #                       ('outer' in self.data.magnet.solve.thermal.He_cooling.sides and curves_group[-1] == 'o')) else 'Neumann'
@@ -1126,22 +1679,33 @@ class Mesh:
                         bc_type = 'Neumann'
                     bnd_list_names[bc_type].append('ins' + curves_group)
                     bnd_list_numbers[bc_type].append(tag)
+
             if self.data.magnet.solve.thermal.He_cooling.enabled:
                 bc_rm['Robin'].bc.names.append(bnd_list_names['Robin'])
                 bc_rm['Robin'].bc.numbers.append(bnd_list_numbers['Robin'])
                 bc_rm['Robin'].bc.values.append([self.data.magnet.solve.thermal.He_cooling.heat_transfer_coefficient,
                                                  self.data.magnet.solve.thermal.init_temperature])
+
+            if self.data.magnet.solve.thermal.collar_cooling.enabled:
+                cool = self.data.magnet.solve.thermal.collar_cooling
+                bc_rm['collar'].bc.numbers = [pg.collar_cooling]  # only one physical group for the collar cooling
+                bc_rm['collar'].bc.values = [self.data.magnet.solve.thermal.collar_cooling.heat_transfer_coefficient,
+                                             cool.ref_temperature if cool.ref_temperature is not None else self.data.magnet.solve.thermal.init_temperature]  # [coef or functionname, inittemp]
+
+            # save the boundary names and numbers
             if bnd_list_names['Neumann']:
                 bc_rm['Neumann'].bc.names.append(bnd_list_names['Neumann'])
                 bc_rm['Neumann'].bc.numbers.append(bnd_list_numbers['Neumann'])
                 bc_rm['Neumann'].bc.value.append(0.)
 
             # Apply specific boundary conditions
-            for bc_data, bc_rm in zip(self.data.magnet.solve.thermal.overwrite_boundary_conditions, self.rm.boundaries.thermal):  # b.c. type
+            for bc_data, bc_rm in zip(self.data.magnet.solve.thermal.overwrite_boundary_conditions,
+                                      self.rm.boundaries.thermal):  # b.c. type
                 # bc_data is a tuple like: ('temperature', {'const_T1': boundaries, value)})
                 # bc_rm is a tuple like: ('temperature', DirichletCondition(names, numbers, value))
 
-                for _, bc in bc_data[1].items():  # all boundary conditions of one b.c. type (e.g., Dirichlet with different temperatures)
+                for _, bc in bc_data[
+                    1].items():  # all boundary conditions of one b.c. type (e.g., Dirichlet with different temperatures)
                     bnd_list_names = []
                     bnd_list_numbers = []
                     if geometry.model_dump().get('use_TSA', False):
@@ -1193,17 +1757,17 @@ class Mesh:
                     bc_rm[1].bc.names.append(bnd_list_names)
                     bc_rm[1].bc.numbers.append(bnd_list_numbers)
                     if bc_data[0] == 'cooling':
-                        bc_rm[1].bc.values.append([bc.heat_transfer_coefficient, self.data.magnet.solve.thermal.init_temperature])
+                        bc_rm[1].bc.values.append(
+                            [bc.heat_transfer_coefficient, self.data.magnet.solve.thermal.init_temperature])
                     elif bc_data[0] == 'temperature':
                         bc_rm[1].bc.value.append(bc.const_temperature)
                     elif bc_data[0] == 'heat_flux':
                         bc_rm[1].bc.value.append(bc.const_heat_flux)
 
-    def setMeshOptions(self, run_type):
+    def setMeshOptions(self):
         """
             Meshes the generated domain
         """
-        mesh = self.data.magnet.mesh
         gmsh.option.setNumber("Mesh.MeshSizeExtendFromBoundary", 0)
         gmsh.option.setNumber("Mesh.MeshSizeFromPoints", 0)
         gmsh.option.setNumber("Mesh.MeshSizeFromCurvature", 0)
@@ -1227,14 +1791,6 @@ class Mesh:
         self.mesh_parameters['Gamma'] = min(self.mesh.getElementQualities(elementTags=tags, qualityName='gamma'))
         self.mesh_parameters['nodes'] = len(self.mesh.getNodes()[0])
 
-        # gmsh.plugin.setNumber("AnalyseMeshQuality", "JacobianDeterminant", 1)
-        # gmsh.plugin.setNumber("AnalyseMeshQuality", "CreateView", 100)
-        # test = gmsh.plugin.run("AnalyseMeshQuality")
-        # test2 = gmsh.view.getModelData(test, test)
-
-        # gmsh.logger.getLastError()
-        # gmsh.logger.get()
-
     def saveClosestNeighboursList(self):
 
         def _closest_node_on_reference(origin_points, reference_points):
@@ -1249,7 +1805,8 @@ class Mesh:
             for x in range(0, len(origin_points), 3):
                 origin_point = origin_points[x:x + 3]
                 # Compute distance list between origin point and reference point list
-                dist_lst = [Func.points_distance(origin_point, reference_points[y:y + 3]) for y in range(0, len(reference_points), 3)]
+                dist_lst = [Func.points_distance(origin_point, reference_points[y:y + 3]) for y in
+                            range(0, len(reference_points), 3)]
                 min_idx = 3 * np.argmin(dist_lst)
                 closest_node.append(origin_point + reference_points[min_idx:min_idx + 3])
             return closest_node
@@ -1260,7 +1817,8 @@ class Mesh:
             self.rc.neighbouring_nodes.groups[group].extend(
                 [node for node_list in _closest_node_on_reference(origin_list, reference_list) for node in node_list])
 
-        logger.info(f"Info    : {self.data.general.magnet_name} - F i n d i n g   C l o s e s t   N e i g h b o u r s . . .")
+        logger.info(
+            f"Info    : {self.data.general.magnet_name} - F i n d i n g   C l o s e s t   N e i g h b o u r s . . .")
         logger.info(f"Info    : Finding closest reference nodes ...")
 
         self.rc.neighbouring_nodes.groups['1_1'] = []
@@ -1275,10 +1833,12 @@ class Mesh:
                 for line_name, mid_layer in el.mid_layer_lines.inner.items(): _get_closest_nodes('i')
                 for line_name, mid_layer in el.mid_layer_lines.outer.items(): _get_closest_nodes('o')
                 for line_name, mid_layer in el.aux_lines.items(): _get_closest_nodes('o')
-                for line_name, mid_layer in el.mid_pole_lines.items(): _get_closest_nodes('l' if ht_list.index(ht_nr) == 0 else 'h')
-                for line_name, mid_layer in el.mid_winding_lines.items(): _get_closest_nodes('l' if ht_list.index(ht_nr) == 0 else 'h')
+                for line_name, mid_layer in el.mid_pole_lines.items(): _get_closest_nodes(
+                    'l' if ht_list.index(ht_nr) == 0 else 'h')
+                for line_name, mid_layer in el.mid_winding_lines.items(): _get_closest_nodes(
+                    'l' if ht_list.index(ht_nr) == 0 else 'h')
                 for line_name, mid_layer in el.mid_turn_lines.items():
-                    high = ht_list.index(ht_nr) == len(ht_list) - 1 if 'w' in line_name\
+                    high = ht_list.index(ht_nr) == len(ht_list) - 1 if 'w' in line_name \
                         else int(line_name[:line_name.index('_')]) == ht_nr
                     _get_closest_nodes('h' if high else 'l')
         for wdg_nr, el in self.md.domains.physical_groups.wedges.items():
@@ -1289,7 +1849,122 @@ class Mesh:
             for line_name, mid_layer in el.mid_turn_lines.items():
                 _get_closest_nodes('l' if line_name == list(el.mid_turn_lines.keys())[0] else 'h')
 
-        logger.info(f"Info    : {self.data.general.magnet_name} - E n d   F i n d i n g   C l o s e s t   N e i g h b o u r s")
+        logger.info(
+            f"Info    : {self.data.general.magnet_name} - E n d   F i n d i n g   C l o s e s t   N e i g h b o u r s")
+
+    def saveClosestNeighboursList_new_TSA(self):
+        def _closest_node_on_reference(origin_points, reference_points):
+            closest_node = []
+            for x in range(0, len(origin_points), 3):
+                origin_point = origin_points[x:x + 3]
+                # Compute distance list between origin point and reference point list
+                dist_lst = [Func.points_distance(origin_point, reference_points[y:y + 3]) for y in
+                            range(0, len(reference_points), 3)]
+                min_idx = 3 * np.argmin(dist_lst)
+                closest_node.append(origin_point + reference_points[min_idx:min_idx + 3])
+            if not closest_node:
+                raise ValueError("No closest nodes found - check mesh and physical groups!")
+            return closest_node
+
+        def _get_closest_nodes(name, reference_list, origin_list):
+            self.rc.neighbouring_nodes.groups[name].extend(
+                [node for node_list in _closest_node_on_reference(origin_list, reference_list) for node in node_list])
+
+        logger.info(
+            f"Info    : {self.data.general.magnet_name} - F i n d i n g   C l o s e s t   N e i g h b o u r s (new TSA) . . .")
+        logger.info(f"Info    : Finding closest reference nodes ...")
+
+        # two of these will always be empty, but depending on the layers it will either be a1 or a2
+        self.rc.neighbouring_nodes.groups['mid2ht_1_1'] = []
+        self.rc.neighbouring_nodes.groups['mid2ht_2_1'] = []
+        self.rc.neighbouring_nodes.groups['mid2ht_1_2'] = []
+        self.rc.neighbouring_nodes.groups['mid2ht_2_2'] = []
+        # map coils to origin_list: start with outer layer of HT
+        max_layer = len([k for k in self.md.geometries.coil.coils[1].poles[1].layers.keys()])
+
+        origin_all = [self.mesh.getNodesForPhysicalGroup(1, line)[1].tolist() for _, line in
+                      self.ins_type['collar'].items()]
+        origin_all = [node for sublist in origin_all for node in sublist]  # flatten the list
+
+        for blk_nr, blk in self.md.domains.physical_groups.blocks.items():
+            for ht_nr, el in blk.half_turns.items():
+                if str(el.group[-1]) == str(max_layer):
+                    group = el.group[1] + '_' + str((1 + int(el.group[-1])) % 2)  # e.g. 1_2
+                    origin = self.mesh.getNodesForPhysicalGroup(1, self.ins_type['collar'][str(ht_nr) + '_x'])[
+                        1].tolist()
+                    ref_list = np.array(self.mesh.getNodesForPhysicalGroup(1, el.lines['o'])[1]).tolist()
+                    _get_closest_nodes(reference_list=ref_list, name=f'mid2ht_{group}', origin_list=origin)
+        # collar mid
+        self.rc.neighbouring_nodes.groups['mid2col'] = []
+        ref = np.array(self.mesh.getNodesForPhysicalGroup(1, self.md.domains.physical_groups.inner_col)[1]).tolist()
+        _get_closest_nodes(reference_list=ref, origin_list=origin_all, name='mid2col')
+        # collar wedges
+        for wdg_nr, el in self.md.domains.physical_groups.wedges.items():  ## one can conveniently add the wedges to the mid2ht groups
+            if str(el.group[-1]) == str(max_layer):
+                group = el.group[1] + '_' + str((1 + int(el.group[-1])) % 2)
+                origin = self.mesh.getNodesForPhysicalGroup(1, self.ins_type['collar']['w' + str(wdg_nr) + '_x'])[
+                    1].tolist()
+                ref_list = np.array(self.mesh.getNodesForPhysicalGroup(1, el.lines['o'])[1]).tolist()
+                _get_closest_nodes(reference_list=ref_list, name=f'mid2ht_{group}', origin_list=origin)
+
+        # POLES
+        self.rc.neighbouring_nodes.groups['pole_mid2ht_1_2'] = []
+        self.rc.neighbouring_nodes.groups['pole_mid2ht_1_1'] = []
+        self.rc.neighbouring_nodes.groups['pole_mid2ht_2_1'] = []
+        self.rc.neighbouring_nodes.groups['pole_mid2ht_2_2'] = []
+        self.rc.neighbouring_nodes.groups['mid2pol'] = []
+        # TSA lines to poles
+        for tsl_name in self.ins_type['poles'].keys():
+            # first half: mid2ht (also mid2wedge)
+            nr = tsl_name[1:tsl_name.index('_')]
+            origin = self.mesh.getNodesForPhysicalGroup(1, self.ins_type['poles'][tsl_name])[1].tolist()
+            if nr.startswith('w'):  # this is a mid2wedge
+                ref_list = None
+                for i, gr in self.md.domains.physical_groups.wedges.items():
+                    # for name, tag in gr.aux_lines.items():
+                    tag = gr.aux_lines.get(nr)
+                    if tag is not None:  # should only be one
+                        ref_list = self.mesh.getNodesForPhysicalGroup(1, tag)[1]
+                        ref_list = [float(x) for x in ref_list]
+                        break
+                # alignment is always the same here, for naming later
+                group = gr.group
+                group = group[1] + '_' + str(1 + int(group[-1]) % 2)
+            else:
+                ht_nr = int(nr)  # e.g. p1_a and p12_a -> 1 and 12
+                alignment = tsl_name[-1]
+                # reference can be the nodes from the half turn, we don't have to specify the line
+                for blk in self.md.domains.physical_groups.blocks.values():
+                    el = blk.half_turns.get(ht_nr, None)
+                    if el is not None:
+                        ref_list = []
+                        [ref_list.extend(self.mesh.getNodesForPhysicalGroup(1, line)[1]) for line in el.lines.values()]
+                        ref_list = [float(x) for x in ref_list]
+                        break
+                # alignment : direction of the normal vector, for naming
+                if alignment == 'r':
+                    # group = el.group[1] + '_' + el.group[-1]
+                    group = el.group[1] + '_' + str(1 + int(el.group[-1]) % 2)
+                elif alignment == 'a':
+                    # group = el.group[1] + '_' +  el.group[-1]
+                    group = str(1 + int(el.group[1]) % 2) + '_' + el.group[-1]
+            _get_closest_nodes(reference_list=ref_list, name=f'pole_mid2ht_{group}', origin_list=origin)
+
+            # second half: mid2pole
+            origin = [float(x) for x in
+                      self.mesh.getNodesForPhysicalGroup(1, self.ins_type['poles'][tsl_name])[1].tolist()]
+            pole_bdry = self.md.domains.physical_groups.poles.curves.get("bdry", None)
+            ###ref_list = [float(x) for x in self.mesh.getNodesForPhysicalGroup(2, self.md.domains.physical_groups.poles.surfaces['SS'])[1].tolist()]
+            ref_list = [float(x) for x in self.mesh.getNodesForPhysicalGroup(1, pole_bdry)[1].tolist()]
+            # just use all the nodes
+            # todo: this can be optimized by selecting only the boundary of the pole
+            _get_closest_nodes(reference_list=ref_list, name=f'mid2pol', origin_list=origin)
+
+        logger.info(
+            f"Info    : {self.data.general.magnet_name} - E n d   F i n d i n g   C l o s e s t   N e i g h b o u r s (new TSA)")
+
+    def saveHalfTurnCornerPositions(self):
+        with open(f"{self.geom_files}.crns", 'r') as f: self.rc.coordinates_per_half_turn = json.load(f)
 
     def selectMeshNodes(self, elements: str):