xtrack 0.83.3__tar.gz → 0.83.4__tar.gz

{xtrack-0.83.3/xtrack.egg-info → xtrack-0.83.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtrack
-Version: 0.83.3
+Version: 0.83.4
 Summary: Tracking library for particle accelerators
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xtrack

{xtrack-0.83.3 → xtrack-0.83.4}/tests/test_match_orbit_bump.py

@@ -643,9 +643,11 @@ def test_match_bump_sets_init_middle(test_context):
                              'hllhc15_thick/lhc_thick_with_knobs.json')
     line.build_tracker(test_context)
 
+    line.insert('mymarker', xt.Marker(), at='mb.c28l8.b1@start')
+
     opt = line.match(
         start='mq.30l8.b1', end='mq.23l8.b1',
-        init_at='mb.b28l8.b1', betx=1, bety=1, y=3e-3, py=0, # <-- conditions at point inside the range
+        init_at='mymarker', betx=1, bety=1, y=3e-3, py=0, # <-- conditions at point inside the range
         vary=xt.VaryList(['acbv30.l8b1', 'acbv28.l8b1', 'acbv26.l8b1', 'acbv24.l8b1'],
                         step=1e-10, limits=[-1e-3, 1e-3]),
         targets = [

xtrack-0.83.4/xtrack/_version.py

@@ -0,0 +1 @@
+__version__ = '0.83.4'

{xtrack-0.83.3 → xtrack-0.83.4}/xtrack/line.py

@@ -3584,6 +3584,7 @@ class Line:
         assert inplace is True, 'Only inplace is supported for now'
 
         self._frozen_check()
+        self.replace_all_repeated_elements()
 
         if keep is None:
             keep = []
@@ -3906,6 +3907,7 @@ class Line:
                                       ' used')
 
         self._frozen_check()
+        self.replace_all_repeated_elements()
 
         if keep is None:
             keep = []

{xtrack-0.83.3 → xtrack-0.83.4}/xtrack/twiss.py

@@ -2136,6 +2136,14 @@ def _handle_init_inside_range(kwargs):
     reverse = kwargs.pop('reverse')
 
     ele_name_init =  init.element_name
+    ele_init = line.get(ele_name_init)
+    if isinstance(ele_init, xt.Replica):
+        ele_init = ele_init.resolve()
+    if not isinstance(ele_init, xt.Marker):
+        raise ValueError(
+            'The element at the initial position is not a Marker. '
+            'This is not yet supported')
+
     if reverse:
         assert _str_to_index(line, ele_name_init) <= _str_to_index(line, start)
         assert _str_to_index(line, ele_name_init) >= _str_to_index(line, end)

{xtrack-0.83.3 → xtrack-0.83.4}/xtrack/twissplot.py

@@ -223,7 +223,7 @@ class TwissPlot(object):
 
         if self.lattice:
             self.lattice.clear()
-            self._lattice(["k0l", "kn0l", "angle"], "#a0ffa0", "Bend h")
+            self._lattice(["angle_rad"], "#a0ffa0", "Bend h")
             self._lattice(["ks0l"], "#ffa0a0", "Bend v")
             self._lattice(["kn1l", "k1l"], "#a0a0ff", "Quad")
             self._lattice(["hkick"], "#e0a0e0", "Kick h")

{xtrack-0.83.3 → xtrack-0.83.4/xtrack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtrack
-Version: 0.83.3
+Version: 0.83.4
 Summary: Tracking library for particle accelerators
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xtrack

xtrack-0.83.3/xtrack/_version.py

@@ -1 +0,0 @@
-__version__ = '0.83.3'