xtrack 0.98.2__tar.gz → 0.98.4__tar.gz

{xtrack-0.98.2/xtrack.egg-info → xtrack-0.98.4}/PKG-INFO

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

{xtrack-0.98.2 → xtrack-0.98.4}/tests/test_environment.py

@@ -2003,6 +2003,50 @@ def test_copy_element_from_other_env():
     assert env2['quad/env2'].knl[0] == 0
     assert env2['quad/env2'].knl[1] == 8
 
+def test_import_line_matrix_attribute():
+
+    apert = xt.LongitudinalLimitRect(
+        min_zeta = -1e-3,
+        max_zeta = 1e-3,
+        min_pzeta = -1e-3,
+        max_pzeta = 1e-3)
+    tmap = xt.FirstOrderTaylorMap(
+        length=0,
+        m0=[ 2.3e-3,  3.07e-04,  0,  0,
+            -2.06e-5,  0],
+        m1=[[ 1, -6.1e-5,  0,
+            0,  0, -2.3e-3],
+            [ 5.2e-7,  9.9e-1,  0,
+            0,  0,  1.0e-7],
+            [ 0,  0,  1,
+            2.0e-5,  0,  0],
+            [ 0,  0,  0,
+            1,  0,  0],
+            [-1.0e-7, -2.3e-3,  0,
+            0,  1,  4.1e-5],
+            [ 0,  0,  0,
+            0,  0,  1]]
+    )
+    line = xt.Line(
+        elements=[apert, tmap],
+        element_names=['apert', 'taylor_map']
+    )
+
+    line['a'] = 10
+    line['taylor_map'].m1[2, 1]= 'a'
+
+    assert line['taylor_map'].m1[2, 1] == 10
+    line['a'] = 15
+    assert line['taylor_map'].m1[2, 1] == 15
+
+    env = xt.Environment()
+    env.import_line(line, suffix_for_common_elements='', line_name='line_env')
+    assert env['a'] == 15
+    assert env['taylor_map'].m1[2, 1] == 15
+
+    env['a'] = 20
+    assert env['taylor_map'].m1[2, 1] == 20
+
 
 def test_insert_repeated_elements():
 
@@ -4192,3 +4236,106 @@ def test_rename_var():
     assert str(env.ref['cc']._expr) == "(2.0 * vars['aa'])"
     assert str(env.ref['mb'].angle._expr) == "(vars['cc'] * 0.001)"
     assert str(env.ref['mb'].knl[1]._expr) == "(3.0 * vars['cc'])"
