Bug/bbs converter coupling fix (#410)

* added missing columns in coupling-conversion (BBS2OMC3)

Author: JoschD

CHANGELOG.md

@@ -1,6 +1,11 @@
 # OMC3 Changelog
 
-#### 2022-01-20 - v0.7.1 - _jdilly_
+#### 2023-03-16 - v0.7.2 - _jdilly_
+
+- Fix: 
+  - Added missing columns to coupling in BBS-OMC3 converter
+
+#### 2023-01-20 - v0.7.1 - _jdilly_
 
 - Added:
   - Amplitude Detuning plots: Switch to plot only with/without BBQ correction 

omc3/__init__.py

@@ -11,7 +11,7 @@
 __title__ = "omc3"
 __description__ = "An accelerator physics tools package for the OMC team at CERN."
 __url__ = "https://github.com/pylhc/omc3"
-__version__ = "0.7.1"
+__version__ = "0.7.2"
 __author__ = "pylhc"
 __author_email__ = "[email protected]"
 __license__ = "MIT"

omc3/scripts/betabeatsrc_output_converter.py

@@ -427,9 +427,9 @@ def convert_old_coupling(
 
     dframe = tfs.read(old_file_path)
     rdt_dfs = {
-        "1001": dframe.loc[: , ["S", "COUNT", "F1001W", "FWSTD1", "F1001R", "F1001I",
+        "1001": dframe.loc[: , ["NAME", "S", "COUNT", "F1001W", "FWSTD1", "F1001R", "F1001I",
                                 "Q1001", "Q1001STD", "MDLF1001R", "MDLF1001I"]],
-        "1010": dframe.loc[: , ["S", "COUNT", "F1010W", "FWSTD2", "F1010R", "F1010I",
+        "1010": dframe.loc[: , ["NAME", "S", "COUNT", "F1010W", "FWSTD2", "F1010R", "F1010I",
                                 "Q1010", "Q1010STD", "MDLF1010R", "MDLF1010I"]],
     }
 
@@ -447,6 +447,8 @@ def convert_old_coupling(
                 f"MDLF{rdt}I": f"{IMAG}{MDL}",
             }
         )
+        rdt_dfs[rdt][f"{ERR}{REAL}"] = rdt_dfs[rdt][f"{ERR}{AMPLITUDE}"]
+        rdt_dfs[rdt][f"{ERR}{IMAG}"] = rdt_dfs[rdt][f"{ERR}{AMPLITUDE}"]
         tfs.write(Path(outputdir) / f"{new_file_name}{rdt}{EXT}", rdt_dfs[rdt])
 
 

tests/unit/test_betabeatsrc_output_converter.py

@@ -5,6 +5,8 @@
 
 from omc3.definitions.constants import PLANES
 from omc3.optics_measurements.constants import (
+    NAME,
+    S,
     AMPLITUDE,
     AMP_BETA_NAME,
     BETA_NAME,
@@ -196,8 +198,8 @@ def _assert_correct_normalized_dispersion_columns(outputdir: Path, plane: str) -
 def _assert_correct_coupling_columns(outputdir: Path, rdt: str) -> None:
     """Checks the expected columns are present in the normalized dispersion file in outputdir"""
     dframe = tfs.read(outputdir / f"f{rdt}.tfs")
-    expected_converted_columns = [AMPLITUDE, f"{ERR}AMP", PHASE, f"{ERR}{PHASE}", f"{REAL}",
-                                  f"{IMAG}", f"{REAL}{MDL}", f"{IMAG}{MDL}"]    # replace renamed
+    expected_converted_columns = [NAME, S, AMPLITUDE, f"{ERR}{AMPLITUDE}", PHASE, f"{ERR}{PHASE}", f"{REAL}", 
+                                  f"{ERR}{REAL}", f"{IMAG}", f"{ERR}{IMAG}", f"{REAL}{MDL}", f"{IMAG}{MDL}"]
     expected_renamed_columns = [f"F{rdt}W", f"Q{rdt}", f"Q{rdt}STD", f"F{rdt}R", f"F{rdt}I"]  # disappeared
 
     for col in expected_converted_columns: