xtrack 0.47.0__tar.gz → 0.47.2__tar.gz

{xtrack-0.47.0/xtrack.egg-info → xtrack-0.47.2}/PKG-INFO

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

xtrack-0.47.2/xtrack/_version.py

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

{xtrack-0.47.0 → xtrack-0.47.2}/xtrack/line.py

@@ -10,6 +10,7 @@ import json
 from contextlib import contextmanager
 from copy import deepcopy
 from pprint import pformat
+from pathlib import Path
 from typing import List, Literal, Optional, Collection
 
 import numpy as np
@@ -3765,25 +3766,47 @@ class LineVars:
         self._cache_active = value
         self.line._xdeps_manager._tree_frozen = value
 
-    def load_madx_optics_file(self, filename):
+    def set_from_madx_file(self, filename, mad_stdout=False):
+
+        '''
+        Set variables veluas of expression from a MAD-X file.
+
+        Parameters
+        ----------
+        filename : str or list of str
+            Path to the MAD-X file(s) to load.
+        mad_stdout : bool, optional
+            If True, the MAD-X output is printed to stdout.
+
+        Notes
+        -----
+        The MAD-X file is executed in a temporary MAD-X instance, and the
+        variables are copied to the line after the execution.
+        '''
+
         from cpymad.madx import Madx
-        mad = Madx()
+        mad = Madx(stdout=mad_stdout)
         mad.options.echo = False
         mad.options.info = False
         mad.options.warn = False
-        mad.call(str(filename))
+        if isinstance(filename, (str, Path)):
+            filename = [filename]
+        else:
+            assert isinstance(filename, (list, tuple))
+        for ff in filename:
+            mad.call(str(ff))
 
         assert self.cache_active is False, (
             'Cannot load optics file when cache is active')
 
         mad.input('''
-        elm: marker; seq: sequence, l=1; e:elm, at=0.5; endsequence;
-        beam; use,sequence=seq;''')
+        elm: marker; dummy: sequence, l=1; e:elm, at=0.5; endsequence;
+        beam; use,sequence=dummy;''')
 
         defined_vars = set(mad.globals.keys())
 
         xt.general._print.suppress = True
-        dummy_line = xt.Line.from_madx_sequence(mad.sequence.seq,
+        dummy_line = xt.Line.from_madx_sequence(mad.sequence.dummy,
                                                 deferred_expressions=True)
         xt.general._print.suppress = False
 
@@ -3791,11 +3814,22 @@ class LineVars:
             {kk: dummy_line._xdeps_vref._owner[kk] for kk in defined_vars})
         self.line._xdeps_manager.copy_expr_from(dummy_line._xdeps_manager, "vars")
 
-        for nn in self.line._xdeps_vref._owner.keys():
-            if (self.line._xdeps_vref[nn]._expr is None
-                and len(self.line._xdeps_vref[nn]._find_dependant_targets()) > 1 # always contain itself
-                ):
-                self.line._xdeps_vref[nn] = self.line._xdeps_vref._owner[nn]
+        try:
+            self.line._xdeps_vref._owner.default_factory = lambda: 0
+            allnames = list(self.line._xdeps_vref._owner.keys())
+            for nn in allnames:
+                if (self.line._xdeps_vref[nn]._expr is None
+                    and len(self.line._xdeps_vref[nn]._find_dependant_targets()) > 1 # always contain itself
+                    ):
+                    self.line._xdeps_vref[nn] = self.line._xdeps_vref._owner.get(nn, 0)
+        except Exception as ee:
+            self.line._xdeps_vref._owner.default_factory = None
+            raise ee
+
+        self.line._xdeps_vref._owner.default_factory = None
+
+    def load_madx_optics_file(self, filename, mad_stdout=False):
+        self.set_from_madx_file(filename, mad_stdout=mad_stdout)
 
 class VarValues:
 

{xtrack-0.47.0 → xtrack-0.47.2}/xtrack/mad_loader.py

@@ -686,11 +686,16 @@ class MadLoader:
             madeval = None
             self.Builder = ElementBuilder
 
-        for ii, el in enumerate(progress(
+        # Avoid progress bar if there are few elements
+        if len(self.sequence.expanded_elements) > 10:
+            _prog = progress(
                 self.iter_elements(madeval=madeval),
                 desc=f'Converting sequence "{self.sequence.name}"',
-                total=len(self.sequence.expanded_elements)),
-        ):
+                total=len(self.sequence.expanded_elements))
+        else:
+            _prog = self.iter_elements(madeval=madeval)
+
+        for ii, el in enumerate(_prog):
             # for each mad element create xtract elements in a buffer and add to a line
             converter = getattr(self, "convert_" + el.type, None)
             adder = getattr(self, "add_" + el.type, None)
@@ -827,7 +832,7 @@ class MadLoader:
     def _convert_quadrupole_thick(self, mad_el):
         if mad_el.k1s:
             tilt = -self.math.atan2(mad_el.k1s, mad_el.k1) / 2
-            k1 = 0.5 * self.math.sqrt(mad_el.k1s ** 2 + mad_el.k1 ** 2)
+            k1 = self.math.sqrt(mad_el.k1s ** 2 + mad_el.k1 ** 2)
         else:
             tilt = None
             k1 = mad_el.k1

{xtrack-0.47.0 → xtrack-0.47.2}/xtrack/multiline/shared_knobs.py

@@ -1,3 +1,5 @@
+from collections import defaultdict
+
 from ..line import Functions
 import xdeps
 
@@ -7,7 +9,8 @@ class VarSharing:
 
 
         mgr = xdeps.Manager()
-        newvref = mgr.ref({}, "vars")
+        newvref = mgr.ref(defaultdict(lambda: 0), "vars")
+        newvref._owner.default_factory = None
 
         functions = Functions()
         newfref = mgr.ref(functions, "f")

{xtrack-0.47.0 → xtrack-0.47.2/xtrack.egg-info}/PKG-INFO

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

xtrack-0.47.0/xtrack/_version.py

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