Merge pull request #51 from T-Nicholls/main

We always want the lattice energy in eV

Author: T-Nicholls

pyproject.toml

@@ -15,7 +15,7 @@ description = "Accelerator Toolbox Interface for Pytac"
 dependencies = [
     "numpy",
     "scipy",
-    "pytac>=0.3.0",
+    "pytac>=0.6.1",
     "accelerator-toolbox (>=0.2.0,<0.7.1)",
     "cothread",
     "softioc",

src/atip/load_sim.py

@@ -32,7 +32,7 @@ def load_from_filepath(
     at_lattice = at.load.load_mat(
         at_lattice_filepath,
         name=pytac_lattice.name,
-        energy=pytac_lattice.get_value("energy"),
+        energy=pytac_lattice.get_value("energy", units=pytac.PHYS),
     )
     return load(pytac_lattice, at_lattice, callback, disable_emittance)
 

src/atip/utils.py

@@ -50,7 +50,7 @@ def loader(mode="I04", callback=None, disable_emittance=False):
     at_lattice = load_at_lattice(
         mode,
         periodicity=1,
-        energy=pytac_lattice.get_value("energy"),
+        energy=pytac_lattice.get_value("energy", units=pytac.PHYS),
     )
     lattice = atip.load_sim.load(pytac_lattice, at_lattice, callback, disable_emittance)
     return lattice