[TASK] added tune in twiss results

Author: Sulimankhail

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "dt4acc"
-version = "0.0.4"
+version = "0.0.3"
 description = "digital twin for accelerators"
 authors = [  "Waheedullah Sulaiman Khail", "Pierre Schnizer"]
 license = "GPL-3.0"

src/dt4acc/core/calculations/pyat_calculator.py

@@ -71,15 +71,15 @@ def calculate(self) -> TwissWithAggregatedKValues:
         }
         try:
             if self.machine.closed:  # this means it is a ring
-                _, __, twiss = self.acc.get_optics(at.All)
+                _, summary, twiss = self.acc.get_optics(at.All)
             else:
-                _, __, twiss = self.acc.get_optics(at.All, twiss_in=twiss_in)  # for transfer line
+                _, summary, twiss = self.acc.get_optics(at.All, twiss_in=twiss_in)  # for transfer line
 
             main_values = self._extract_pv_values()
 
             return TwissWithAggregatedKValues(
-                x=TwissForPlane(alpha=twiss["alpha"][:, 0], beta=twiss["beta"][:, 0], nu=twiss["mu"][:, 0]),
-                y=TwissForPlane(alpha=twiss["alpha"][:, 1], beta=twiss["beta"][:, 1], nu=twiss["mu"][:, 1]),
+                x=TwissForPlane(alpha=twiss["alpha"][:, 0], beta=twiss["beta"][:, 0], nu=twiss["mu"][:, 0], tune= summary["tune"][0]),
+                y=TwissForPlane(alpha=twiss["alpha"][:, 1], beta=twiss["beta"][:, 1], nu=twiss["mu"][:, 1], tune= summary["tune"][1]),
                 names=_construct_name_list(self.acc),
                 main_values=main_values
             )

src/dt4acc/core/model/twiss.py

@@ -11,6 +11,7 @@ class TwissForPlane:
     alpha: Sequence[float]
     beta: Sequence[float]
     nu: Sequence[float]
+    tune: float
 
 @dataclass
 class MainValue:

src/dt4acc/custom_epics/ioc/pv_setup.py

@@ -164,6 +164,7 @@ def initialize_twiss_pvs(builder):
         builder.WaveformOut(
             f"beam:twiss:{axis}:nu", initial_value=[0.0], length=config.n_elements
         )
+        builder.aOut(f"beam:twiss:{axis}:tune", initial_value=0.0, PREC=8)
     builder.WaveformOut(
         f"beam:twiss:names", initial_value=[""], length=config.n_elements
     )

src/dt4acc/custom_epics/views/calculation_result_view.py

@@ -1,3 +1,4 @@
+import itertools
 from datetime import datetime
 from typing import Sequence
 
@@ -30,15 +31,21 @@ async def update_orbit_pv(pv_name, orbit_result):
 
 
 async def update_twiss_pv(pv_name, twiss_result):
+    logger.warning(f"Updating twiss values {twiss_result.x.alpha}")
     try:
+        # todo: use translation service to provide the calc
+        await ctx.put(f"{pv_name}:x:tune", float(twiss_result.x.tune) )
         await ctx.put(f"{pv_name}:x:alpha", twiss_result.x.alpha)
         await ctx.put(f"{pv_name}:x:beta", twiss_result.x.beta)
         await ctx.put(f"{pv_name}:x:nu", twiss_result.x.nu)
+        await ctx.put(f"{pv_name}:y:tune", float(twiss_result.y.tune) )
         await ctx.put(f"{pv_name}:y:alpha", twiss_result.y.alpha)
         await ctx.put(f"{pv_name}:y:beta", twiss_result.y.beta)
         await ctx.put(f"{pv_name}:y:nu", twiss_result.y.nu)
+        logger.warning("Updated twiss values")
         # await ctx.put(f"{pv_name}:names", twiss_result.names)
     except Exception as e:
+        logger.warning("FAILED Updated twiss values: %s", e)
         logger.error(f"Failed to update or create twiss PV {pv_name}: {e}")
     try: