diff --git a/script/fbm.py b/script/fbm.py index d248ab5..938d957 100644 --- a/script/fbm.py +++ b/script/fbm.py @@ -24,7 +24,7 @@ if caget(('X06DA-OP-MO:E-GET'),'d') > 17.5: #Mono energy tc = 40 # 2015.09.20 quick fix by MT JW cur = caget('X06DA-ES-BPM1:SUM','d') -op1 = vaget('X06DA-OP-XPM1:CHAN1', 'd') +op1 = caget('X06DA-OP-XPM1:CHAN1', 'd') if op1 < 1.0: sete_failed = 1 @@ -69,7 +69,7 @@ while abs(by) >= ymax : y3 = try3.read() if abs(y3i - y3 - 1e-4 * round(by/1e-3)) > 0.008: raise Exception ('Feedback trying to move mirror Y3 beyond safe limit') - try3.motor.moveRel(-1e-4 * round(by/1e-3)) + try3.moveRel(-1e-4 * round(by/1e-3)) print "current X06DA-OP-MI1:TRY3: ", y3 time.sleep(0.25)