xtrack 0.79.0__tar.gz → 0.79.2__tar.gz

{xtrack-0.79.0/xtrack.egg-info → xtrack-0.79.2}/PKG-INFO

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

{xtrack-0.79.0 → xtrack-0.79.2}/tests/test_environment.py

@@ -89,16 +89,20 @@ def test_vars_and_element_access_modes(container_type):
     })
 
     env.new('bb', xt.Bend, k0='2 * b', length=3+env.vars['a'] + env.vars['b'],
-            angle=5.)
+            angle=5., model='full')
     assert env['bb'].k0 == 2 * (2 * 4 + 5)
     assert env['bb'].length == 3 + 4 + 2 * 4 + 5
     assert env['bb'].angle == 5.
+    assert env['bb'].model == 'full'
 
     env.vars['a'] = 2.
     assert env['bb'].k0 == 2 * (2 * 2 + 5)
     assert env['bb'].length == 3 + 2 + 2 * 2 + 5
     assert env['bb'].angle == 5.
 
+    env['bb'].model = 'adaptive'
+    assert env['bb'].model == 'adaptive'
+
     line = env.new_line([
         env.new('bb1', 'bb', length=3*env.vars['a'], at='2*a'),
         env.place('bb', at=10 * env.vars['a'], from_='bb1'),

xtrack-0.79.2/xtrack/_version.py

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

{xtrack-0.79.0 → xtrack-0.79.2}/xtrack/beam_elements/magnets.py

@@ -44,7 +44,7 @@ _INDEX_TO_MODEL_STRAIGHT.pop(2)
 _INDEX_TO_MODEL_STRAIGHT.pop(3)
 _MODEL_TO_INDEX_STRAIGHT = {k: v for v, k in _INDEX_TO_MODEL_STRAIGHT.items()}
 
-_NOEXPR_FIELDS = {'model', 'integrator'}
+_NOEXPR_FIELDS = {'model', 'integrator', 'edge_entry_model', 'edge_exit_model'}
 
 COMMON_MAGNET_SOURCES = [
     _pkg_root.joinpath('headers/synrad_spectrum.h'),

{xtrack-0.79.0 → xtrack-0.79.2}/xtrack/environment.py

@@ -1238,7 +1238,6 @@ def _parse_kwargs(cls, kwargs, _eval):
             ref_kwargs[kk] = ref_vv
             value_kwargs[kk] = value_vv
         elif (isinstance(kwargs[kk], str) and hasattr(cls, '_xofields')
-            and (kk not in cls._xofields or cls._xofields[kk].__name__ != 'String')
             and (not hasattr(cls, '_noexpr_fields') or kk not in cls._noexpr_fields)):
             ref_kwargs[kk] = _eval(kwargs[kk])
             if hasattr(ref_kwargs[kk], '_value'):

{xtrack-0.79.0 → xtrack-0.79.2/xtrack.egg-info}/PKG-INFO

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

xtrack-0.79.0/xtrack/_version.py

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