xtrack 0.89.3__tar.gz → 0.89.4__tar.gz

{xtrack-0.89.3/xtrack.egg-info → xtrack-0.89.4}/PKG-INFO

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

xtrack-0.89.4/xtrack/_version.py

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

{xtrack-0.89.3 → xtrack-0.89.4}/xtrack/beam_elements/elements_src/track_magnet.h

@@ -498,11 +498,11 @@ void track_magnet_particles(
             }
         }
 
-        double k0_drift, k1_drift, h_drift, ks_drift;
-        double k0_kick, k1_kick, h_kick;
-        double k0_h_correction, k1_h_correction;
-        int8_t kick_rot_frame;
-        int8_t drift_model;
+        double k0_drift=0, k1_drift=0, h_drift=0, ks_drift=0;
+        double k0_kick=0, k1_kick=0, h_kick=0;
+        double k0_h_correction=0, k1_h_correction=0;
+        int8_t kick_rot_frame=0;
+        int8_t drift_model=0;
         configure_tracking_model(
             model,
             k0,

{xtrack-0.89.3 → xtrack-0.89.4}/xtrack/beam_elements/elements_src/track_magnet.template.h

@@ -417,11 +417,11 @@ void track_magnet_particles(
             }
         }
 
-        double k0_drift, k1_drift, h_drift, ks_drift;
-        double k0_kick, k1_kick, h_kick;
-        double k0_h_correction, k1_h_correction;
-        int8_t kick_rot_frame;
-        int8_t drift_model;
+        double k0_drift=0, k1_drift=0, h_drift=0, ks_drift=0;
+        double k0_kick=0, k1_kick=0, h_kick=0;
+        double k0_h_correction=0, k1_h_correction=0;
+        int8_t kick_rot_frame=0;
+        int8_t drift_model=0;
         configure_tracking_model(
             model,
             k0,

{xtrack-0.89.3 → xtrack-0.89.4}/xtrack/line.py

@@ -61,17 +61,15 @@ from .general import _print
 
 log = logging.getLogger(__name__)
 
-
-_ALLOWED_ELEMENT_TYPES_IN_NEW = [xt.Drift, xt.Bend, xt.Quadrupole, xt.Sextupole,
-                                 xt.Octupole, xt.Cavity, xt.Multipole,
-                                 xt.UniformSolenoid, xt.Solenoid, xt.VariableSolenoid,
-                                 xt.Marker, xt.Replica, xt.XYShift, xt.XRotation,
-                                 xt.YRotation, xt.SRotation, xt.ZetaShift,
-                                 xt.LimitRacetrack, xt.LimitRectEllipse,
-                                 xt.LimitRect, xt.LimitEllipse,
-                                 xt.LimitPolygon, xt.RFMultipole, xt.RBend,
-                                 xt.Magnet, xt.CrabCavity]
-
+_ALLOWED_ELEMENT_TYPES_IN_NEW   = [
+    xt.Drift, xt.DriftExact,
+    xt.Magnet, xt.Replica, xt.Marker,
+    xt.Bend, xt.RBend, xt.Quadrupole, xt.Sextupole, xt.Octupole, xt.Multipole,
+    xt.UniformSolenoid, xt.Solenoid, xt.VariableSolenoid,
+    xt.Cavity, xt.RFMultipole, xt.CrabCavity, xt.ReferenceEnergyIncrease,
+    xt.XYShift, xt.XRotation, xt.YRotation, xt.SRotation, xt.ZetaShift,
+    xt.LimitRacetrack, xt.LimitRectEllipse, xt.LimitRect, xt.LimitEllipse,
+    xt.LimitPolygon]
 
 _ALLOWED_ELEMENT_TYPES_DICT = {
     cc.__name__: cc for cc in _ALLOWED_ELEMENT_TYPES_IN_NEW}

{xtrack-0.89.3 → xtrack-0.89.4}/xtrack/trajectory_correction.py

@@ -326,7 +326,7 @@ class OrbitCorrectionSinglePlane:
                             element_name=self.start)
         else:
             twinit = None
-        tw_orbit = self.line.twiss4d(only_orbit=True, start=self.start, end=self.end,
+        tw_orbit = self.line.twiss(only_orbit=True, start=self.start, end=self.end,
                                      init=twinit, reverse=False, delta0=delta0)
         return tw_orbit
 

{xtrack-0.89.3 → xtrack-0.89.4}/xtrack/twiss.py

@@ -515,6 +515,8 @@ def twiss_line(line, particle_ref=None, method=None,
         if line._radiation_model == 'quantum':
             raise ValueError(
                 'twiss cannot be called when the radiation model is `quantum`')
+        if method == '4d':
+            raise RuntimeError('4d twiss cannot be called when radiation is present')
         radiation_method = 'kick_as_co'
 
     if radiation_method is not None and radiation_method != 'full':

{xtrack-0.89.3 → xtrack-0.89.4/xtrack.egg-info}/PKG-INFO

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

xtrack-0.89.3/xtrack/_version.py

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