Skip to content

Add convenience method to get total phase advances from TEAPOT_MATRIX_Lattice + reformatting #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
austin-hoover wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Add convenience method to get total phase advances from TEAPOT_MATRIX_Lattice + reformatting #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2cdae9
Fix: handle duplicate element names in madx parser
austin-hoover Sep 8, 2026
ae7f3a7
Rename variable
austin-hoover Sep 9, 2026
ed40d95
Add parser tests
austin-hoover Sep 9, 2026
b1dc636
Merge branch 'main' into madx-parser
austin-hoover Sep 9, 2026
74bb252
Add getTunes method to TEAPOT_MATRIX_Lattice
austin-hoover Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions py/orbit/parsers/madx_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import copy
import os
import sys
import re
Expand Down Expand Up @@ -365,8 +366,11 @@ def parse(self, MADXfileName):

self.collect_madx_lines(fileName, self.madxFilePath)

sequence_elem_dict = {}

for str_local in self._madxLines:
loc_flag_elem = True
sequence_elem = None

# Parse element/variable":="/sequence definition
if "=" in str_local and ":" not in str_local.split("=")[0]: # here we avoid the variable parsing twice
Expand All @@ -380,8 +384,8 @@ def parse(self, MADXfileName):
# we have the defined elem with additional params at the positioning !! not a variable, but can't be parsed as an elem !!
tokens = str_local.split(",")
name = tokens[0]
elem_tmp = self._accElemDict[name]
elem = self.parseParameters(str_local, elem_tmp)
sequence_elem = copy.deepcopy(self._accElemDict[name])
self.parseParameters(str_local, sequence_elem)

if re.search(r"[\w]* *:.*", str_local):
if str_local.rfind("sequence") >= 0:
Expand Down Expand Up @@ -441,7 +445,10 @@ def parse(self, MADXfileName):
aux = [x.split("at=")[-1] for x in tmp if "at=" in x]
position = eval(aux[0])

latt_elem = self._accElemDict[elem_name]
if sequence_elem is None:
sequence_elem = copy.deepcopy(self._accElemDict[elem_name])

latt_elem = sequence_elem
# he have the element, let's replace variables in parameters by numerical values here
latt_elem = self.recalculateParameters(latt_elem, localValDict)

Expand All @@ -453,10 +460,11 @@ def parse(self, MADXfileName):

if "from" in list(latt_elem.getParameters().keys()):
refer_elem_name = latt_elem.getParameter("from")
refer_elem = self._accElemDict[refer_elem_name]
refer_elem = sequence_elem_dict[refer_elem_name]
position += refer_elem.getParameter("position")

latt_elem.addParameter("position", position)
sequence_elem_dict[elem_name] = latt_elem
if latt_elem.hasParameter("apertype"):
latt_aper_entry = self.makeAperture(latt_elem)
latt_aper_entry.addParameter("position", position - length / 2.0)
Expand Down
Loading
Loading