diff --git a/script/device/Pixel.py b/script/device/Pixel.py index 1babbf0..8a5834a 100644 --- a/script/device/Pixel.py +++ b/script/device/Pixel.py @@ -112,14 +112,14 @@ class Pixel(DeviceBase, Readable): def get_trigger_id(self): return caget (self.prefix + ":TRIG", 'i') - def pixsnap(self): + def start(self): pixwait() # Wait until pixel detector is ready PIX_EXPOSE = epics_get(PIX_EXPOSE_CHN) slef.set_trigger ("Inc+Sn+Wr") self.PIX_EXP_START_TIME = time.time() - def pixwait(self): + def wait_finished(self): cnt = 0 expose = self.get_expose() # diff --git a/script/local.py b/script/local.py index 0f7cf83..4d1dbdf 100644 --- a/script/local.py +++ b/script/local.py @@ -30,7 +30,7 @@ def close_shutter(): run("device/Mythen") - +run("device/pIXEL") @@ -48,10 +48,10 @@ def pix_is_on(): def before_sample(position, scan): global count_time, count_id, image_filename + pix_is_on = self.pix_is_on(scan) mythen.abort() - open_shutter() - if (count_time != 0): - pix_is_on = pix_is_on(scan)_ + open_shutter() + if (count_time != 0): if pix_is_on: pixel.set_expose(count_time) pix.start() @@ -60,7 +60,7 @@ def before_sample(position, scan): mythen.set_acquire_time(count_time) mythen.set_acquire_mode("Single") mythen.start() - else: + else: print "Preset monitor counting is not supported\!" #waitcount @@ -112,7 +112,7 @@ def before_sample(position, scan): #imageUserGetcounts() -MOTOR_READBACKS = phi.readback, omegaH.readback, nu.readback, omegaV.readback, alpha.readback, delta.readback, gamma.readback, +MOTOR_READBACKS = phi.readback, omegaH.readback, nu.readback, omegaV.readback, alpha.readback, delta.readback, gamma.readback, \ xv.readback, y1.readback, y2.readback, y3.readback, trx.readback, thy.readback #PSEUDO_DEVICES = h, k, l, lambda \ No newline at end of file