fiqus 2026.1.2__tar.gz → 2026.1.4__tar.gz

{fiqus-2026.1.2 → fiqus-2026.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fiqus
-Version: 2026.1.2
+Version: 2026.1.4
 Summary: Source code for STEAM FiQuS tool
 Home-page: https://gitlab.cern.ch/steam/fiqus
 Author: STEAM Team
@@ -74,6 +74,18 @@ Requires-Dist: pytest-subtests==0.12.1; extra == "all"
 Requires-Dist: setuptools==69.2.0; extra == "all"
 Requires-Dist: wheel==0.45.1; extra == "all"
 Requires-Dist: twine==6.0.1; extra == "all"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ![FiQuS logo](https://gitlab.cern.ch/steam/fiqus/-/raw/master/docs/images/FiQuS_name_logo.svg)
 

{fiqus-2026.1.2 → fiqus-2026.1.4}/fiqus/mains/MainMultipole.py

@@ -106,10 +106,10 @@ class MainMultipole:
     def mesh(self, gui: bool = False):
         def _create_physical_group_for_reference(self):
             """
-                This code generates the reference models for the FALCOND_C
+                This code generates the reference models for the D12T
             """
             ### hardcoded, we need only one reference
-            if self.fdm.general.magnet_name == 'TEST_MULTIPOLE_FALCOND_C_TSA_COLLAR_POLE':
+            if 'D12T' in self.fdm.general.magnet_name.upper() and 'POLE' in self.fdm.general.magnet_name.upper():
                 CUT_REFERENCE = True # self specify loop and surf
 
                 L_col = [56, 57, 58, 35, 16, 49, 48, 47]
@@ -205,35 +205,20 @@ class MainMultipole:
 
     def solve_and_postprocess_getdp(self, gui: bool = False):
         an = AssignNaming(data=self.fdm)
-        rg = RunGetdpMultipole(data=an, solution_folder=self.solution_folder, GetDP_path=self.GetDP_path,
-                               verbose=self.verbose)
-        rg.loadRegionFiles()
-        if self.fdm.magnet.solve.thermal.solve_type and self.fdm.magnet.geometry.thermal.use_TSA:
-            rg.loadRegionCoordinateFile()
-        rg.assemblePro()
-        start_time = time.time()
-        rg.solve_and_postprocess()
-        rg.ending_step(gui)
-        return time.time() - start_time
+        rg = RunGetdpMultipole(data=an, solution_folder=self.solution_folder, GetDP_path=self.GetDP_path, verbose=self.verbose)
 
-    def solve_and_postprocess_getdp(self, gui: bool = False):
-        an = AssignNaming(data=self.fdm)
-        rg = RunGetdpMultipole(data=an, solution_folder=self.solution_folder, GetDP_path=self.GetDP_path,
-                               verbose=self.verbose)
         rg.loadRegionFiles()
-        if self.fdm.magnet.solve.thermal.solve_type and self.fdm.magnet.geometry.thermal.use_TSA:
-            rg.loadRegionCoordinateFile()
-            rg.read_aux_file(os.path.join(self.mesh_folder, f"{self.fdm.general.magnet_name}_EM.aux"))
-            rg.extract_half_turn_blocks()
+        rg.loadRegionCoordinateFile()
+        rg.read_aux_file(os.path.join(self.mesh_folder, f"{self.fdm.general.magnet_name}_EM.aux"))
+        rg.extract_half_turn_blocks()
         if self.fdm.magnet.geometry.thermal.use_TSA_new:
-            rg.read_aux_file(os.path.join(self.mesh_folder,
-                                          f"{self.fdm.general.magnet_name}_TH.aux"))  # now load the thermal aux file
+            rg.read_aux_file(os.path.join(self.mesh_folder, f"{self.fdm.general.magnet_name}_TH.aux")) # now load the thermal aux file
             rg.extract_specific_TSA_lines()
+
         rg.assemblePro()
         start_time = time.time()
         rg.solve_and_postprocess()
         rg.ending_step(gui)
-        return time.time() - start_time
 
 
     def post_process_getdp(self, gui: bool = False):

{fiqus-2026.1.2 → fiqus-2026.1.4}/fiqus/mesh_generators/MeshMultipole.py

@@ -212,12 +212,12 @@ class Mesh:
 
         if run_type == 'TH' and mesh.reference.enabled:  # add reference meshing between collar and insulation
             """
-            (hardcoded) REFERENCE MESH for the FalconD-type magnet
+            (hardcoded) REFERENCE MESH for the D12T-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':
+            if 'D12T' in self.data.general.magnet_name.upper() and 'POLE' in self.data.general.magnet_name.upper():
                 lines = list(range(754, 855)) + list(range(910, 1011))
                 self.mesh.field.setNumbers(distance_ref, "CurvesList", lines)
             else:

{fiqus-2026.1.2 → fiqus-2026.1.4}/fiqus.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fiqus
-Version: 2026.1.2
+Version: 2026.1.4
 Summary: Source code for STEAM FiQuS tool
 Home-page: https://gitlab.cern.ch/steam/fiqus
 Author: STEAM Team
@@ -74,6 +74,18 @@ Requires-Dist: pytest-subtests==0.12.1; extra == "all"
 Requires-Dist: setuptools==69.2.0; extra == "all"
 Requires-Dist: wheel==0.45.1; extra == "all"
 Requires-Dist: twine==6.0.1; extra == "all"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ![FiQuS logo](https://gitlab.cern.ch/steam/fiqus/-/raw/master/docs/images/FiQuS_name_logo.svg)
 

{fiqus-2026.1.2 → fiqus-2026.1.4}/setup.py

@@ -49,7 +49,7 @@ build_require = [
 
 setup(
     name="fiqus",
-    version="2026.1.2",
+    version="2026.1.4",
     author="STEAM Team",
     author_email="steam-team@cern.ch",
     description="Source code for STEAM FiQuS tool",

{fiqus-2026.1.2 → fiqus-2026.1.4}/tests/test_geometry_generators.py

@@ -141,7 +141,7 @@ class TestGeometryGenerators(FiQuSGeometryTests):
             "TEST_MULTIPOLE_SMC_TSA",
             "TEST_MULTIPOLE_SMC_REF",
             "TEST_MULTIPOLE_4COND_TSA",
-            "TEST_MULTIPOLE_FALCOND_C_TSA_COLLAR_POLE",
+            "TEST_MULTIPOLE_D12T_TSA_COLLAR_POLE",
         ]
 
         for model_name in model_names:

{fiqus-2026.1.2 → fiqus-2026.1.4}/tests/test_mesh_generators.py

@@ -221,7 +221,7 @@ class TestMeshGenerators(FiQuSMeshTests):
             "TEST_MULTIPOLE_SMC_TSA",
             "TEST_MULTIPOLE_SMC_REF",
             "TEST_MULTIPOLE_4COND_TSA",
-            "TEST_MULTIPOLE_FALCOND_C_TSA_COLLAR_POLE"
+            "TEST_MULTIPOLE_D12T_TSA_COLLAR_POLE"
         ]
 
         for model_name in model_names:

{fiqus-2026.1.2 → fiqus-2026.1.4}/tests/test_solvers.py

@@ -351,7 +351,7 @@ class TestSolvers(FiQuSSolverTests):
             "TEST_MULTIPOLE_SMC_TSA",
             "TEST_MULTIPOLE_SMC_REF",
             "TEST_MULTIPOLE_4COND_TSA",
-            "TEST_MULTIPOLE_FALCOND_C_TSA_COLLAR_POLE"
+            "TEST_MULTIPOLE_D12T_TSA_COLLAR_POLE"
         ]
         for model_name in model_names:
             with self.subTest(model_name=model_name):