GitLab will be upgraded on June 23rd evening. During the upgrade the service will be unavailable, sorry for the inconvenience.

Commit 84a3c1f8 authored by bliss administrator's avatar bliss administrator

Uncomment reset dial position

Add default exposure time value for ct
Add function to print sample position
parent 78e283e5
......@@ -207,7 +207,7 @@ def init_mr_yrot():
print("init_yrot --- reseting yrot to 0\n")
#yrot.dial = 0
yrot.dial = 0
yrot.position = 0
slp = (_myposp - _myposn) / 2.0 - 0.05
......@@ -338,8 +338,8 @@ def init_mr_sz():
print("init_sz --- reseting sz to 0\n")
#sz.offset = 0
sz.position = 0
sz.dial = 0
slp = (_myposp - _myposn) / 2.0 - 0.05
......@@ -506,7 +506,9 @@ def calib_motors(*motors,short_calib=True):
all_calib += [init_hr_sz,init_hr_yrot,init_hr_srot,init_hr_z0]
all_motors.append(z0)
if get_current_session().name == 'MRTOMO':
all_calib += [init_mr_sz,init_mr_yrot,init_mr_srot]
#all_calib += [init_mr_sz,init_mr_yrot,init_mr_srot]
# Problem with mr_yrot limit switches!!!!!!!!
all_calib += [init_mr_sz, init_mr_srot]
global short_calibration
short_calibration = short_calib
......
......@@ -72,6 +72,8 @@ def ct(exposure_time=None, *args):
else:
print('No tomo exists in the session. Please use select_tomo() to define one')
else:
if exposure_time is None:
exposure_time = 1
bliss_ct(exposure_time, *args)
def set_accumulation(detector):
......@@ -97,8 +99,10 @@ def shclose():
_TOMO.shutter.beam_shutter_close()
def feopen():
frontend.open()
setup_globals.frontend.open()
def feclose():
frontend.close()
setup_globals.frontend.close()
def psp():
print(f'sx {setup_globals.sx.position} sy {setup_globals.sy.position} sz {setup_globals.sz.position} yrot {setup_globals.yrot.position}')
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