Skip to content

fix: Prevent grouping attributes in the pva pvi. #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evvaaaa merged 1 commit into from
Mar 13, 2025
Merged

fix: Prevent grouping attributes in the pva pvi. #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/fastcs/transport/epics/pva/pvi_tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,20 @@ def _get_signal_infos(self) -> dict[str, _PviSignalInfo]:
def _make_p4p_raw_value(self) -> dict:
p4p_raw_value = defaultdict(dict)
for pv_leaf, signal_info in self._get_signal_infos().items():
pvi_name, number = _pv_to_pvi_name(pv_leaf.rstrip(":PVI") or pv_leaf)
if number is not None:
stripped_leaf = pv_leaf.rstrip(":PVI")
is_controller = stripped_leaf != pv_leaf
pvi_name, number = _pv_to_pvi_name(stripped_leaf or pv_leaf)
if is_controller and number is not None:
if signal_info.access not in p4p_raw_value[pvi_name]:
p4p_raw_value[pvi_name][signal_info.access] = {}
p4p_raw_value[pvi_name][signal_info.access][f"v{number}"] = (
signal_info.pv
)
else:
elif is_controller:
p4p_raw_value[pvi_name][signal_info.access] = signal_info.pv
else:
attr_pvi_name = f"{pvi_name}{'' if number is None else number}"
p4p_raw_value[attr_pvi_name][signal_info.access] = signal_info.pv

return p4p_raw_value

Expand Down
10 changes: 3 additions & 7 deletions tests/transport/epics/pva/test_p4p.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,14 +352,10 @@ class SomeController(Controller):
"value": {
"additional_child": {"d": f"{pv_prefix}:AdditionalChild:PVI"},
"another_child": {"d": f"{pv_prefix}:AnotherChild:PVI"},
"another_attr": {
"rw": {
"v0": f"{pv_prefix}:AnotherAttr0",
"v1000": f"{pv_prefix}:AnotherAttr1000",
}
},
"another_attr0": {"rw": f"{pv_prefix}:AnotherAttr0"},
"another_attr1000": {"rw": f"{pv_prefix}:AnotherAttr1000"},
"a_third_attr": {"w": f"{pv_prefix}:AThirdAttr"},
"attr": {"rw": {"v1": f"{pv_prefix}:Attr1"}},
"attr1": {"rw": f"{pv_prefix}:Attr1"},
"child": {
"d": {
"v0": f"{pv_prefix}:Child0:PVI",
Expand Down
Loading