xtrack 0.69.5__tar.gz → 0.69.7__tar.gz

{xtrack-0.69.5/xtrack.egg-info → xtrack-0.69.7}/PKG-INFO

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

{xtrack-0.69.5 → xtrack-0.69.7}/tests/test_lumi.py

@@ -38,6 +38,9 @@ def test_lumi_calculation():
             muy=np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
             muzeta=np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
             dzeta=np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
+            phix=np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
+            phiy=np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
+            phizeta=np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
             W_matrix=np.zeros(shape=(6, 6, 6))
         ))
 
@@ -72,6 +75,9 @@ def test_lumi_calculation():
             muy=np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
             muzeta=np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
             dzeta=np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
+            phix=np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
+            phiy=np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
+            phizeta=np.array([0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
         W_matrix=np.zeros(shape=(6, 6, 6))
         ))
 

{xtrack-0.69.5 → xtrack-0.69.7}/tests/test_twiss.py

@@ -840,7 +840,8 @@ def test_twiss_range(test_context, cycle_to, line_name, check, init_at_edge, col
         if kk in ['name', 'W_matrix', 'particle_on_co', 'values_at',
                     'method', 'radiation_method', 'reference_frame',
                     'orientation', 'steps_r_matrix', 'line_config',
-                    'loop_around', '_action'
+                    'loop_around', '_action',
+                    'phix', 'phiy', 'phizeta', # are only relative (not unwrapped)
                     ]:
             continue # some tested separately
         atol = atols.get(kk, atol_default)

xtrack-0.69.7/xtrack/_version.py

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

{xtrack-0.69.5 → xtrack-0.69.7}/xtrack/line.py

@@ -886,6 +886,28 @@ class Line:
             self.particle_ref.t_sim = (
                 self.get_length() / self.particle_ref._xobject.beta0[0] / clight)
 
+    @property
+    def scattering(self):
+        if not hasattr(self, '_scattering') or self._scattering is None:
+            try:
+                from xcoll.line_tools import XcollScatteringAPI
+                self._scattering = XcollScatteringAPI(line=self)
+            except ImportError as error:
+                raise ImportError("Please install Xcoll to use this feature.") from error
+
+        return self._scattering
+
+    @property
+    def collimators(self):
+        if not hasattr(self, '_collimators') or self._collimators is None:
+            try:
+                from xcoll.line_tools import XcollCollimatorAPI
+                self._collimators = XcollCollimatorAPI(line=self)
+            except ImportError as error:
+                raise ImportError("Please install Xcoll to use this feature.") from error
+
+        return self._collimators
+
     def discard_tracker(self):
 
         """
@@ -4527,7 +4549,12 @@ def mk_class_namespace(extra_classes):
         all_classes = element_classes + xf.element_classes + extra_classes + (Line,)
     except ImportError:
         all_classes = element_classes + extra_classes
-        log.warning("Xfields not installed correctly")
+        log.warning("Xfields not installed")
+    try:
+        import xcoll as xc
+        all_classes += xc.element_classes
+    except ImportError:
+        log.warning("Xcoll not installed")
 
     all_classes = all_classes + (EnergyProgram, xt.Replica)
 

{xtrack-0.69.5 → xtrack-0.69.7}/xtrack/twiss.py

@@ -1192,6 +1192,9 @@ def _compute_lattice_functions(Ws, use_full_inverse, s_co):
         'nuy': nuy,
         'nuzeta': nuzeta,
         'W_matrix': Ws,
+        'phix': phix,
+        'phiy': phiy,
+        'phizeta': phizeta,
     }
     return res, i_replace
 
@@ -3120,16 +3123,16 @@ class TwissTable(Table):
         W_start = self.W_matrix[start]
         W_end = self.W_matrix[end]
 
-        mux_start = self.mux[start]
-        mux_end = self.mux[end]
-        muy_start = self.muy[start]
-        muy_end = self.muy[end]
-        muzeta_start = self.muzeta[start]
-        muzeta_end = self.muzeta[end]
+        phix_start = self.phix[start]
+        phix_end = self.phix[end]
+        phiy_start = self.phiy[start]
+        phiy_end = self.phiy[end]
+        phizeta_start = self.phizeta[start]
+        phizeta_end = self.phizeta[end]
 
-        phi_x = 2 * np.pi * (mux_end - mux_start)
-        phi_y = 2 * np.pi * (muy_end - muy_start)
-        phi_zeta = 2 * np.pi * (muzeta_end - muzeta_start)
+        phi_x = phix_end - phix_start
+        phi_y = phiy_end - phiy_start
+        phi_zeta = phizeta_end - phizeta_start
 
         Rot = np.zeros(shape=(6, 6), dtype=np.float64)
 
@@ -3294,6 +3297,8 @@ class TwissTable(Table):
             out.muy = out.muy[0] - out.muy
             out.muzeta = out.muzeta[0] - out.muzeta
             out.dzeta = out.dzeta[0] - out.dzeta
+            out.phix = -out.phix
+            out.phiy = -out.phiy
 
         if 'ax_chrom' in out._col_names:
             out.ax_chrom = -out.ax_chrom

{xtrack-0.69.5 → xtrack-0.69.7/xtrack.egg-info}/PKG-INFO

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

xtrack-0.69.5/xtrack/_version.py

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