diff --git a/devices/detector_image.properties b/devices/detector_image.properties index 47a6021..3c23a1b 100644 --- a/devices/detector_image.properties +++ b/devices/detector_image.properties @@ -1,4 +1,4 @@ -#Wed Oct 31 11:20:30 CET 2018 +#Wed Oct 31 13:15:23 CET 2018 colormap=Temperature colormapAutomatic=false colormapLogarithmic=false diff --git a/script/daq/daq1.py b/script/daq/daq1.py index aabddaf..4156f1a 100644 --- a/script/daq/daq1.py +++ b/script/daq/daq1.py @@ -1,7 +1,7 @@ -set_geometry("fourcv") +set_geometry("fourcv-daq1") set_count_time(1.0) #transm.write(1e-10) -#transm.write(1e-3) +#transm.write(1e-4) #detectors = [mythen, mythen.acquire_time, pixel, pixel.image_filename] detectors = [mythen, mythen.acquire_time, pixel, pixel.image_filename, image.intensity,image.corrected_intensity, image.matrix] diff --git a/script/test/diffutils.py b/script/test/diffutils.py index 22d9000..72cfa4f 100644 --- a/script/test/diffutils.py +++ b/script/test/diffutils.py @@ -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 ###################################################################################################