From d27fb225d5ba303d34edd19f93f55278b283fe34 Mon Sep 17 00:00:00 2001 From: panepucci Date: Wed, 17 Feb 2016 11:04:45 +0100 Subject: [PATCH] Closedown --- script/local.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/script/local.py b/script/local.py index 66ba330..7f06f16 100644 --- a/script/local.py +++ b/script/local.py @@ -10,16 +10,19 @@ def A2E(t,h=1.0,k=1.0,l=1.0, deg =True, ln = False): tt = (t * dtor) if (deg or (t>1.0)) else t return 12.39842 / (d0*math.sin(tt)) -def get_energy(): +def get_energy(debug_msg = True): t2 = caget("X06DA-OP-MO1:ROX2.RBV",'d') e = A2E(abs(t2)) - print 'Energy [keV]:'+ str(e) + ' Wavelength [A]:' + str(12.39842/e) + if debug_msg: + print 'Energy [keV]:'+ str(e) + ' Wavelength [A]:' + str(12.39842/e) return e run("fit") run("rock") +run("sete") +run("seteq") @@ -33,4 +36,10 @@ def rocknroll(): """ run("rocknroll") - \ No newline at end of file + +import ch.psi.pshell.device.ReadonlyRegisterBase as ReadonlyRegisterBase +class EnergyReader(ReadonlyRegisterBase): + def doRead(self): + return get_energy(False) + +add_device(EnergyReader("energy"), True) \ No newline at end of file