bec/csaxs_bec
0
0
Fork 1
Code Issues 13 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

feat:add frontend xbpm and slit motors to device config #86

Merged
diaz merged 4 commits from feat/add_xbpm_counter into main 2025-07-16 10:19:45 +02:00
Conversation 26 Commits 4 Files Changed 2 +230 -1
diaz commented 2025-07-11 15:50:47 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

The aim is to add the motors and xbpm monitor signals to the frontend device config file. So far we managed the physical motors for the XBPM1 and the FE slits (sl1). Please do not merge yet

The aim is to add the motors and xbpm monitor signals to the frontend device config file. So far we managed the physical motors for the XBPM1 and the FE slits (sl1). Please do not merge yet
diaz commented 2025-07-11 15:50:47 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

assigned to @appel_c

assigned to @appel_c
appel_c (Migrated from gitlab.psi.ch) approved these changes 2025-07-11 15:50:47 +02:00
diaz commented 2025-07-11 15:52:08 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

@appel_c this is set to automerge, we are a bit concerned now... Shall we set it to you merging?

@appel_c this is set to automerge, we are a bit concerned now... Shall we set it to you merging?
appel_c commented 2025-07-11 15:56:42 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked this merge request as draft

marked this merge request as **draft**
appel_c commented 2025-07-11 15:58:34 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

If you click the button, then it would merge. I typically create a merge request, but I check the checkbox for _mark as draft _, please check screenshot.

Screenshot_2025-07-11_at_15.57.50

If you click the button, then it would merge. I typically create a merge request, but I check the checkbox for _mark as draft _, please check screenshot. ![Screenshot_2025-07-11_at_15.57.50](/uploads/e5bcad2f373085ded1979d9474f01efe/Screenshot_2025-07-11_at_15.57.50.png)
diaz commented 2025-07-15 15:32:28 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • a4aa1da5 - add xbpm1 current monitors and fix X12SA-UIND in idgap

Compare with previous version

added 1 commit <ul><li>a4aa1da5 - add xbpm1 current monitors and fix X12SA-UIND in idgap</li></ul> [Compare with previous version](/bec/csaxs_bec/-/merge_requests/74/diffs?diff_id=46370&start_sha=f332e0624062cbddec2843a8670017ff85d09089)
diaz commented 2025-07-15 15:35:49 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked this merge request as ready

marked this merge request as **ready**
diaz commented 2025-07-15 15:39:52 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

@appel_c We are ready to merge this now. Today we tested that the xbpm1x moved (it was close to a limit on Friday) and it moved well. Then we corrected the X12SA-UIND channel name for the idgap. Finally we added counters for the XBPM1 in the frontend and we checked that the counts are read correctly. We further tested a scan moving the XBPM1 and monitoring the current values. We are very happy.

@appel_c We are ready to merge this now. Today we tested that the xbpm1x moved (it was close to a limit on Friday) and it moved well. Then we corrected the X12SA-UIND channel name for the idgap. Finally we added counters for the XBPM1 in the frontend and we checked that the counts are read correctly. We further tested a scan moving the XBPM1 and monitoring the current values. We are very happy.
diaz commented 2025-07-15 15:42:37 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked this merge request as draft

marked this merge request as **draft**
diaz commented 2025-07-15 16:56:40 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • 53d1798c - feat: added xbpm device and added in config

Compare with previous version

added 1 commit <ul><li>53d1798c - feat: added xbpm device and added in config</li></ul> [Compare with previous version](/bec/csaxs_bec/-/merge_requests/74/diffs?diff_id=46372&start_sha=a4aa1da5ddc51e501703dc30ab4cecce58263d27)
wakonig_k commented 2025-07-15 17:02:49 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • 44a4dfc8 - add comments to mark devices as deprecated

Compare with previous version

added 1 commit <ul><li>44a4dfc8 - add comments to mark devices as deprecated</li></ul> [Compare with previous version](/bec/csaxs_bec/-/merge_requests/74/diffs?diff_id=46374&start_sha=53d1798c84fc6de4c36ac5b9193ba124de739ece)
diaz commented 2025-07-15 17:03:23 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked this merge request as ready

marked this merge request as **ready**
appel_c commented 2025-07-15 17:32:34 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

Probably good to use SignalRO

Probably good to use SignalRO
appel_c commented 2025-07-15 17:32:34 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

protected name sum, maybe use a different name

protected name sum, maybe use a different name
appel_c commented 2025-07-15 17:32:34 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

@wakonig_k just 2 minor comments

@wakonig_k just 2 minor comments
appel_c commented 2025-07-15 17:32:34 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

requested changes

requested changes
appel_c commented 2025-07-15 17:33:13 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

assigned to @wakonig_k

assigned to @wakonig_k
wakonig_k commented 2025-07-15 17:37:11 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

no, your linter is just fooling you. sum as a class attribute is not protected. But if you have a suggestion for a better name, I don't object ;)

no, your linter is just fooling you. sum as a class attribute is not protected. But if you have a suggestion for a better name, I don't object ;)
wakonig_k commented 2025-07-15 17:39:15 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

doesn't make a difference... The write access is anyway set to false. But we can try it next time we are at the beamline. I will not push it now without validation at the beamline.

doesn't make a difference... The write access is anyway set to false. But we can try it next time we are at the beamline. I will not push it now without validation at the beamline.
appel_c commented 2025-07-15 19:06:10 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

fu linter :)

fu linter :)
appel_c commented 2025-07-15 19:06:38 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

I see, missed that in the initial!

I see, missed that in the initial!
appel_c commented 2025-07-15 19:06:54 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

should we merge this? @diaz

should we merge this? @diaz
appel_c commented 2025-07-15 19:07:02 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

requested review from @menzel and @diaz

requested review from @menzel and @diaz
diaz commented 2025-07-15 20:01:14 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

Oh I reallized now that there were some errors in the checks, I cannot comment on that...

Oh I reallized now that there were some errors in the checks, I cannot comment on that...
appel_c commented 2025-07-16 10:19:17 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

resolved all threads

resolved all threads
appel_c commented 2025-07-16 10:19:37 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

approved this merge request

approved this merge request
appel_c (Migrated from gitlab.psi.ch) merged commit into main 2025-07-16 10:19:45 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
appel_c
Labels
Clear labels
issue::not confirmed
Used if an issue has not yet been confirmed by a developer
 issue::not reproducible
Used if an issue is not reproducible
 issue::reproducible
Used if a developer was able to reproduce the issue
 priority::critical
Should be done as soon as possible
 priority::needed
An important update to the code base
 priority::nice to have
Not really needed but a good improvement
 scope::backend
An issue regarding the backend services
 scope::frontend
An issue regarding the user-facing services
 stage::in development
This issue is currently being worked on
 stage::on hold
Something is blocking the development
 stage::pre_release
For issues that have been merged into a pre-release branch and are waiting for their release.
stage::ready for review
For issues that have been resolved and are ready for review
 stage::selected for development
This issue has been selected for development but has not been scheduled yet
 stage::weekly backlog
This issue has been selected for development for the next development cycle
 type::bug
It's a bug!
 type::discussion
A discussion is wanted/needed
 type::doc
Improvements to the documentation
 type::feature
A new feature
 type::improvement
Neither a feature nor a bug but an improvement to the code base
 type::test
Missing tests or improvements to the test suite
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
acerbo_a appel_c bec_bl_push-gitea bec-gitea celcer_t debenjak_l diaz divall_e guizar_m holler lombosi_c menzel perl_d stubbs_s usov_i wakonig_k wang_x1 wyzula_j zamofing_t
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: bec/csaxs_bec#86
Delete Branch "feat/add_xbpm_counter"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?