xtrack 0.98.1__tar.gz → 0.98.3__tar.gz

{xtrack-0.98.1/xtrack.egg-info → xtrack-0.98.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xtrack
-Version: 0.98.1
+Version: 0.98.3
 Summary: Tracking library for particle accelerators
 Author: G. Iadarola et al.
 License-Expression: Apache-2.0

{xtrack-0.98.1 → xtrack-0.98.3}/tests/test_mad_writer.py

@@ -69,3 +69,24 @@ def test_mad_writer(case):
 
     xo.assert_allclose(tw2.qs, tw.qs, rtol=1e-4, atol=0)
     xo.assert_allclose(tw2.ddqx, tw.ddqx, rtol=1e-3, atol=0)
+
+def test_mad_writer_bend():
+    env = xt.Environment()
+    line = env.new_line(components=[
+        env.new('b0', 'Bend', length=1.0, angle=0.1,),
+        env.new('b1', 'Bend', length=1.0, angle=0.1, k0=0.01),
+        env.new('b2', 'RBend', length_straight=1.0, angle=0.1,),
+        env.new('b3', 'RBend', length_straight=1.0, angle=0.1, k0=0.01),
+        ])
+
+    mad_src = line.to_madx_sequence('seq')
+
+    env2 = xt.load(string=mad_src, format='madx')
+    line2 = env2.lines['seq']
+
+    for nn in ['b0', 'b1', 'b2', 'b3']:
+        el1 = line[nn]
+        el2 = line2[nn]
+        assert el1.length == el2.length
+        assert el1.angle == el2.angle
+        assert el1.k0 == el2.k0

{xtrack-0.98.1 → xtrack-0.98.3}/tests/test_twiss.py

@@ -675,10 +675,10 @@ def test_twiss_range(test_context, cycle_to, line_name, check, init_at_edge, col
 
     line = collider[line_name]
 
-    if isinstance(test_context, xo.ContextCpu) and (
+    if isinstance(test_context, xo.ContextCpu) and line._context is not None and (
         test_context.omp_num_threads != line._context.omp_num_threads):
         buffer = test_context.new_buffer()
-    elif isinstance(test_context, line._context.__class__):
+    elif line._context is not None and isinstance(test_context, line._context.__class__):
         buffer = line._buffer
     else:
         buffer = test_context.new_buffer()
@@ -1783,10 +1783,10 @@ def test_twiss_range_start_end(test_context, line_name, section, collider_for_te
     if collider.lhcb2.element_names[0] != 'ip3':
         collider.lhcb2.cycle('ip3', inplace=True)
 
-    if isinstance(test_context, xo.ContextCpu) and (
+    if isinstance(test_context, xo.ContextCpu) and line._context is not None and (
         test_context.omp_num_threads != line._context.omp_num_threads):
         buffer = test_context.new_buffer()
-    elif isinstance(test_context, line._context.__class__):
+    elif line._context is not None and isinstance(test_context, line._context.__class__):
         buffer = line._buffer
     else:
         buffer = test_context.new_buffer()
@@ -1836,10 +1836,10 @@ def test_arbitrary_start(test_context, collider_for_test_twiss_range):
     assert line.twiss_default['method'] == '4d'
     assert line.twiss_default['reverse']
 
-    if isinstance(test_context, xo.ContextCpu) and (
+    if isinstance(test_context, xo.ContextCpu) and line._context is not None and (
         test_context.omp_num_threads != line._context.omp_num_threads):
         buffer = test_context.new_buffer()
-    elif isinstance(test_context, line._context.__class__):
+    elif line._context is not None and isinstance(test_context, line._context.__class__):
         buffer = line._buffer
     else:
         buffer = test_context.new_buffer()
@@ -1882,10 +1882,10 @@ def test_part_from_full_periodic(test_context, collider_for_test_twiss_range):
     assert line.twiss_default['method'] == '4d'
     assert line.twiss_default['reverse']
 
-    if isinstance(test_context, xo.ContextCpu) and (
+    if isinstance(test_context, xo.ContextCpu) and line._context is not None and (
         test_context.omp_num_threads != line._context.omp_num_threads):
         buffer = test_context.new_buffer()
-    elif isinstance(test_context, line._context.__class__):
+    elif line._context is not None and isinstance(test_context, line._context.__class__):
         buffer = line._buffer
     else:
         buffer = test_context.new_buffer()

xtrack-0.98.3/xtrack/_version.py

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

{xtrack-0.98.1 → xtrack-0.98.3}/xtrack/line.py

@@ -4539,8 +4539,7 @@ class Line:
     @property
     def _context(self):
         if not self._has_valid_tracker():
-            raise RuntimeError(
-                '`Line._context` can only be called after `Line.build_tracker`')
+            return None
         return self.tracker._context
 
     @property

{xtrack-0.98.1 → xtrack-0.98.3}/xtrack/mad_writer.py

@@ -391,7 +391,8 @@ def bend_to_mad_str(eref, bend_type='sbend', mad_type=MadType.MADX, substituted_
     else:
         raise ValueError(f"bend_type {bend_type} not recognized")
     tokens.append(mad_assignment('angle', _ge(eref.h) * _ge(eref.length) * weight, mad_type, substituted_vars=substituted_vars))
-    tokens.append(mad_assignment('k0', _ge(eref.k0), mad_type, substituted_vars=substituted_vars))
+    if not eref.k0_from_h._value: 
+        tokens.append(mad_assignment('k0', _ge(eref.k0), mad_type, substituted_vars=substituted_vars))
     tokens.append(mad_assignment('e1', _ge(eref.edge_entry_angle), mad_type, substituted_vars=substituted_vars))
     tokens.append(mad_assignment('e2', _ge(eref.edge_exit_angle), mad_type, substituted_vars=substituted_vars))
     tokens.append(mad_assignment('fint', _ge(eref.edge_entry_fint), mad_type, substituted_vars=substituted_vars))

{xtrack-0.98.1 → xtrack-0.98.3}/xtrack/twiss.py

@@ -790,9 +790,8 @@ def twiss_line(line, particle_ref=None, method=None,
         assert 'R_matrix' in twiss_res._data
         if method == '4d':
             raise ValueError('method="4d" not supported for eneloss_and_damping=True')
-        if radiation_method != 'full' or twiss_res._data['R_matrix_ebe'] is None:
-            with xt.line._preserve_config(line):
-              with xt.line._preserve_track_flags(line):
+        with xt.line._preserve_config(line):
+            with xt.line._preserve_track_flags(line):
                 line.tracker.track_flags.XS_FLAG_SR_KICK_SAME_AS_FIRST = False
                 line.config.XTRACK_SYNRAD_SCALE_SAME_AS_FIRST = False
                 _, RR, _, _, _, RR_ebe = _find_periodic_solution(
@@ -811,10 +810,9 @@ def twiss_line(line, particle_ref=None, method=None,
                     delta_disp=None,
                     compute_R_element_by_element=True,
                     only_markers=only_markers,
+                    factor_adapt_steps=0.03 # 10 times smaller than for optics
+                                            # to campture small damping effects
                     )
-        else:
-            RR = twiss_res._data['R_matrix']
-            RR_ebe = twiss_res._data['R_matrix_ebe']
 
         eneloss_damp_res = _compute_eneloss_and_damping_rates(
                 particle_on_co=twiss_res.particle_on_co, R_matrix=RR,
@@ -2128,7 +2126,9 @@ def _find_periodic_solution(line, particle_on_co, particle_ref, method,
                             only_markers=False,
                             only_orbit=False,
                             periodic_mode='periodic',
-                            include_collective=False):
+                            include_collective=False,
+                            factor_adapt_steps=0.3
+                            ):
 
     eigenvalues = None
     Rot = None
@@ -2235,10 +2235,10 @@ def _find_periodic_solution(line, particle_on_co, particle_ref, method,
                 sigma_px_start = np.sqrt(gamx_at_start * gemitt_x)
                 sigma_py_start = np.sqrt(gamy_at_start * gemitt_y)
 
-                if ((steps_r_matrix['dx'] < 0.3 * sigma_x_start)
-                    and (steps_r_matrix['dy'] < 0.3 * sigma_y_start)
-                    and (steps_r_matrix['dpx'] < 0.3 * sigma_px_start)
-                    and (steps_r_matrix['dpy'] < 0.3 * sigma_py_start)):
+                if ((steps_r_matrix['dx'] < factor_adapt_steps * sigma_x_start)
+                    and (steps_r_matrix['dy'] < factor_adapt_steps * sigma_y_start)
+                    and (steps_r_matrix['dpx'] < factor_adapt_steps * sigma_px_start)
+                    and (steps_r_matrix['dpy'] < factor_adapt_steps * sigma_py_start)):
                     break # sufficient accuracy
                 else:
                     steps_r_matrix['dx'] = 0.01 * sigma_x_start

{xtrack-0.98.1 → xtrack-0.98.3/xtrack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xtrack
-Version: 0.98.1
+Version: 0.98.3
 Summary: Tracking library for particle accelerators
 Author: G. Iadarola et al.
 License-Expression: Apache-2.0

xtrack-0.98.1/xtrack/_version.py

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