xtrack 0.84.5__tar.gz → 0.84.7__tar.gz

{xtrack-0.84.5/xtrack.egg-info → xtrack-0.84.7}/PKG-INFO

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

{xtrack-0.84.5 → xtrack-0.84.7}/tests/test_twiss.py

@@ -1976,3 +1976,24 @@ def test_coupling_calculations():
     xo.assert_allclose(np.abs(tw.c_minus_re + 1j*tw.c_minus_im), tw.c_minus, rtol=1e-10, atol=0)
     xo.assert_allclose(tw.c_minus_re_0, tw.c_minus_re[0], rtol=1e-10, atol=0)
     xo.assert_allclose(tw.c_minus_im_0, tw.c_minus_im[0], rtol=1e-10, atol=0)
+
+def test_twiss_collective_end_is_len():
+
+    d1=xt.Drift(length=1)
+    d2=xt.Drift(length=1)
+    d3=xt.Drift(length=1)
+
+    d2.iscollective=True
+
+    line=xt.Line([d1,d2,d3])
+    line.particle_ref = xt.Particles(energy0=10e9, mass0=xt.PROTON_MASS_EV)
+    t = line.twiss4d(betx=1,bety=1,include_collective=True)
+
+    ddd1=xt.Drift(length=1)
+    ddd2=xt.Drift(length=1)
+    ddd3=xt.Drift(length=1)
+    line2=xt.Line([ddd1,ddd2,ddd3])
+    line2.particle_ref = xt.Particles(energy0=10e9, mass0=xt.PROTON_MASS_EV)
+    t2 = line2.twiss4d(betx=1,bety=1,include_collective=True)
+
+    xo.assert_allclose(t.betx, t2.betx, atol=1e-12, rtol=0)

xtrack-0.84.7/xtrack/_version.py

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

{xtrack-0.84.5 → xtrack-0.84.7}/xtrack/mad_loader.py

@@ -420,8 +420,6 @@ class Alignment:
 class Dummy:
     type = "None"
 
-def _default_factory():
-    return 0.
 
 class MadLoader:
     @staticmethod
@@ -429,11 +427,11 @@ class MadLoader:
         """Enable expressions"""
         if line._var_management is None:
             line._init_var_management()
+        line.vars.default_to_zero = True
 
         from xdeps.madxutils import MadxEval
 
         _var_values = line._var_management["data"]["var_values"]
-        _var_values.default_factory = _default_factory
         for name, par in mad.globals.cmdpar.items():
             if replace_in_expr is not None:
                 for k, v in replace_in_expr.items():

{xtrack-0.84.5 → xtrack-0.84.7}/xtrack/tracker.py

@@ -839,7 +839,7 @@ class Tracker:
                 ret = pp.track(particles)
             else:
                 # The start part is a non-collective tracker
-                if (ele_stop is not None
+                if (ele_stop is not None and ele_stop < self.num_elements
                     and tt == num_turns - 1 and self._element_part[ele_stop] == ipp):
                     # The stop element is also in this part, so track until ele_stop
                     i_stop_in_part = self._element_index_in_part[ele_stop]

{xtrack-0.84.5 → xtrack-0.84.7/xtrack.egg-info}/PKG-INFO

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

xtrack-0.84.5/xtrack/_version.py

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