xtrack 0.70.3__tar.gz → 0.71.0__tar.gz

{xtrack-0.70.3/xtrack.egg-info → xtrack-0.71.0}/PKG-INFO

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

{xtrack-0.70.3 → xtrack-0.71.0}/tests/test_madnginterface.py

@@ -7,9 +7,9 @@ import numpy as np
 test_data_folder = pathlib.Path(
     __file__).parent.joinpath('../test_data').absolute()
 
-@pytest.mark.xfail(strict=False) # sometimes madng fails to start the process (to be investigated)
+# @pytest.mark.xfail(strict=False) # sometimes madng fails to start the process (to be investigated)
 def test_madng_twiss():
-    rdts = ["f4000", "f3100", "f2020", "f1120", 'f1001']
+    rdts = ["f4000", "f3100", "f2020", "f1120"]
 
     line = xt.Line.from_json(test_data_folder /
                             'hllhc15_thick/lhc_thick_with_knobs.json')
@@ -46,7 +46,7 @@ def test_madng_twiss():
     assert np.abs(tw_rdt.f2020).max() > 0
     assert np.abs(tw_rdt.f1120).max() > 0
 
-@pytest.mark.xfail(strict=False) # sometimes madng fails to start the process (to be investigated)
+# @pytest.mark.xfail(strict=False) # sometimes madng fails to start the process (to be investigated)
 def test_madng_interface_with_multipole_errors_and_misalignments():
     line = xt.Line.from_json(test_data_folder /
                             'hllhc15_thick/lhc_thick_with_knobs.json')
@@ -56,7 +56,7 @@ def test_madng_interface_with_multipole_errors_and_misalignments():
 
     # Introduce misalignments on all quadrupoles
     tt = line.get_table()
-    tt_quad = tt.rows['mq\..*']
+    tt_quad = tt.rows[r'mq\..*']
     rgen = np.random.RandomState(1) # fix seed for random number generator
                                     # (to have reproducible results)
     shift_x = rgen.randn(len(tt_quad)) * 0.01e-3 # 0.01 mm rms shift on all quads

{xtrack-0.70.3 → xtrack-0.71.0}/xtrack/__init__.py

@@ -45,6 +45,7 @@ from .slicing import Strategy, Uniform, Teapot
 from .loss_location_refinement import _skip_in_loss_location_refinement
 from .trajectory_correction import TrajectoryCorrection
 from .mad_parser.loader import load_madx_lattice
+from . import json
 
 from xdeps import Table, FunctionPieceWiseLinear
 

xtrack-0.71.0/xtrack/_version.py

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

xtrack-0.70.3/xtrack/json_utils.py → xtrack-0.71.0/xtrack/json.py

@@ -5,7 +5,7 @@ import gzip
 from xobjects import JEncoder
 
 
