From 49b6ba00b30d67206bc1e4dbd5d305fd5ed3eb83 Mon Sep 17 00:00:00 2001
From: Yngve Inntjore Levinsen <Yngve.Levinsen@esss.se>
Date: Mon, 23 Mar 2015 13:11:17 +0100
Subject: [PATCH] fixed TraceWin.plt.calc_twiss
---
ess/TraceWin.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/ess/TraceWin.py b/ess/TraceWin.py
index 6350064..a44a303 100644
--- a/ess/TraceWin.py
+++ b/ess/TraceWin.py
@@ -309,8 +309,13 @@ class plt:
if not hasattr(self,'sigma'):
self.calc_sigma()
- self.eps = [numpy.sqrt(numpy.det(self.sigma[i:i+2][:,i:i+2])) for i in (0,2,4)]
- self.beta = [self.sigma[i][j]]
+ self.twiss_eps=[]
+ for j in xrange(len(self.Nelp)):
+ self.twiss_eps.append([numpy.sqrt(numpy.linalg.det(self.sigma[j][i:i+2][:,i:i+2])) for i in (0,2,4)])
+ self.twiss_beta = [[self.sigma[j][i][i] for i in (0,2,4)] for j in xrange(len(self.Nelp))]
+
+ self.twiss_eps=numpy.array(self.twiss_eps)
+ self.twiss_beta=numpy.array(self.twiss_beta)
--
GitLab