Commit 20abfb9e authored by reiche's avatar reiche

BSread seems to work now

parent 2bcfc4a8
......@@ -111,7 +111,6 @@ class DispersionTools(QMainWindow,Ui_DispersionToolsGUI):
def analyse(self):
# needs consitency check for beam line and methods
self.Log.append('Analysing measurement data...')
return
s,dx,dy,ddx,ddy,names=self.model.DispersionPrediction(self.COList.currentIndex())
self.analysis.analyse(self.scan,names)
......@@ -251,7 +250,12 @@ class DispersionTools(QMainWindow,Ui_DispersionToolsGUI):
if len(self.scan.actuator.actuators) > 0:
x = self.scan.actuator.actuators[0]['val'][0:istep]
label=self.scan.actuator.actuators[0]['PV']
rang=[self.scan.actuator.actuators[0]['val'][0],self.scan.actuator.actuators[0]['val'][-1]]
rang=[np.min(self.scan.actuator.actuators[0]['val']),np.max(self.scan.actuator.actuators[0]['val'])]
drang=0.02*(rang[1]-rang[0])
if drang <=0:
drang=0.1
rang[0]-=drang
rang[1]+=drang
else:
x =[i+1 for i in range(istep)]
label='Steps'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment