Skip to content

Commit

Permalink
Return protocol prefixed source
Browse files Browse the repository at this point in the history
  • Loading branch information
DiamondJoseph committed Mar 7, 2024
1 parent 47a4fbf commit dacd8cc
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/ophyd_async/epics/_backend/_aioca.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
_floating_dbr = {dbr.DBR_FLOAT, dbr.DBR_DOUBLE}


def _data_key_from_augmented_value(value: AugmentedValue) -> DataKey:
def _data_key_from_augmented_value(source: str, value: AugmentedValue) -> DataKey:
"""Use the return value of get with FORMAT_CTRL to construct a DataKey
describing the signal. See docstring of AugmentedValue for expected
value fields by DBR type.
Expand All @@ -54,9 +54,8 @@ def _data_key_from_augmented_value(value: AugmentedValue) -> DataKey:
"""

# Always present keys
source = value.name
if not value.ok:
raise Exception(f"{value.name} error: {value.errorcode}: {str(value)}")
raise Exception(f"{source} error: {value.errorcode}: {str(value)}")

scalar = value.element_count == 1

Expand Down Expand Up @@ -108,8 +107,8 @@ def reading(self, value: AugmentedValue):
alarm_severity=-1 if value.severity > 2 else value.severity,
)

def descriptor(self, value: AugmentedValue) -> DataKey:
return _data_key_from_augmented_value(value)
def descriptor(self, source: str, value: AugmentedValue) -> DataKey:
return _data_key_from_augmented_value(source, value)


class CaLongStrConverter(CaConverter):
Expand Down Expand Up @@ -271,7 +270,7 @@ async def _caget(self, format: Format) -> AugmentedValue:

async def get_descriptor(self) -> DataKey:
value = await self._caget(FORMAT_CTRL)
return self.converter.descriptor(value)
return self.converter.descriptor(self.source, value)

async def get_reading(self) -> Reading:
value = await self._caget(FORMAT_TIME)
Expand Down

0 comments on commit dacd8cc

Please sign in to comment.