xtrack 0.65.1__tar.gz → 0.65.3__tar.gz

{xtrack-0.65.1 → xtrack-0.65.3}/PKG-INFO

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

{xtrack-0.65.1 → xtrack-0.65.3}/tests/test_elements_thick.py

@@ -1158,6 +1158,57 @@ def test_solenoid_with_mult_kicks(test_context, backtrack):
     xo.assert_allclose(p_test.pzeta, p_ref.pzeta, rtol=0, atol=1e-13)
 
 
+@for_all_test_contexts
+def test_solenoid_shifted_and_rotated_multipolar_kick(test_context):
+    ks = 0.9
+    length = 1
+    knl = [0.1, 0.4, 0.5]
+    ksl = [0.2, 0.3, 0.6]
+    mult_rot_y_rad = 0.2
+    mult_shift_x = 0.3
+
+    solenoid = xt.Solenoid(
+        ks=ks,
+        length=length,
+        knl=knl,
+        ksl=ksl,
+        num_multipole_kicks=3,
+        mult_rot_y_rad=mult_rot_y_rad,
+        mult_shift_x=mult_shift_x,
+    )
+
+    solenoid_no_kick = xt.Solenoid(ks=0.9, length=0.25)
+    kick = xt.Multipole(knl=np.array(knl) / 3, ksl=np.array(ksl) / 3)
+
+    line_test = xt.Line(elements=[solenoid])
+    line_test.build_tracker(_context=test_context)
+
+    elements_ref = [solenoid_no_kick] + 3 * [
+        xt.XYShift(dx=mult_shift_x),
+        xt.YRotation(angle=np.rad2deg(-mult_rot_y_rad)),
+        kick,
+        xt.YRotation(angle=np.rad2deg(mult_rot_y_rad)),
+        xt.XYShift(dx=-mult_shift_x),
+        solenoid_no_kick
+    ]
+    line_ref = xt.Line(elements=elements_ref)
+    line_ref.build_tracker(_context=test_context)
+
+    p0 = xt.Particles(x=1e-2, px=-2e-4, y=-2e-2, py=3e-4, zeta=1e-2, delta=1e-3)
+    p_test = p0.copy(_context=test_context)
+    p_ref = p0.copy(_context=test_context)
+
+    line_test.track(p_test)
+    line_ref.track(p_ref)
+
+    xo.assert_allclose(p_test.x, p_ref.x, rtol=0, atol=1e-16)
+    xo.assert_allclose(p_test.px, p_ref.px, rtol=0, atol=1e-16)
+    xo.assert_allclose(p_test.y, p_ref.y, rtol=0, atol=1e-16)
+    xo.assert_allclose(p_test.py, p_ref.py, rtol=0, atol=1e-16)
+    xo.assert_allclose(p_test.zeta, p_ref.zeta, rtol=0, atol=1e-16)
+    xo.assert_allclose(p_test.delta, p_ref.delta, rtol=0, atol=1e-16)
+
+
 @pytest.mark.parametrize(
     'radiation_mode,config',
     [

xtrack-0.65.3/xtrack/_version.py

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

{xtrack-0.65.1 → xtrack-0.65.3}/xtrack/beam_elements/elements.py

@@ -990,8 +990,8 @@ class Sextupole(BeamElement):
         'inv_factorial_order': xo.Float64,
         'knl': xo.Float64[ALLOCATED_MULTIPOLE_ORDER + 1],
         'ksl': xo.Float64[ALLOCATED_MULTIPOLE_ORDER + 1],
-        'edge_entry_active': xo.Field(xo.UInt8, default=False),
-        'edge_exit_active': xo.Field(xo.UInt8, default=False),
+        'edge_entry_active': xo.Field(xo.UInt64, default=False),
+        'edge_exit_active': xo.Field(xo.UInt64, default=False),
     }
 
     _skip_in_to_dict = ['_order', 'inv_factorial_order']  # defined by knl, etc.
@@ -1091,8 +1091,8 @@ class Octupole(BeamElement):
         'inv_factorial_order': xo.Float64,
         'knl': xo.Float64[ALLOCATED_MULTIPOLE_ORDER + 1],
         'ksl': xo.Float64[ALLOCATED_MULTIPOLE_ORDER + 1],
-        'edge_entry_active': xo.Field(xo.UInt8, default=False),
-        'edge_exit_active': xo.Field(xo.UInt8, default=False),
+        'edge_entry_active': xo.Field(xo.UInt64, default=False),
+        'edge_exit_active': xo.Field(xo.UInt64, default=False),
     }
 
     _skip_in_to_dict = ['_order', 'inv_factorial_order']  # defined by knl, etc.
