added default lattice and orientations; clean up

This commit is contained in:
gac-furka
2022-04-26 15:38:39 +02:00
parent 360f4de5ca
commit a5dc401900
2 changed files with 39 additions and 37 deletions

View File

@ -11,9 +11,6 @@ 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,
@ -246,23 +243,17 @@ def print_history(*adjs, enumerate_lines=True, make_legend=True):
# these point to the different motors
mu = Motor("SATES30-RIXS:MOT_SRY.VAL")
chi = Motor("SATES30-RIXS:MOT_SRZ.VAL")
phi = Motor("SATES30-RIXS:MOT_SRX.VAL")
nu = Motor("SATES30-RIXS:MOT_DRY.VAL")
## these point to the different motors
#mu = Motor("SATES30-RIXS:MOT_SRY.VAL")
#chi = Motor("SATES30-RIXS:MOT_SRZ.VAL")
#phi = Motor("SATES30-RIXS:MOT_SRX.VAL")
#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"))
mono_name = "Athos_mono"
pv_mono_name="SATOP11-OSGM087"
## 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"))
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)
## put it all together:
#q = QSpace3D("SOMETHING:Q", mu, chi, phi, nu, wl)
## in ipython
#q.set_lattice("SiO2", 4.913, 5.405)