Fix tbt converter output flag (#433)

* fix for tbt_converter
* test and dependency

Author: JoschD

CHANGELOG.md

@@ -1,5 +1,10 @@
 # OMC3 Changelog
 
+#### 2023-11-29 - v0.12.1 - _jdilly_
+
+- Fixed:
+ - `tbt_converter` now also passes given output format to writer when running without noise.
+
 #### 2023-11-29 - v0.12.0 - _jdilly_
 
 - Added to harmonic analysis:

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.12.0"
+__version__ = "0.12.1"
 __author__ = "pylhc"
 __author_email__ = "[email protected]"
 __license__ = "MIT"

omc3/tbt_converter.py

@@ -126,6 +126,7 @@ def _read_and_write_files(opt):
             if opt.noise_levels is None:
                 tbt.write(
                     Path(opt.outputdir) / f"{_file_name_without_sdds(input_file)}{suffix}",
+                    datatype=opt.output_datatype,
                     tbt_data=tbt_data,
                 )
             else:

setup.py

@@ -30,7 +30,7 @@
     "tables>=3.6.0",
     "uncertainties>=3.1.4",
     "optics-functions>=0.1.0",
-    "turn_by_turn>=0.4.0",
+    "turn_by_turn>=0.6.0",
     "requests>=2.27.0",
 ]
 

tests/unit/test_tbt_converter.py

@@ -81,6 +81,24 @@ def test_converter_more_files_with_noise(_sdds_file, _test_file):
         _compare_tbt(origin, new, True, noiselevel * 10)
 
 
+@pytest.mark.basic
+def test_change_output_format(_sdds_file, _test_file):
+    with pytest.raises(UnicodeError):
+        _sdds_file.read_text()  # making sure this is binary
+
+    # convert ---
+    origin = tbt.read_tbt(_sdds_file, datatype="lhc")
+    converter_entrypoint(files=[_sdds_file], outputdir=_test_file.parent, output_datatype="ascii")
+
+    # test output ---    
+    _test_file.read_text()  # making sure this is ascii
+    new = tbt.read_tbt(_test_file, datatype="ascii")
+    _compare_tbt(origin, new, True)
+
+
+# Test Helper ------------------------------------------------------------------
+
+
 def _compare_tbt(
     origin: tbt.TbtData, new: tbt.TbtData, no_binary: bool, max_deviation=ASCII_PRECISION
 ) -> None: