This commit is contained in:
2019-03-20 13:52:00 +01:00
parent 3084fe0510
commit 5db0f78aee
910 changed files with 191152 additions and 322 deletions

View File

@@ -172,7 +172,10 @@ sim_energy = SimulatedEnergy()
sim_energy_readback = SimulatedEnergyReadback()
class beam_ok(ReadonlyRegisterBase):
def doRead(self):
return True
add_device(beam_ok(), True)
#Device utilities
def integrate_image():
@@ -767,4 +770,45 @@ class DigitalInput(ReadonlyRegisterBase):
return False if (int(time.time()) %2 == 0 ) else True
add_device(DigitalInput("di"),True)
di.polling=1000
di.polling=1000
### Diffcalc
GEOMETRY_PREFERENCE = "geometry"
def get_geometry():
"""
"""
setting = get_setting(GEOMETRY_PREFERENCE)
if setting is None or (len(setting.strip()) == 0):
return None
return setting
def set_geometry(value, apply = None):
"""
"""
if value is None or (len(value.strip()) == 0):
set_setting(GEOMETRY_PREFERENCE, "" )
for name in "wavelength", "hkl_group", "h", "k", "l":
dev = get_device(name)
if dev is not None:
remove_device(dev)
return
filename = get_context().setup.expandPath("{script}/geometry/"+ str(value)+".py")
if not os.path.isfile(filename):
raise Exception("Invalid geometry file: " + value)
former = get_geometry()
if ((apply is None) and former != value) or (apply==True) :
set_setting(GEOMETRY_PREFERENCE, value )
run(filename)
def is_geometry_set():
return get_device("wavelength") is not None
mu.moveAsync(0.0)
eta.moveAsync(0.0)
delta.moveAsync(45.0)
gamma.moveAsync(0.0)
energy.write(9.5)