@@ -1191,8 +1191,8 @@ class Quadrupole(BeamElement):
         'inv_factorial_order': xo.Float64,
         'knl': xo.Float64[ALLOCATED_MULTIPOLE_ORDER + 1],
         'ksl': xo.Float64[ALLOCATED_MULTIPOLE_ORDER + 1],
-        'edge_entry_active': xo.Field(xo.UInt8, default=False),
-        'edge_exit_active': xo.Field(xo.UInt8, default=False),
+        'edge_entry_active': xo.Field(xo.UInt64, default=False),
+        'edge_exit_active': xo.Field(xo.UInt64, default=False),
     }
 
     _skip_in_to_dict = ['_order', 'inv_factorial_order']  # defined by knl, etc.
@@ -1275,10 +1275,10 @@ class Solenoid(BeamElement):
     length : float
         Length of the element in meters.
     ks : float
-        Strength of the solenoid component in rad / m. Only to be specified
-        when the element is thin, i.e. when `length` is 0.
+        Strength of the solenoid component in rad / m.
     ksi : float
-        Integrated strength of the solenoid component in rad.
+        Integrated strength of the solenoid component in rad. Only to be
+        specified when the element is thin, i.e. when `length` is 0.
     """
     isthick = True
     has_backtrack = True
@@ -1293,6 +1293,8 @@ class Solenoid(BeamElement):
         'inv_factorial_order': xo.Float64,
         'knl': xo.Float64[ALLOCATED_MULTIPOLE_ORDER + 1],
         'ksl': xo.Float64[ALLOCATED_MULTIPOLE_ORDER + 1],
+        'mult_rot_y_rad': xo.Float64,
+        'mult_shift_x': xo.Float64,
     }
 
     _skip_in_to_dict = ['_order', 'inv_factorial_order']  # defined by knl, etc.
@@ -1305,6 +1307,7 @@ class Solenoid(BeamElement):
         _pkg_root.joinpath('headers/synrad_spectrum.h'),
         _pkg_root.joinpath('beam_elements/elements_src/drift.h'),
         _pkg_root.joinpath('beam_elements/elements_src/track_multipolar_components.h'),
+        _pkg_root.joinpath('beam_elements/elements_src/track_yrotation.h'),
         _pkg_root.joinpath('beam_elements/elements_src/track_solenoid.h'),
         _pkg_root.joinpath('beam_elements/elements_src/solenoid.h'),
     ]

{xtrack-0.65.1 → xtrack-0.65.3}/xtrack/beam_elements/elements_src/solenoid.h

@@ -37,6 +37,21 @@ void Solenoid_track_local_particle(SolenoidData el, LocalParticle* part0) {
     const double slice_length = length / (num_multipole_kicks + 1);
     const double kick_weight = 1. / num_multipole_kicks;
 
+    double mult_rot_y_rad = SolenoidData_get_mult_rot_y_rad(el);
+    double mult_shift_x = SolenoidData_get_mult_shift_x(el);
+    double sin_angle, cos_angle, tan_angle;
+    if (mult_rot_y_rad != 0) {
+        sin_angle = sin(mult_rot_y_rad);
+        cos_angle = cos(mult_rot_y_rad);
+        tan_angle = sin_angle / cos_angle;
+    }
+    else {
+        sin_angle = 0;
+        cos_angle = 1;
+        tan_angle = 0;
+    }
+
+
     //start_per_particle_block (part0->part)
     #ifndef XTRACK_SOLENOID_NO_SYNRAD
         double const old_px = LocalParticle_get_px(part);
@@ -49,9 +64,19 @@ void Solenoid_track_local_particle(SolenoidData el, LocalParticle* part0) {
     for (int ii = 0; ii < num_multipole_kicks; ii++) {
         Solenoid_thick_track_single_particle(part, slice_length, ks, radiation_flag);
 
+        LocalParticle_add_to_x(part, -mult_shift_x);
+        if (sin_angle != 0) {
+            YRotation_single_particle(part, sin_angle, cos_angle, tan_angle);
+        }
+
         track_multipolar_kick_bend(
                     part, order, inv_factorial_order, knl, ksl, factor_knl_ksl,
                     kick_weight, 0, 0, 0, 0);
+
+        if (sin_angle != 0) {
+            YRotation_single_particle(part, -sin_angle, cos_angle, -tan_angle);
+        }
+        LocalParticle_add_to_x(part, mult_shift_x);
     }
 
     Solenoid_thick_track_single_particle(part, slice_length, ks, radiation_flag);

{xtrack-0.65.1 → xtrack-0.65.3}/xtrack/tracker.py

@@ -911,12 +911,7 @@ class Tracker:
             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 = {}
-            else:
-                raise NotImplementedError(
-                    'log can be used only when time-dependent variables are '
-                    'enabled in the line')
+            self.line.log_last_track = {}
 
         self._check_invalidated()
 
@@ -1001,24 +996,24 @@ class Tracker:
                         p0c = self.line.particle_ref._xobject.p0c[0]
                         particles.update_p0c_and_energy_deviations(p0c)
 
-                if log is not None:
-                    for kk in log:
-                        if log[kk] == None:
+            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]
+                        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(self.line.vv[kk])
-                        else:
-                            ff = log[kk]
-                            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)
+                            self.line.log_last_track[kk].append(val)
 
             moveback_to_buffer = None
             moveback_to_offset = None

{xtrack-0.65.1 → xtrack-0.65.3}/xtrack.egg-info/PKG-INFO

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

{xtrack-0.65.1 → xtrack-0.65.3}/xtrack.egg-info/SOURCES.txt

@@ -672,7 +672,4 @@ xtrack/random/random_src/exponential_integral_Ei.h
 xtrack/random/random_src/normal.h
 xtrack/random/random_src/rutherford.h
 xtrack/random/random_src/uniform.h
-xtrack/tracker_src/tracker.h
-xtrack/xmad/xmad.h
-xtrack/xmad/xmad_lex.h
-xtrack/xmad/xmad_tab.h
+xtrack/tracker_src/tracker.h

xtrack-0.65.1/xtrack/_version.py

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

xtrack-0.65.1/xtrack/xmad/xmad.h

@@ -1,78 +0,0 @@
-/* Generated by Cython 3.0.10 */
-
-#ifndef __PYX_HAVE__xtrack__xmad__xmad
-#define __PYX_HAVE__xtrack__xmad__xmad
-
-#include "Python.h"
-
-#ifndef __PYX_HAVE_API__xtrack__xmad__xmad
-
-#ifdef CYTHON_EXTERN_C
-    #undef __PYX_EXTERN_C
-    #define __PYX_EXTERN_C CYTHON_EXTERN_C
-#elif defined(__PYX_EXTERN_C)
-    #ifdef _MSC_VER
-    #pragma message ("Please do not define the '__PYX_EXTERN_C' macro externally. Use 'CYTHON_EXTERN_C' instead.")
-    #else
-    #warning Please do not define the '__PYX_EXTERN_C' macro externally. Use 'CYTHON_EXTERN_C' instead.
-    #endif
-#else
-  #ifdef __cplusplus
-    #define __PYX_EXTERN_C extern "C"
-  #else
-    #define __PYX_EXTERN_C extern
-  #endif
-#endif
-
-#ifndef DL_IMPORT
-  #define DL_IMPORT(_T) _T
-#endif
-
-__PYX_EXTERN_C void yyerror(YYLTYPE *, yyscan_t, char const *);
-__PYX_EXTERN_C PyObject *py_integer(yyscan_t, long);
-__PYX_EXTERN_C PyObject *py_float(yyscan_t, double);
-__PYX_EXTERN_C PyObject *py_unary_op(yyscan_t, char const *, PyObject *);
-__PYX_EXTERN_C PyObject *py_binary_op(yyscan_t, char const *, PyObject *, PyObject *);
-__PYX_EXTERN_C PyObject *py_eq_value_scalar(yyscan_t, char const *, PyObject *);
-__PYX_EXTERN_C PyObject *py_eq_defer_scalar(yyscan_t, char const *, PyObject *);
-__PYX_EXTERN_C PyObject *py_call_func(yyscan_t, char const *, PyObject *);
-__PYX_EXTERN_C PyObject *py_arrow(yyscan_t, char const *, char const *);
-__PYX_EXTERN_C PyObject *py_identifier_atom(yyscan_t, char const *);
-__PYX_EXTERN_C void py_set_defer(yyscan_t, PyObject *);
-__PYX_EXTERN_C void py_set_value(yyscan_t, PyObject *);
-__PYX_EXTERN_C void py_make_sequence(yyscan_t, char const *, PyObject *, PyObject *);
-__PYX_EXTERN_C PyObject *py_clone(yyscan_t, char const *, char const *, PyObject *);
-__PYX_EXTERN_C PyObject *py_eq_value_sum(yyscan_t, char const *, PyObject *);
-__PYX_EXTERN_C PyObject *py_eq_defer_sum(yyscan_t, char const *, PyObject *);
-__PYX_EXTERN_C PyObject *py_eq_value_array(yyscan_t, char const *, PyObject *);
-__PYX_EXTERN_C PyObject *py_eq_defer_array(yyscan_t, char const *, PyObject *);
-__PYX_EXTERN_C PyObject *__pyx_fuse_0py_numeric(yyscan_t, double);
-__PYX_EXTERN_C PyObject *__pyx_fuse_1py_numeric(yyscan_t, long);
-
-#endif /* !__PYX_HAVE_API__xtrack__xmad__xmad */
-
-/* WARNING: the interface of the module init function changed in CPython 3.5. */
-/* It now returns a PyModuleDef instance instead of a PyModule instance. */
-
-#if PY_MAJOR_VERSION < 3
-PyMODINIT_FUNC initxmad(void);
-#else
-/* WARNING: Use PyImport_AppendInittab("xmad", PyInit_xmad) instead of calling PyInit_xmad directly from Python 3.5 */
-PyMODINIT_FUNC PyInit_xmad(void);
-
-#if PY_VERSION_HEX >= 0x03050000 && (defined(__GNUC__) || defined(__clang__) || defined(_MSC_VER) || (defined(__cplusplus) && __cplusplus >= 201402L))
-#if defined(__cplusplus) && __cplusplus >= 201402L
-[[deprecated("Use PyImport_AppendInittab(\"xmad\", PyInit_xmad) instead of calling PyInit_xmad directly.")]] inline
-#elif defined(__GNUC__) || defined(__clang__)
-__attribute__ ((__deprecated__("Use PyImport_AppendInittab(\"xmad\", PyInit_xmad) instead of calling PyInit_xmad directly."), __unused__)) __inline__
-#elif defined(_MSC_VER)
-__declspec(deprecated("Use PyImport_AppendInittab(\"xmad\", PyInit_xmad) instead of calling PyInit_xmad directly.")) __inline
-#endif
-static PyObject* __PYX_WARN_IF_PyInit_xmad_INIT_CALLED(PyObject* res) {
-  return res;
-}
-#define PyInit_xmad() __PYX_WARN_IF_PyInit_xmad_INIT_CALLED(PyInit_xmad())
-#endif
-#endif
-
-#endif /* !__PYX_HAVE__xtrack__xmad__xmad */