Commit 44097360 authored by bliss administrator's avatar bliss administrator
Browse files

Bug correction

parent a376503b
......@@ -21,6 +21,7 @@ from tomo.TomoParameters import TomoParameters
from tomo.TomoMusst import TriggerType
import tomo.pcotomo as pcotomo
from tomo.pcotomo.Presets import FastShutterPreset
from tomo.pcotomo.PcoTomoScanDisplay import PcoTomoScanDisplay
class PcoTomo(Tomo):
......@@ -229,10 +230,10 @@ class PcoTomo(Tomo):
if ret != False:
self.parameters.tomo_n = ret[dlg_tomo_n]
self.tomo_ccd.detector.proxy.image_roi = [0,0,0,0]
roix = int((self.tomo_ccd.detector.proxy.image_roi[2] - ret[dlg_roix])/2)
roiy = int((self.tomo_ccd.detector.proxy.image_roi[3] - ret[dlg_roiy])/2)
self.tomo_ccd.detector.image.roi = [roix,roiy,ret[dlg_roix],ret[dlg_roiy]]
#self.tomo_ccd.detector.proxy.image_roi = [0,0,0,0]
#roix = int((self.tomo_ccd.detector.proxy.image_roi[2] - ret[dlg_roix])/2)
#roiy = int((self.tomo_ccd.detector.proxy.image_roi[3] - ret[dlg_roiy])/2)
#self.tomo_ccd.detector.image.roi = [roix,roiy,ret[dlg_roix],ret[dlg_roiy]]
self.parameters.time = ret[dlg_time]
self.parameters.nwait = ret[dlg_nwait]
self.parameters.start_pos = ret[dlg_startpos]
......@@ -508,9 +509,9 @@ class PcoTomo(Tomo):
return expo_time
def ref_scan(self, expo_time = None, projection=1, turn=0, scan_sequence=None, header={}):
def ref_scan(self, ref_n=None, expo_time = None, projection=1, turn=0, scan_sequence=None, header={}, save=True, run=True):
shutter_preset = FastShutterPreset(self.shutter,self.tomo_musst)
super().ref_scan(expo_time=expo_time, projection=projection, turn=turn, shutter_preset=shutter_preset, scan_sequence=scan_sequence, header=header)
return super().ref_scan(ref_n=ref_n, expo_time=expo_time, projection=projection, turn=turn, shutter_preset=shutter_preset, scan_sequence=scan_sequence, header=header, save=save, run=run)
def def_ref_disp(self):
"""
......@@ -592,7 +593,7 @@ class PcoTomo(Tomo):
print('Sequence preparation ended well!\n')
def run(self):
PcoTomoScanDisplay.START_TIME = time.time()
self.prepare()
self.show_scan_info()
if self.sequence_prepare is False:
......@@ -702,14 +703,14 @@ class PcoTomo(Tomo):
self.run()
def endless_tomo(self, start, nimg, time, nloop, nwait, trange=180):
def endless_tomo(self, start, nimg, time, ntomo, nloop, nwait, trange=180):
self.mode = 'endless'
self.parameters.start_pos = start
self.parameters.trange = trange
self.parameters.tomo_n = nimg
self.parameters.time = time
self.parameters.ntomo = 1
self.parameters.ntomo = ntomo
self.parameters.nloop = nloop
self.parameters.nwait = nwait
self.parameters.noread = 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment