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

Updated files after testing

parent 6425bc49
......@@ -6,7 +6,7 @@ from bliss.common.standard import *
from bliss.common.axis import *
from bliss.common.cleanup import *
from bliss.setup_globals import *
from bliss import setup_globals
from bliss.config.static import get_config
global short_calibration
......@@ -336,7 +336,7 @@ def init_srot():
srot.dial = 0
srot.position = 0
pos = setup_globals.SampleChanger.calibration_positions['srot']
pos = get_config().get_config('SampleChanger')['positions'][0]['Hr']['calibration']['srot']
start=time.time()
srot.controller.home_search(srot,1,pos)
......
......@@ -25,8 +25,8 @@ class SampleChanger:
self.samples_device = DeviceProxy(tango_server['samples'])
self.robot_device = DeviceProxy(tango_server['robot'])
if 'MrTomo' in get_current_session().object_names:
self.tomo = 'MrTomo'
if 'mrtomo' in get_current_session().object_names:
self.tomo = 'mrtomo'
positions = config['positions'][0]
mr_positions = positions['Mr'][0]
......@@ -34,8 +34,8 @@ class SampleChanger:
robot_positions = mr_positions['robot'].to_dict()
experiment_positions = mr_positions['experiment'].to_dict()
elif 'HrTomo' in get_current_session().object_names:
self.tomo = 'HrTomo'
elif 'hrtomo' in get_current_session().object_names:
self.tomo = 'hrtomo'
positions = config['positions'][0]
hr_positions = positions['Hr']
......
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