From fd649dd5d95957ab31cd119d98ab27691034fa91 Mon Sep 17 00:00:00 2001
From: Yngve Inntjore Levinsen <Yngve.Levinsen@esss.se>
Date: Mon, 23 Mar 2015 11:42:35 +0100
Subject: [PATCH] fixes in TraceWin.plt calc_avg and calc_sigma had some
errors, apologies
---
ess/TraceWin.py | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/ess/TraceWin.py b/ess/TraceWin.py
index e8df760..6350064 100644
--- a/ess/TraceWin.py
+++ b/ess/TraceWin.py
@@ -237,16 +237,13 @@ class plt:
self.avg=dict(x=[], xp=[], y=[], yp=[], E=[], phi=[])
- vals=self._columns
+ vals=self._columns[:-1]
for i in self.Nelp:
data=self[i]
for v in vals:
self.avg[v].append(numpy.average(data[v]))
- for v in vals:
- self.avg[v]=numpy.array(self.avg[v])
-
def calc_minmax(self,pmin=5,pmax=95):
'''
Calculates min/max values of beam coordinates
@@ -291,10 +288,15 @@ class plt:
if not hasattr(self,'avg'):
self.calc_avg()
- vals=self._columns
+ vals=self._columns[:-1]
+
+ self.sigma=[]
+ for j in xrange(len(self.Nelp)):
+ i=self.Nelp[j]
+ data=self[i]
+ self.sigma.append([[numpy.mean( (data[n]-self.avg[m][j]) * (data[m] - self.avg[m][j]) ) for n in vals] for m in vals])
- self.sigma=numpy.array([[numpy.mean( (self[n]-self.avg[n]) * (self[m] - self.avg[m]) ) for n in vals] for m in vals])
- print self.sigma.shape
+ self.sigma=numpy.array(self.sigma)
def calc_twiss(self):
'''
--
GitLab