Fix import for newer Jython

paulscherrerinstitute · Nov 11, 2020 · ef43843 · ef43843
1 parent 41615d5
commit ef43843
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/assembly/script/Lib/diffutils.py b/src/main/assembly/script/Lib/diffutils.py
@@ -54,7 +54,7 @@
 from diffcalc.ub.persistence import UBCalculationJSONPersister, UbCalculationNonPersister
 from diffcalc.gdasupport.minigda.scannable import ScannableBase, ScannableGroup
 #from diffcalc.gdasupport.minigda import command
-from diffcalc.hardware import HardwareAdapter
+import diffcalc.hkl.you.calc as you_calc
 
 
 import ch.psi.pshell.device.PositionerConfig as PositionerConfig
@@ -362,8 +362,8 @@ def internal_position_to_physical_angles(self, internal_position):
             settings.ubcalc_persister = UbCalculationNonPersister()
         settings.axes_scannable_group = settings.hardware.diffractometer
         settings.energy_scannable = settings.hardware.energy
-        settings.ubcalc_strategy = diffcalc.hkl.you.calc.YouUbCalcStrategy()
-        settings.angles_to_hkl_function = diffcalc.hkl.you.calc.youAnglesToHkl
+        settings.ubcalc_strategy = you_calc.YouUbCalcStrategy()
+        settings.angles_to_hkl_function = you_calc.youAnglesToHkl
         from diffcalc.gdasupport import you
         reload(you)