+
+def test_parametric_line_update():
+
+    env = xt.Environment()
+    env.particle_ref = xt.Particles(kinetic_energy0=2.86e9, mass0 = xt.ELECTRON_MASS_EV)
+
+    env['l_cell']  = 5.00  # cell length is 5 m
+    env['l_bend']  = 1.50  # length of bend (along arc using sector bends)
+    env['l_quad']  = 0.40  # length of quads
+    env['l_drift'] = '(l_cell - 2*l_bend - 2*l_quad)/4.'  # remaining length for drifts
+    print( f"Initial value of env['l_drift'] ={env['l_drift']:6.3f}" )
+
+    env['alfB'] =  np.pi/20 # 20 cells each with two bends in 100 m ring
+    env['kQf']  =  0.7
+    env['kQd']  = -0.7
+
+    # Definition of elements and two ways to define a FODO cell
+    env.new('drift', xt.Drift, length='l_drift')
+    env.new('mb',    xt.Bend, length='l_bend', angle='alfB', k0_from_h=True,
+            edge_entry_angle='alfB/2', edge_exit_angle='alfB/2') # shoild be kind of RBend
+
+    env.new('mQf', xt.Quadrupole, length='l_quad', k1='kQf')
+    env.new('mQd', xt.Quadrupole, length='l_quad', k1='kQd')
+
+    cell_line = env.new_line( components =[  # analogeous to MAD LINE
+        env.place('mQf'), env.place('drift'), env.place('mb'), env.place('drift'),
+        env.place('mQd'), env.place('drift'), env.place('mb'), env.place('drift'),
+        ])
+
+    cell_sequ1 = env.new_line( length='l_cell', components =[  # analogeous to MAD Sequence
+        env.place('mQf', at='0*l_drift + 0.5*l_quad + 0.0*l_bend'),
+        env.place('mb',  at='1*l_drift + 1.0*l_quad + 0.5*l_bend'),
+        env.place('mQd', at='2*l_drift + 1.5*l_quad + 1.0*l_bend'),
+        env.place('mb',  at='3*l_drift + 2.0*l_quad + 1.5*l_bend'),
+        ])
+
+    cell_sequ2 = env.new_line( length='l_cell', components =[  # analogeous to MAD Sequence
+        env.place('mQf', at='0*(l_cell - 2*l_bend - 2*l_quad)/4. + 0.5*l_quad + 0.0*l_bend'),
+        env.place('mb',  at='1*(l_cell - 2*l_bend - 2*l_quad)/4. + 1.0*l_quad + 0.5*l_bend'),
+        env.place('mQd', at='2*(l_cell - 2*l_bend - 2*l_quad)/4. + 1.5*l_quad + 1.0*l_bend'),
+        env.place('mb',  at='3*(l_cell - 2*l_bend - 2*l_quad)/4. + 2.0*l_quad + 1.5*l_bend'),
+        ])
+
+    t_cell_line = cell_line.get_table()
+    t_cell_sequ1 = cell_sequ1.get_table()
+    t_cell_sequ2 = cell_sequ2.get_table()
+    for tt in [t_cell_line, t_cell_sequ1, t_cell_sequ2]:
+        xo.assert_allclose(tt.s, [0. , 0.4, 0.7, 2.2, 2.5, 2.9, 3.2, 4.7, 5. ],
+                           atol=1e-14)
+
+    env['l_quad'] = 0.30
+    cell_sequ1.regenerate_from_composer()
+    cell_sequ2.regenerate_from_composer()
+    t_cell_line = cell_line.get_table()
+    t_cell_sequ1 = cell_sequ1.get_table()
+    t_cell_sequ2 = cell_sequ2.get_table()
+    for tt in [t_cell_line, t_cell_sequ1, t_cell_sequ2]:
+        xo.assert_allclose(tt.s, [0.  , 0.3 , 0.65, 2.15, 2.5 , 2.8 , 3.15, 4.65, 5.],
+                           atol=1e-14)
+
+    # back to original
+    env['l_quad'] = 0.40
+    cell_sequ1.regenerate_from_composer()
+    cell_sequ2.regenerate_from_composer()
+    t_cell_line = cell_line.get_table()
+    t_cell_sequ1 = cell_sequ1.get_table()
+    t_cell_sequ2 = cell_sequ2.get_table()
+    for tt in [t_cell_line, t_cell_sequ1, t_cell_sequ2]:
+        xo.assert_allclose(tt.s, [0. , 0.4, 0.7, 2.2, 2.5, 2.9, 3.2, 4.7, 5. ],
+                           atol=1e-14)
+
+    # increased cell length
+    env['l_cell'] = 5.50
+    cell_sequ1.regenerate_from_composer()
+    cell_sequ2.regenerate_from_composer()
+    t_cell_line = cell_line.get_table()
+    t_cell_sequ1 = cell_sequ1.get_table()
+    t_cell_sequ2 = cell_sequ2.get_table()
+    for tt in [t_cell_line, t_cell_sequ1, t_cell_sequ2]:
+        xo.assert_allclose(tt.s,
+                [0.   , 0.4  , 0.825, 2.325, 2.75 , 3.15 , 3.575, 5.075, 5.5  ],
+                atol=1e-14)
+
+def test_str_in_composer_to_dict_from_dict():
+    env = xt.Environment()
+
+    line = env.new_line(components=[
+        env.new('q1', 'Quadrupole', length=1.0, at=2),
+        'q1',
+        'q1']
+    )
+    assert isinstance(line.composer.components[0], xt.Place)
+    assert line.composer.components[0].name == 'q1'
+    assert line.composer.components[0].at == 2
+    assert line.composer.components[1] == 'q1'
+    assert line.composer.components[2] == 'q1'
+
+    line2 = xt.Line.from_dict(line.to_dict())
+    assert isinstance(line2.composer.components[0], xt.Place)
+    assert line2.composer.components[0].name == 'q1'
+    assert line2.composer.components[0].at == 2
+    assert line2.composer.components[1] == 'q1'
+    assert line2.composer.components[2] == 'q1'

