diff --git a/qspace.py b/qspace.py index 6930afc..2a26b14 100644 --- a/qspace.py +++ b/qspace.py @@ -11,6 +11,9 @@ from slic.devices.device import Device from slic.devices.simpledevice import SimpleDevice from slic.utils.printing import printable_table +from undulator import Undulators +from undulator import Mono +from undulator import Coupled_MonoUnd INDICES = { "h": 0, @@ -245,7 +248,12 @@ nu = Motor("SATES30-RIXS:MOT_DRY.VAL") # and this to the machine wavelength (maybe this needs to be calculated from the energy? then we should add a Wavelength wrapper...) # wl = Wavelength(PVAdjustable("MACHINE:ENERGY")) -wl = Wavelength(mono) +mono_name = "Athos_mono" +pv_mono_name="SATOP11-OSGM087" + +Mon = Mono(pv_mono_name=pv_mono_name, mono_name=mono_name) + +wl = Wavelength(Mon) # put it all together: q = QSpace3D("SOMETHING:Q", mu, chi, phi, nu, wl)