diff --git a/ess/lib_tw_elem.py b/ess/lib_tw_elem.py index 0b3f22ed7c7e4807931d76db2d49f5748774b74d..5e0642e13e45e5cf00e00a12a3dff09ccc4418e0 100644 --- a/ess/lib_tw_elem.py +++ b/ess/lib_tw_elem.py @@ -160,7 +160,7 @@ class ELEM: # Update idx, idx_elem, s self.idx += 1 self.idx_elem += 1 - self._idx_madx = f"{self.idx_elem+1:04d}" + self._idx_madx = f"{self.idx_elem + 1:04d}" self.s += self.L def get_tw(self): @@ -451,16 +451,11 @@ class QUAD(ELEM): return lin def get_madx(self): - i = "0" * (3 - int(numpy.log10(self.idx_elem + 1))) + str(self.idx_elem + 1) - - if self.name != "": - lin = self.name + ": QUADRUPOLE, " - if self.name == "": - lin = "ELEM" + i + "_QUAD" + ": QUADRUPOLE, " - lin += "L=" + str(self.L) + ", " - lin += "K1=" + str(self.G / Brho(self.gamma)) + "; " - - return lin + if self.name: + name = self.name + else: + name = f"ELEM{self.idx_elem + 1:04d}_QUAD" + return f"{name}: QUADRUPOLE, L={self.L}, K1={self.G / Brho(self.gamma)};" def get_fluka(self): i = "0" * (3 - int(numpy.log10(self.idx_elem + 1))) + str(self.idx_elem + 1)