xtrack 0.83.3__tar.gz → 0.83.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtrack
-Version: 0.83.3
+Version: 0.83.5
 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.5}/tests/test_madloader.py

@@ -304,11 +304,11 @@ def test_matrix():
 
     mad.input("""
     a11=1;
-    m1: matrix,
+    mat: matrix,l=0.4,
           rm11:=a11,rm12=2,rm21=3,rm22=4,
           kick1=0.1,kick2=0.2,kick3=0.3;
 
-    ss: sequence, l=1; m1: m1, at=0; endsequence;
+    ss: sequence, l=1; mm: mat, at=0.3; endsequence;
 
     beam; use, sequence=ss;
     """)
@@ -316,7 +316,13 @@ def test_matrix():
     line = MadLoader(mad.sequence.ss).make_line()
     line = MadLoader(mad.sequence.ss, enable_expressions=True).make_line()
     line.vars['a11'] = 2.0
-    assert line[1].m1[0, 0] == line.vars['a11']._value
+    assert line['mm'].m1[0, 0] == line.vars['a11']._value
+
+    line.reset_s_at_end_turn
+
+    part = xt.Particles()
+    line['mm'].track(part)
+    xo.assert_allclose(part.s, 0.4, atol=1e-12, rtol=0)
 
 
 def test_srotation():

{xtrack-0.83.3 → xtrack-0.83.5}/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.5/xtrack/_version.py

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

{xtrack-0.83.3 → xtrack-0.83.5}/xtrack/beam_elements/elements_src/firstordertaylormap.h

@@ -12,6 +12,8 @@
 GPUFUN
 void FirstOrderTaylorMap_track_local_particle(FirstOrderTaylorMapData el, LocalParticle* part0){
 
+    double const length = FirstOrderTaylorMapData_get_length(el);
+
     START_PER_PARTICLE_BLOCK(part0, part);
         double x0 = LocalParticle_get_x(part);
         double px0 = LocalParticle_get_px(part);
@@ -66,6 +68,7 @@ void FirstOrderTaylorMap_track_local_particle(FirstOrderTaylorMapData el, LocalP
 
         LocalParticle_update_ptau(part, ptau);
         LocalParticle_set_zeta(part,tau*beta0);
+        LocalParticle_add_to_s(part, length);
     END_PER_PARTICLE_BLOCK;
 }
 

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

@@ -2249,7 +2249,7 @@ class Line:
         """Slice the line so that positions in s never fall inside an element."""
 
         if not self._has_valid_tracker():
-            self.build_tracker() # To resolve replicase and slices
+            self.build_tracker(compile=False) # To resolve replicas and slices
 
         self.discard_tracker()
 
@@ -3100,7 +3100,7 @@ class Line:
             raise NameError('mode is deprecated, use model instead')
 
         if not self._has_valid_tracker():
-            self.build_tracker()
+            self.build_tracker(compile=False)
 
         assert model in [None, 'mean', 'quantum']
         assert model_beamstrahlung in [None, 'mean', 'quantum']
@@ -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.5}/xtrack/tracker.py

@@ -61,10 +61,6 @@ class Tracker:
             raise ValueError("`enable_pipeline_hold` is not implemented in "
                              "non-collective mode")
 
-        if not compile and self.iscollective:
-            raise NotImplementedError("Skip compilation is not implemented in "
-                                      "collective mode")
-
         if local_particle_src is None:
             local_particle_src = xt.Particles.gen_local_particle_api()
 

{xtrack-0.83.3 → xtrack-0.83.5}/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.5}/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.5/xtrack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtrack
-Version: 0.83.3
+Version: 0.83.5
 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'