KEK-specific bugfixes (#511)

Author: wvangoet

omc3/model/accelerators/accelerator.py

@@ -185,7 +185,10 @@ def init_from_model_dir(self, model_dir: Path) -> None:
             bpm_mask = self.elements.index.str.match(self.RE_DICT[AccElementTypes.BPMS])
             self.model = self.elements.loc[bpm_mask, :]
         self.nat_tunes = [float(self.model.headers["Q1"]), float(self.model.headers["Q2"])]
-        self.energy = float(self.model.headers["ENERGY"])  # always 450GeV because we do not set it anywhere properly...
+        try:
+            self.energy = float(self.model.headers["ENERGY"])  # always 450GeV because we do not set it anywhere properly...
+        except KeyError: #KEK model does not have energy in the header
+            pass
 
         # Excitations #####################################
         driven_filenames = dict(acd=model_dir / TWISS_AC_DAT, adt=model_dir / TWISS_ADT_DAT)

omc3/model/accelerators/skekb.py

@@ -65,7 +65,8 @@
 from generic_parser import EntryPoint
 
 from omc3.model.accelerators.accelerator import (Accelerator,
-                                                 AcceleratorDefinitionError)
+                                                 AcceleratorDefinitionError,
+                                                 AccElementTypes)
 from omc3.utils import logging_tools
 
 LOGGER = logging_tools.get_logger(__name__)
@@ -75,6 +76,11 @@ class SKekB(Accelerator):
     """KEK's SuperKEKB accelerator."""
     NAME = "skekb"
     RINGS = ("ler", "her")
+    RE_DICT: dict[str, str] = {
+        AccElementTypes.BPMS: r"^M*",
+        AccElementTypes.MAGNETS: r".*",  
+        AccElementTypes.ARC_BPMS: r"^M*",
+    }
 
     @classmethod
     def get_parameters(cls):