Fix: Do not attempt to write when knob isn't found in LSA optics (#101)

Author: fsoubelet

pylhc/__init__.py

@@ -10,7 +10,7 @@
 __title__ = "pylhc"
 __description__ = "An accelerator physics script collection for the OMC team at CERN."
 __url__ = "https://github.com/pylhc/pylhc"
-__version__ = "0.7.0"
+__version__ = "0.7.1"
 __author__ = "pylhc"
 __author_email__ = "pylhc@github.com"
 __license__ = "MIT"

pylhc/lsa_to_madx.py

@@ -222,17 +222,20 @@ def main():
                 madx_commands_string = get_madx_script_from_definition_dataframe(
                     deltas_df=knob_definition, lsa_knob=lsa_knob, trim=trim_value
                 )
-            except (OSError, IOError):
+
+            except (OSError, IOError):  # raised by pjlsa if knob not found
                 LOG.warning(f"Could not find knob '{lsa_knob}' in the given optics '{lsa_optics}' - skipping")
                 unfound_knobs.append(lsa_knob)
 
-            definition_file = f"{lsa_knob.replace('/', '_')}_definition.tfs"
-            LOG.debug(f"Writing knob definition TFS file at '{definition_file}'")
-            tfs.write(definition_file, knob_definition, save_index=True)
+            else:  # we've managed to find knobs
+                # Don't write this in the try block, as it could raise IOError when failing
+                definition_file = f"{lsa_knob.replace('/', '_')}_definition.tfs"
+                LOG.debug(f"Writing knob definition TFS file at '{definition_file}'")
+                tfs.write(definition_file, knob_definition, save_index=True)
 
-            madx_file = f"{lsa_knob.replace('/', '_')}_knob.madx"
-            LOG.debug(f"Writing MAD-X commands to file '{madx_file}'")
-            Path(madx_file).write_text(madx_commands_string)
+                madx_file = f"{lsa_knob.replace('/', '_')}_knob.madx"
+                LOG.debug(f"Writing MAD-X commands to file '{madx_file}'")
+                Path(madx_file).write_text(madx_commands_string)
 
     if unfound_knobs:
         LOG.info(f"The following knobs could not be found in the '{lsa_optics}' optics: \n\t\t" + "\n\t\t".join(unfound_knobs))