This commit is contained in:
gac-x04sa
2018-10-31 13:51:58 +01:00
parent 1fb98de3c1
commit b00d748248
3 changed files with 12 additions and 5 deletions

View File

@@ -23,11 +23,12 @@
#3- Execute: run("diffutils")
#4- Execute: setup_diff(sixc, en)
from __future__ import absolute_import
import traceback
import Jama.Matrix
import Jama.Matrix
diffcalc_path = os.path.abspath(get_context().setup.expandPath("{script}/Lib/diffcalc"))
if not diffcalc_path in sys.path:
sys.path.append(diffcalc_path)
@@ -160,7 +161,10 @@ class HklPositoner (PositionerBase):
PositionerBase.__init__(self, name, PositionerConfig())
self.setParent(hkl_group)
self.index = index
def isReady(self):
return PositionerBase.isReady(self) and self.getParent().isReady()
def doRead(self):
return self.getParent()._setpoint[self.index]
@@ -340,6 +344,9 @@ def uncon(name):
def print_con():
hkl.con()
def get_ub_matrix():
return ub.ubcalc._UB.tolist()
###################################################################################################
# HKL Combined Scan
###################################################################################################