Commit 18c1e2fb authored by Carsten Richter's avatar Carsten Richter
Browse files

Corrected use of motor colums (adc)

parent ac0549f6
......@@ -850,11 +850,11 @@ class ShiftWidget(Qt.QMainWindow):
layout = Qt.QVBoxLayout(roiSubGroup)
layout.addWidget(areaPlot)
# X and Y shif plot
# X and Y shift plot
self.__xShiftPlot = xShiftPlot = XsocsPlot2D()
self.__yShiftPlot = yShiftPlot = XsocsPlot2D()
xShiftPlot.setGraphXLabel('entry #')
xShiftPlot.setGraphYLabel('hirizontal shift')
xShiftPlot.setGraphYLabel('horizontal shift')
xShiftPlot.setGraphYLabel('column shift', axis='right')
yShiftPlot.setGraphXLabel('entry #')
yShiftPlot.setGraphYLabel('vertical shift')
......
......@@ -46,6 +46,9 @@ class InvalidEntryError(Exception):
ScanPositions = namedtuple('ScanPositions',
['motor_0', 'pos_0', 'motor_1', 'pos_1', 'shape'])
MOTORCOLS = {"pix":"adcY",
"piy":"adcX",
"piz":"adcZ"}
def _process_entry(method):
......@@ -184,8 +187,8 @@ class XsocsH5(XsocsH5Base):
def scan_positions(self, entry):
path = self.measurement_tpl.format(entry)
params = self.scan_params(entry)
m0 = '/adc{0}'.format(params['motor_0'].decode()[-1].upper())
m1 = '/adc{0}'.format(params['motor_1'].decode()[-1].upper())
m0 = '/{0}'.format(MOTORCOLS[params['motor_0'].decode()])
m1 = '/{0}'.format(MOTORCOLS[params['motor_1'].decode()])
n_0 = params['motor_0_steps']
n_1 = params['motor_1_steps']
......
Supports Markdown
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