-def to_json(data, file, indent):
+def dump(data, file, indent=1):
     if isinstance(file, io.IOBase):
         fh, close = file, False
     elif (isinstance(file, str) and file.endswith(".gz")) or (
@@ -21,7 +21,7 @@ def to_json(data, file, indent):
         fh.close()
 
 
-def from_json(file):
+def load(file):
     if isinstance(file, io.IOBase):
         fh, close = file, False
     elif (isinstance(file, str) and file.endswith(".gz")) or (

{xtrack-0.70.3 → xtrack-0.71.0}/xtrack/line.py

@@ -19,7 +19,7 @@ import numpy as np
 from scipy.constants import c as clight
 
 from . import linear_normal_form as lnf
-from . import json_utils
+from . import json as json_utils
 
 import xobjects as xo
 import xtrack as xt
@@ -272,7 +272,7 @@ class Line:
 
         """
 
-        dct = json_utils.from_json(file)
+        dct = json_utils.load(file)
 
         if 'line' in dct.keys():
             dct_line = dct['line']
@@ -649,7 +649,7 @@ class Line:
 
         '''
 
-        json_utils.to_json(self.to_dict(**kwargs), file, indent=indent)
+        json_utils.dump(self.to_dict(**kwargs), file, indent=indent)
 
     def _to_table_dict(self):
 
@@ -3632,7 +3632,7 @@ class Line:
         else:
             raise KeyError(f'Element or variable {key} not found')
 
-    def info(self, key, limit=12):
+    def info(self, key, limit=30):
         """
             Get information about an element or a variable.
         """

{xtrack-0.70.3 → xtrack-0.71.0}/xtrack/linear_normal_form.py

@@ -182,9 +182,20 @@ def compute_linear_normal_form(M, symplectify=False, only_4d_block=False,
     b2 = v0[:,modes[1]].imag
     b3 = v0[:,modes[2]].imag
 
-    n1 = 1./np.sqrt(np.matmul(np.matmul(a1, S), b1))
-    n2 = 1./np.sqrt(np.matmul(np.matmul(a2, S), b2))
-    n3 = 1./np.sqrt(np.matmul(np.matmul(a3, S), b3))
+    n1_inv_sq = np.matmul(np.matmul(a1, S), b1)
+    n2_inv_sq = np.matmul(np.matmul(a2, S), b2)
+    n3_inv_sq = np.matmul(np.matmul(a3, S), b3)
+
+    if not n1_inv_sq > 0:
+        raise ValueError('Invalid n1')
+    if not n2_inv_sq > 0:
+        raise ValueError('Invalid n2')
+    if not n3_inv_sq > 0:
+        raise ValueError('Invalid n3')
+
+    n1 = 1./np.sqrt(n1_inv_sq)
+    n2 = 1./np.sqrt(n2_inv_sq)
+    n3 = 1./np.sqrt(n3_inv_sq)
 
     a1 *= n1
     a2 *= n2

{xtrack-0.70.3 → xtrack-0.71.0}/xtrack/mad_parser/loader.py

@@ -292,13 +292,16 @@ class MadxLoader:
             if (extras := el_params.pop('extra', None)):
                 _warn(f'Ignoring extra parameters {extras} for element `{name}`!')
 
-            if isinstance(self.env[name], BeamElement) and not self.env[name].isthick and length:
+
+            if (isinstance(self.env[name], BeamElement) and not self.env[name].isthick
+                 and length and not isinstance(self.env[name], xt.Marker)):
                 drift_name = f'drift_{name}'
                 self.env.new(drift_name, 'Drift', length=f'({length}) / 2')
                 name = builder.new_line([drift_name, name, drift_name])
             builder.place(name, **el_params)
         else:
-            if isinstance(self.env[parent], BeamElement) and not self.env[parent].isthick and length:
+            if (isinstance(self.env[parent], BeamElement) and not self.env[parent].isthick
+                and length and not isinstance(self.env[parent], xt.Marker)):
                 drift_name = f'{name}_drift'
                 self.env.new(drift_name, 'Drift', length=f'({length}) / 2')
                 at, from_ = el_params.pop('at', None), el_params.pop('from_', None)
@@ -635,8 +638,8 @@ class MadxLoader:
 
         return element_name
 
-def load_madx_lattice(file):
-    loader = MadxLoader()
+def load_madx_lattice(file, reverse_lines=None):
+    loader = MadxLoader(reverse_lines=reverse_lines)
     loader.load_file(file)
     env = loader.env
     return env

{xtrack-0.70.3 → xtrack-0.71.0}/xtrack/match.py

@@ -630,6 +630,8 @@ class TargetRmatrix(TargetSet):
         if value is not None:
             raise NotImplementedError
 
+        tag = kwargs.pop('tag', None)
+
         r_elems = {
             'r11': r11, 'r12': r12, 'r13': r13, 'r14': r14, 'r15': r15, 'r16': r16,
             'r21': r21, 'r22': r22, 'r23': r23, 'r24': r24, 'r25': r25, 'r26': r26,
@@ -650,8 +652,13 @@ class TargetRmatrix(TargetSet):
                 if kk[2] in ['2', '4']:
                     thistol *= 1e+2
             if vv is not None:
+                if tag is not None:
+                    this_tag = tag
+                else:
+                    this_tag = kk
                 self.targets.append(TargetRmatrixTerm(kk, vv, start=start, end=end,
-                                                      tol=thistol, **kwargs))
+                                                      tol=thistol, tag=this_tag,
+                                                      **kwargs))
 
 
 def match_line(line, vary, targets, solve=True, assert_within_tol=True,
@@ -684,6 +691,16 @@ class Action(xd.Action):
 
     _target_class = Target
 
+    def __init__(self, callable, **kwargs):
+        self.callable = callable
+        self.kwargs = kwargs
+
+    def run(self, allow_failure=False):
+        return self.callable(**self.kwargs)
+
+    def __call__(self, **kwargs):
+        return self.run(**kwargs)
+
 class ActionTwiss(xd.Action):
 
     def __init__(self, line, allow_twiss_failure=False,
@@ -898,6 +915,7 @@ class OptimizeLine(xd.Optimize):
                         name=name)
         self.line = line
         self.action_twiss = action_twiss
+        self.default_tol = default_tol
 
     def clone(self, add_targets=None, add_vary=None,
               remove_targets=None, remove_vary=None,
@@ -941,6 +959,7 @@ class OptimizeLine(xd.Optimize):
             line = self.line,
             vary=vary,
             targets=targets,
+            default_tol=self.default_tol,
             restore_if_fail=self.restore_if_fail,
             verbose=self._err.verbose,
             assert_within_tol=self.assert_within_tol,

{xtrack-0.70.3 → xtrack-0.71.0}/xtrack/multiline/multiline.py

@@ -2,9 +2,10 @@ import pandas as pd
 import numpy as np
 from copy import deepcopy
 
-from .. import json_utils
+from .. import json as json_utils
 from .shared_knobs import VarSharing
 from ..match import match_knob_line
+import xdeps as xd
 import xobjects as xo
 import xtrack as xt
 
@@ -138,7 +139,7 @@ class Multiline:
         **kwargs: dict
             Additional keyword arguments are passed to the `Line.to_dict` method.
         '''
-        json_utils.to_json(self.to_dict(**kwargs), file, indent=indent)
+        json_utils.dump(self.to_dict(**kwargs), file, indent=indent)
 
 
     @classmethod
@@ -158,7 +159,7 @@ class Multiline:
         new_multiline: Multiline
             The multiline object.
         '''
-        return cls.from_dict(json_utils.from_json(file), **kwargs)
+        return cls.from_dict(json_utils.load(file), **kwargs)
 
     @classmethod
     def from_madx(cls, filename=None, madx=None, stdout=None, return_lines=False, **kwargs):
@@ -365,8 +366,25 @@ class Multiline:
 
         return opt
 
-    def __getitem__(self, key):
-        return self.lines[key]
+    def __getitem__(self, key: str):
+        if key in self.vars:
+            return self.vv[key]
+
+        if key in self.lines:
+            return self.lines[key]
+
+        raise KeyError(f'Name {key} not found')
+
+    def __setitem__(self, key: str, value):
+        if key in self.lines:
+            raise ValueError(
+                'Cannot create a var `{key}` using __setitem__, as there is '
+                'already a line of that name in this multiline.')
+
+        if not np.isscalar(value) and not xd.refs.is_ref(value):
+            raise ValueError('Only scalars or references are allowed')
+
+        self.vars[key] = value
 
     def __dir__(self):
         return list(self.lines.keys()) + object.__dir__(self)
@@ -379,6 +397,34 @@ class Multiline:
         else:
             raise AttributeError(f"Multiline object has no attribute `{key}`.")
 
+    def set(self, key, value):
+        self.__setitem__(key, value)
+
+    def get(self, key):
+        return self.__getitem__(key)
+
+    def info(self, key, limit=12):
+        self.vars[key]._info(limit=limit)
+
+    eval = xt.Line.eval
+    get_expr = xt.Line.get_expr
+    new_expr = xt.Line.new_expr
+
+    @property
+    def _xdeps_eval(self):
+        try:
+            eva_obj = self._xdeps_eval_obj
+        except AttributeError:
+            eva_obj = xd.madxutils.MadxEval(variables=self._xdeps_vref,
+                                            functions=self.functions,
+                                            elements={})
+            self._xdeps_eval_obj = eva_obj
+
+        return eva_obj
+
+    def ref_manager(self):
+        return self._var_sharing.manager
+
     @property
     def vars(self):
         return self._multiline_vars
@@ -592,6 +638,7 @@ class Multiline:
                             filling_pattern_acw=filling_pattern_acw,
                             i_bunch_cw=i_bunch_cw, i_bunch_acw=i_bunch_acw)
 
+
 class MultiTwiss(dict):
 
     def __init__(self):

{xtrack-0.70.3 → xtrack-0.71.0}/xtrack/twissplot.py

@@ -330,24 +330,31 @@ class TwissPlot(object):
         lattice_lo=None,
         lattice_hi=None,
     ):
-        lo, hi = self.left.get_ylim()
-        if left_lo is None:
-            left_lo = lo
-        if left_hi is None:
-            left_hi = hi
-        self.left.set_ylim(left_lo, left_hi)
-        lo, hi = self.right.get_ylim()
-        if right_lo is None:
-            right_lo = lo
-        if right_hi is None:
-            right_hi = hi
-        self.right.set_ylim(right_lo, right_hi)
-        lo, hi = self.lattice.get_ylim()
-        if lattice_lo is None:
-            lattice_lo = lo
-        if lattice_hi is None:
-            lattice_hi = hi
-        self.lattice.set_ylim(lattice_lo, lattice_hi)
+        if self.left is not None:
+            lo, hi = self.left.get_ylim()
+            if left_lo is None:
+                left_lo = lo
+            if left_hi is None:
+                left_hi = hi
+            self.left.set_ylim(left_lo, left_hi)
+        if self.right is not None:
+            lo, hi = self.right.get_ylim()
+            if right_lo is None:
+                right_lo = lo
+            if right_hi is None:
+                right_hi = hi
+            self.right.set_ylim(right_lo, right_hi)
+        if self.lattice is not None:
+            lo, hi = self.lattice.get_ylim()
+            if lattice_lo is None:
+                lattice_lo = lo
+            if lattice_hi is None:
+                lattice_hi = hi
+            self.lattice.set_ylim(lattice_lo, lattice_hi)
+        return self
+
+    def xlim(self, lo=None, hi=None):
+        self.ax.set_xlim(lo, hi)
         return self
 
     def set_s_label(self, regexp="ip.*"):

{xtrack-0.70.3 → xtrack-0.71.0/xtrack.egg-info}/PKG-INFO

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

{xtrack-0.70.3 → xtrack-0.71.0}/xtrack.egg-info/SOURCES.txt

@@ -105,7 +105,7 @@ xtrack/environment.py
 xtrack/footprint.py
 xtrack/general.py
 xtrack/internal_record.py
-xtrack/json_utils.py
+xtrack/json.py
 xtrack/line.py
 xtrack/linear_normal_form.py
 xtrack/lumi.py

xtrack-0.70.3/xtrack/_version.py

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