diff --git a/xoptics/dcm.py b/xoptics/dcm.py index dd9b5e3..a7caf4d 100755 --- a/xoptics/dcm.py +++ b/xoptics/dcm.py @@ -194,12 +194,11 @@ class AlvraDCM_FEL: def get_current_value(self): return self.getEnergy.get() - - def move_and_wait(self,value,checktime=.01,precision=0.1): - self.setEnergy.put(value) - while abs(self.ebeamEnergy.get()-self.ebeamEnergySP.get())>precision: + def move_and_wait(self,value,checktime=.01,precision=0.1): + self.setEnergy.put(value) + while abs(self.ebeamEnergy.get()-self.ebeamEnergySP.get())>precision: sleep(checktime) - while dcmMoving.get()=1: + while dcmMoving.get()==1: sleep(checktime) def changeTo(self,value,hold=False):