From 9eeeb8d059b4de174677dd79affb90b962604d9e Mon Sep 17 00:00:00 2001 From: Chris Milne Date: Tue, 26 Jun 2018 19:57:09 +0200 Subject: [PATCH] status return strings --- xoptics/dcm.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/xoptics/dcm.py b/xoptics/dcm.py index 0384ad1..878be3e 100755 --- a/xoptics/dcm.py +++ b/xoptics/dcm.py @@ -182,13 +182,14 @@ class AlvraDCM_FEL: currEnergy = self.getEnergy.get() s = 'Alvra DCM status\n\n' -# print('%s'%iocStr) -# print('FEL coupling %s'%FELcouplingStr) -# print('Alvra beamline mode %s'%alvraModeStr) + print('%s'%iocStr) + print('FEL coupling %s'%FELcouplingStr) + print('Alvra beamline mode %s'%alvraModeStr) + print('Photon energy (eV) %'%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 + s += 'FEL coupling: %s\n'%FELcouplingStr + s += 'Alvra beamline mode: %s\n'%alvraModeStr + s += 'Photon energy (eV): %s\n'%currEnergy return s def get_current_value(self):