xtrack 0.64.0__tar.gz → 0.64.1__tar.gz

{xtrack-0.64.0 → xtrack-0.64.1}/PKG-INFO

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

{xtrack-0.64.0 → xtrack-0.64.1}/tests/test_survey.py

@@ -103,17 +103,17 @@ def test_survey_slicing(test_context, slice_mode, tilted, orientation,
 
     if not tilted and orientation == 'acw':
         assert_allclose(np.abs(sv.Y), 0, rtol=0, atol=1e-14)
-        assert_allclose(np.trapz(sv.X, sv.Z), -4.818 , rtol=0, # anti-clockwise
+        assert_allclose(np.trapezoid(sv.X, sv.Z), -4.818 , rtol=0, # anti-clockwise
                         atol=(2e-3 if slice_mode is not None else 0.5))
     elif not tilted and orientation == 'cw':
         assert_allclose(np.abs(sv.Y), 0, rtol=0, atol=1e-14)
-        assert_allclose(np.trapz(sv.X, sv.Z), 4.818 , rtol=0, # clockwise
+        assert_allclose(np.trapezoid(sv.X, sv.Z), 4.818 , rtol=0, # clockwise
                         atol=(2e-3 if slice_mode is not None else 0.5))
     elif tilted and orientation == 'acw':
         assert_allclose(np.abs(sv.X), 0, rtol=0, atol=1e-14)
-        assert_allclose(np.trapz(sv.Y, sv.Z), -4.818 , rtol=0, # anti-clockwise
+        assert_allclose(np.trapezoid(sv.Y, sv.Z), -4.818 , rtol=0, # anti-clockwise
                         atol=(2e-3 if slice_mode is not None else 0.5))
     elif tilted and orientation == 'cw':
         assert_allclose(np.abs(sv.X), 0, rtol=0, atol=1e-14)
-        assert_allclose(np.trapz(sv.Y, sv.Z), 4.818 , rtol=0, # clockwise
+        assert_allclose(np.trapezoid(sv.Y, sv.Z), 4.818 , rtol=0, # clockwise
                         atol=(2e-3 if slice_mode is not None else 0.5))

{xtrack-0.64.0 → xtrack-0.64.1}/tests/test_twiss.py

@@ -1806,6 +1806,7 @@ def test_arbitrary_start(test_context, collider_for_test_twiss_range):
 
     # No orbit
     for kk in collider.vars.get_table().rows['on_.*'].name:
+        kk = str(kk) # avoid numpy.str_
         collider.vars[kk] = 0
 
     if collider.lhcb1.element_names[0] != 'ip1':

{xtrack-0.64.0 → xtrack-0.64.1}/xtrack/_temp/lhc_match/gen_madx_optics_file.py

@@ -41,6 +41,7 @@ def gen_madx_optics_file_auto(collider, fname):
         vtable.mask[vtable.mask['acb.*'] | vtable.mask['kd.*']
                     | vtable.mask['kq.*'] | vtable.mask['ks.*']]]
     for nn in vsave.name:
+        nn = str(nn) # to avoid numpy string
         vv = collider.vars[nn]
         extract_val_or_madexpr(vv, dct_expr, dct_val)
 

xtrack-0.64.1/xtrack/_version.py

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

{xtrack-0.64.0 → xtrack-0.64.1}/xtrack/tracker.py

@@ -305,7 +305,8 @@ class Tracker:
             t0 = perf_counter()
 
         assert self.iscollective in (True, False)
-        if self.iscollective or self.line.enable_time_dependent_vars:
+        if (self.iscollective or self.line.enable_time_dependent_vars
+            or 'log' in kwargs and kwargs['log'] is not None):
             tracking_func = self._track_with_collective
         else:
             tracking_func = self._track_no_collective
@@ -905,13 +906,13 @@ class Tracker:
                                       ' tracking')
 
         if log is not None:
-            if isinstance(log, str):
-                log = [log]
             if isinstance(log, (list, tuple)):
                 log = Log(*log)
+            elif not isinstance(log, Log):
+                log = Log(log)
         if log is not None and _reset_log:
             if self.line.enable_time_dependent_vars:
-                self.line.log_last_track = {kk: [] for kk in log}
+                self.line.log_last_track = {}
             else:
                 raise NotImplementedError(
                     'log can be used only when time-dependent variables are '
@@ -1003,11 +1004,21 @@ class Tracker:
                 if log is not None:
                     for kk in log:
                         if log[kk] == None:
+                            if kk not in self.line.log_last_track:
+                                self.line.log_last_track[kk] = []
                             self.line.log_last_track[kk].append(self.line.vv[kk])
                         else:
                             ff = log[kk]
-                            self.line.log_last_track[kk].append(
-                                                    ff(self.line, particles))
+                            val = ff(self.line, particles)
+                            if hasattr(ff, '_store'):
+                                for nn in ff._store:
+                                    if nn not in self.line.log_last_track:
+                                        self.line.log_last_track[nn] = []
+                                    self.line.log_last_track[nn].append(val[nn])
+                            else:
+                                if kk not in self.line.log_last_track:
+                                    self.line.log_last_track[kk] = []
+                                self.line.log_last_track[kk].append(val)
 
             moveback_to_buffer = None
             moveback_to_offset = None
@@ -1575,5 +1586,10 @@ class Log(dict):
     def __init__(self, *args, **kwargs):
         self.__dict__ = self
         self.update(kwargs)
+        unnamed_indx = 0
         for arg in args:
-            self[arg] = None
+            if isinstance(arg, str):
+                self[arg] = None
+            else:
+                self[f'_unnamed_{unnamed_indx}'] = arg
+                unnamed_indx += 1

{xtrack-0.64.0 → xtrack-0.64.1}/xtrack/twiss.py

@@ -15,6 +15,11 @@ from scipy.constants import epsilon_0
 from scipy.constants import e as qe
 from scipy.special import factorial
 
+if hasattr(np, 'trapezoid'): # numpy >= 2.0
+    trapz = np.trapezoid
+else:
+    trapz = np.trapz
+
 import xobjects as xo
 from xdeps import Table
 
@@ -1220,9 +1225,9 @@ def _compute_global_quantities(line, twiss_res):
             cmin_arr = (2 * np.sqrt(r1*r2) *
                         np.abs(np.mod(mux[-1], 1) - np.mod(muy[-1], 1))
                         /(1 + r1 * r2))
-            c_minus = np.trapz(cmin_arr, s_vect)/(circumference)
-            c_r1_avg = np.trapz(r1, s_vect)/(circumference)
-            c_r2_avg = np.trapz(r2, s_vect)/(circumference)
+            c_minus = trapz(cmin_arr, s_vect)/(circumference)
+            c_r1_avg = trapz(r1, s_vect)/(circumference)
+            c_r2_avg = trapz(r2, s_vect)/(circumference)
 
             qs = np.abs(twiss_res['muzeta'][-1])
 

{xtrack-0.64.0 → xtrack-0.64.1}/xtrack.egg-info/PKG-INFO

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

xtrack-0.64.0/xtrack/_version.py

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