{xtrack-0.98.2 → xtrack-0.98.4}/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.2 → xtrack-0.98.4}/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.4/xtrack/_version.py

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

{xtrack-0.98.2 → xtrack-0.98.4}/xtrack/builder.py

@@ -154,6 +154,11 @@ class Builder:
         formatter = xd.refs.CompactFormatter(scope=None)
 
         for cc in self.components:
+
+            if isinstance(cc, str):
+                dct['components'].append(cc)
+                continue
+
             if not isinstance(cc, xt.Place):
                 raise NotImplementedError('Only Place components are implemented for now')
 
@@ -211,6 +216,10 @@ class Builder:
         out = cls(env=env)
         components = dct.pop('components')
         for cc in components:
+            if isinstance(cc, str):
+                out.components.append(cc)
+                continue
+
             if isinstance(cc['name'], dict):
                 assert cc['name']['__class__'] == 'Line'
                 name = xt.Line.from_dict(cc['name'], _env=env)

{xtrack-0.98.2 → xtrack-0.98.4}/xtrack/environment.py

@@ -428,7 +428,6 @@ class Environment:
 
         if not compose:
             out.end_compose()
-            out.composer = None
 
         self._lines_weakrefs.add(out) # Weak references
 

{xtrack-0.98.2 → xtrack-0.98.4}/xtrack/line.py

@@ -57,7 +57,7 @@ from .general import _print
 
 log = logging.getLogger(__name__)
 
-_ALLOWED_ELEMENT_TYPES_IN_NEW   = [
+_ALLOWED_ELEMENT_TYPES_IN_NEW = [
     xt.Drift, xt.DriftExact,
     xt.Magnet, xt.Replica, xt.Marker,
     xt.Bend, xt.RBend, xt.Quadrupole, xt.Sextupole, xt.Octupole, xt.Multipole,
@@ -65,7 +65,7 @@ _ALLOWED_ELEMENT_TYPES_IN_NEW   = [
     xt.Cavity, xt.RFMultipole, xt.CrabCavity, xt.ReferenceEnergyIncrease,
     xt.XYShift, xt.XRotation, xt.YRotation, xt.SRotation, xt.ZetaShift,
     xt.LimitRacetrack, xt.LimitRectEllipse, xt.LimitRect, xt.LimitEllipse,
-    xt.LimitPolygon, xt.DipoleEdge]
+    xt.LimitPolygon, xt.DipoleEdge, xt.LongitudinalLimitRect, xt.FirstOrderTaylorMap]
 
 _ALLOWED_ELEMENT_TYPES_DICT = {
     cc.__name__: cc for cc in _ALLOWED_ELEMENT_TYPES_IN_NEW}
@@ -3764,7 +3764,8 @@ class Line:
         newline = Line(elements=[], element_names=[])
 
         for ee, nn in zip(self._elements, self.element_names):
-            if isinstance(ee, Multipole) and nn not in keep:
+            if (isinstance(ee, Multipole) and nn not in keep and
+                not(ee.isthick and ee.length != 0)):
                 ctx2np = ee._context.nparray_from_context_array
                 aux = ([ee.hxl]
                         + list(ctx2np(ee.knl)) + list(ctx2np(ee.ksl)))
@@ -4539,8 +4540,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
@@ -5203,7 +5203,7 @@ def _deserialize_element(el, class_dict, _buffer):
         return eltype.from_dict(eldct)
 
 def _is_simple_quadrupole(el):
-    if not isinstance(el, Multipole):
+    if not isinstance(el, Multipole) or el.isthick:
         return False
     return (el.radiation_flag == 0
             and (el.order == 1 or len(el.knl) == 2 or not any(el.knl[2:]))
@@ -5214,7 +5214,7 @@ def _is_simple_quadrupole(el):
             and np.abs(el.rot_s_rad) < 1e-12)
 
 def _is_simple_dipole(el):
-    if not isinstance(el, Multipole):
+    if not isinstance(el, Multipole) or el.isthick:
         return False
     return (el.radiation_flag == 0
             and (el.order == 0 or len(el.knl) == 1 or not any(el.knl[1:]))

{xtrack-0.98.2 → xtrack-0.98.4}/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.2 → xtrack-0.98.4/xtrack.egg-info}/PKG-INFO

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

xtrack-0.98.2/xtrack/_version.py

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