From 8a44dc9ac272e0c5e1db207c513b3ef9a926734d Mon Sep 17 00:00:00 2001 From: Chris Milne Date: Tue, 26 Jun 2018 19:44:40 +0200 Subject: [PATCH] fixed status of monoFEL --- xoptics/dcm.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xoptics/dcm.py b/xoptics/dcm.py index 3b69c21..0384ad1 100755 --- a/xoptics/dcm.py +++ b/xoptics/dcm.py @@ -178,17 +178,17 @@ class AlvraDCM_FEL: else: iocStr = "Soft IOC not running" FELcouplingStr = self.FELcoupling.get() - alvraModeStr = self.alvraMode.get() + alvraModeStr = self.alvraMode.get(as_string=True) currEnergy = self.getEnergy.get() - s = 'Alvra DCM status\n' + s = 'Alvra DCM status\n\n' # print('%s'%iocStr) # print('FEL coupling %s'%FELcouplingStr) # print('Alvra beamline mode %s'%alvraModeStr) - s += '%s\n'%iocStr - s += 'FEL coupling: %s\n'%FELcouplingStr - s += 'Alvra beamline mode: %s\n'%alvraModeStr - s += 'Photon energy (eV): %s\n'%currEnergy + s += '%s\n\n'%iocStr + s += 'FEL coupling: %s\n\n'%FELcouplingStr + s += 'Alvra beamline mode: %s\n\n'%alvraModeStr + s += 'Photon energy (eV): %s\n\n'%currEnergy return s def get_current_value(self):