xtrack 0.98.8__tar.gz → 0.98.9__tar.gz

{xtrack-0.98.8/xtrack.egg-info → xtrack-0.98.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xtrack
-Version: 0.98.8
+Version: 0.98.9
 Summary: Tracking library for particle accelerators
 Author: G. Iadarola et al.
 License-Expression: Apache-2.0

xtrack-0.98.9/xtrack/_version.py

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

{xtrack-0.98.8 → xtrack-0.98.9}/xtrack/twiss.py

@@ -1784,9 +1784,9 @@ def _compute_chromatic_functions(line, init, delta_chrom,
         tw_minus = tw_chrom_res[0]
         tw_center = on_momentum_twiss_res
 
-        delta_plus_mean = np.trapezoid(tw_plus.delta, tw_plus.s) / tw_plus.s[-1]
-        delta_minus_mean = np.trapezoid(tw_minus.delta, tw_minus.s) / tw_minus.s[-1]
-        delta_center_mean = np.trapezoid(tw_center.delta, tw_center.s) / tw_center.s[-1]
+        delta_plus_mean = trapz(tw_plus.delta, tw_plus.s) / tw_plus.s[-1]
+        delta_minus_mean = trapz(tw_minus.delta, tw_minus.s) / tw_minus.s[-1]
+        delta_center_mean = trapz(tw_center.delta, tw_center.s) / tw_center.s[-1]
 
         dqx_plus = (tw_plus.mux[-1] - tw_center.mux[-1]) / (delta_plus_mean - delta_center_mean)
         dqx_minus = (tw_center.mux[-1] - tw_minus.mux[-1]) / (delta_center_mean - delta_minus_mean)

{xtrack-0.98.8 → xtrack-0.98.9}/xtrack/twissplot.py

@@ -7,6 +7,17 @@ import time
 
 import numpy as np
 
+def _in_jupyter_notebook():
+    try:
+        from IPython import get_ipython
+        ip = get_ipython()
+        if ip is None:
+            return False
+        # Jupyter notebook or JupyterLab
+        return 'IPKernelApp' in ip.config
+    except Exception:
+        return False
+
 
 def _mylbl(d, x):
     return d.get(x, r"%s" % x)
@@ -243,7 +254,11 @@ class TwissPlot(object):
             self.lines, self.legends, loc="upper right", bbox_to_anchor=(1.35, 1.)
         )
         self.ax.grid(self.grid)
-        self.figure.canvas.draw()
+        if _in_jupyter_notebook():
+             self.figure.draw_without_rendering()
+        else:
+            self.figure.canvas.draw()
+
         if hasattr(self, "on_run"):
             self.on_run(self)
 

{xtrack-0.98.8 → xtrack-0.98.9/xtrack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xtrack
-Version: 0.98.8
+Version: 0.98.9
 Summary: Tracking library for particle accelerators
 Author: G. Iadarola et al.
 License-Expression: Apache-2.0

xtrack-0.98.8/xtrack/_version.py

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