Merge pull request #121 from desy-ml/120-cavity-__repr__-is-printing-…

…voltage-for-phase

CHANGELOG.md

@@ -19,6 +19,7 @@
 - Fix error raised when tracking a `ParameterBeam` through an active `BPM` (see #101) (@jank324)
 - Fix error in ASTRA beam import where the energy was set to `float64` instead of `float32` (see #111) (@jank324)
 - Fix missing passing of `total_charge` in `ParameterBeam.transformed_to` (see #112) (@jank324)
+- Fix `Cavitiy.__repr__` printing `voltage` value for `phase` property (see #121) (@jank324)
 
 ### 🐆 Other
 

cheetah/accelerator.py

@@ -23,9 +23,7 @@
 generate_unique_name = UniqueNameGenerator(prefix="unnamed_element")
 
 rest_energy = torch.tensor(
-    constants.electron_mass
-    * constants.speed_of_light**2
-    / constants.elementary_charge
+    constants.electron_mass * constants.speed_of_light**2 / constants.elementary_charge
 )  # electron mass
 electron_mass_eV = torch.tensor(
     physical_constants["electron mass energy equivalent in MeV"][0] * 1e6
@@ -1163,7 +1161,7 @@ def __repr__(self) -> str:
         return (
             f"{self.__class__.__name__}(length={repr(self.length)}, "
             + f"voltage={repr(self.voltage)}, "
-            + f"phase={repr(self.voltage)}, "
+            + f"phase={repr(self.phase)}, "
             + f"frequency={repr(self.frequency)}, "
             + f"name={repr(self.name)})"
         )

cheetah/track_methods.py

@@ -6,9 +6,7 @@
 from scipy import constants
 
 REST_ENERGY = torch.tensor(
-    constants.electron_mass
-    * constants.speed_of_light**2
-    / constants.elementary_charge
+    constants.electron_mass * constants.speed_of_light**2 / constants.elementary_charge
 )  # Electron mass
 
 

tests/test_compare_beam_type.py

@@ -1,6 +1,7 @@
 """
 Tests that ensure that both beam types produce (roughly) the same results.
 """
+
 import torch
 
 import cheetah