linse/frappy_sinq
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve meaning handling

Browse Source 
- Moveables with meaning 'temperature' are added to
  the 'temperature_regulation' target list
- Devices with meaning 'temperature_regulation' are added
  to 'temperature' target list, but with much lower priority
  (should be considered only when no sample quantity is detected)
This commit is contained in:
zolliker
2024-12-03 11:42:12 +01:00
parent 4cbc5a9ec9
commit 53057297d7
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
devices.py
View File

@ -503,8 +503,7 @@ class FrappyConfig(Device):
nodedevs = filter(None, [session.devices.get(devname) for devname in self.nodes])
# value to add to the importance given in meanings targets list
add_importance = {k: 10 * i for i, k in enumerate(self.nodes)}
sample_devices = {}
regulationset = set()
sample_devices = {k: [] for k in self.meanings}
for nodedev in nodedevs:
secnode = nodedev._secnode
if not secnode:
@ -517,10 +516,19 @@ class FrappyConfig(Device):
meaning = None
if meaning:
meaning_name, importance = meaning
targetlist = sample_devices.get(meaning_name)
if targetlist is None:
session.log.warning('%s: meaning %r is unknown', devname, meaning_name)
continue
sample_devices[meaning_name].append((importance, devname))
head, _, tail = meaning_name.partition('_')
if tail == 'regulation':
regulationset.add(head)
sample_devices.setdefault(meaning_name, []).append((importance, devname))
# add temperature_regulation to temperature list, with very low importance
sample_devices[head].append((importance - 100, devname))
elif not tail:
reg = f'{meaning_name}_regulation'
if reg in sample_devices and isinstance(session.devices.get(devname), Moveable):
sample_devices[reg].append((importance, devname))
previous_aliases = self.get_se_aliases()
newenv = {} # to be added to envlist (dict [devname] of aliasname)
@ -534,7 +542,7 @@ class FrappyConfig(Device):
aliasnames = []
elif isinstance(aliasnames, str):
aliasnames = [aliasnames]
aliascfg = info.get('targets', {})
aliascfg = {k: v - i * 0.01 for i, (k, v) in enumerate(info.get('targets', {}).items())}
predefined_alias = info.get('predefined_alias')
if predefined_alias:
aliases = [a for a in predefined_alias
@ -554,8 +562,6 @@ class FrappyConfig(Device):
# living on the stick/addons node
nr += add_importance.get(str(getattr(dev, 'secnode', '')), 0)
importance_list.append((nr, devname))
if meaning in regulationset: # take temperature_regulation when temperature is not available
importance_list.extend(sample_devices.get(f'{meaning}_regulation', []))
importance_list = sorted(importance_list, reverse=True)
session.log.debug('%s: %r', meaning, importance_list)
for _, devname, in importance_list:

13
setups/frappy.py
View File

@ -17,34 +17,35 @@ devices = dict(
# the devices with the names given by key are added to determine the
# device, using the given importance number, with similar values as
# given by the SECoP standard (10: instrument, 20: cryostat, 30: insert)
# the given numbers assume it is on the cryo, +10 / +20 is added for stick/addons
temperature = { # the SECoP meaning
'alias': 'Ts', # the name(s) to be given to the alias
'targets': # possible devices in addition with importance (numbers assume its on the cryo)
{'se_ts': 19, 'se_tt': 18, 'se_tm': 17},
{'se_ts': 20, 'se_tt': 20, 'se_tm': 20},
},
temperature_regulation = {
'alias': 'T',
'targets': {'se_ts': 19, 'se_tt': 18, 'se_tm': 17, 'se_T_stat': 16},
'targets': {'se_ts': 27, 'se_tt': 27, 'se_tm': 27, 'se_T_stat': 27},
'drivable_only': True,
},
magneticfield = {
'alias': 'B',
'targets': {'se_mf': 19},
'targets': {'se_mf': 20},
},
pressure = {
'alias': 'p',
'targets': {'se_pressure': 19},
'targets': {'se_pressure': 20},
},
rotation_z={
# possible names of the instruments main omega alias
# only one of these must be an alias, and this is then used
'predefined_alias': ['a3', 'om'],
'targets': {'se_om': 19},
'targets': {'se_om': 20},
'envlist': False,
},
stick_rotation={
'alias': 'dom',
'targets': {'se_om': 19, 'se_stickrot': 18},
'targets': {'se_om': 20, 'se_stickrot': 20},
'envlist': False,
}
)