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

Add initial optics hutch config #81

Merged
appel_c merged 5 commits from feat/add_config_for_monochromator into main 2025-07-04 16:57:33 +02:00
Conversation 27 Commits 5 Files Changed 1 +154
appel_c commented 2025-06-27 16:24:06 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

Summary

This is an initial commit for the cSAXS optics hutch config. Motors are still read_only, motion has to be tested first. So far only DMM1 crystal , rotation Y translation X & Y have been added. Once crystal DMM2 is added, and motion is tested, the config can be merged

TODO

  • add motors for DMM2 crystal
  • test motion for both crystals
  • remove readOnly flag in config after motion is tested
# Summary This is an initial commit for the cSAXS optics hutch config. Motors are still read_only, motion has to be tested first. So far only DMM1 crystal , rotation Y translation X & Y have been added. Once crystal DMM2 is added, and motion is tested, the config can be merged # TODO - [x] add motors for DMM2 crystal - [x] test motion for both crystals - [x] remove readOnly flag in config after motion is tested
appel_c commented 2025-06-27 16:24:06 +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-06-27 16:24:06 +02:00
appel_c commented 2025-06-27 16:24:17 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

changed the description

changed the description
appel_c commented 2025-06-27 16:25:21 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

changed the description

changed the description
appel_c commented 2025-06-27 16:25:21 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

requested review from @diaz

requested review from @diaz
appel_c commented 2025-06-27 16:25:24 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked the checklist item add motors for DMM2 crystal as completed

marked the checklist item **add motors for DMM2 crystal** as completed
appel_c commented 2025-06-27 16:25:25 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked the checklist item add motors for DMM2 crystal as incomplete

marked the checklist item **add motors for DMM2 crystal** as incomplete
appel_c commented 2025-06-27 16:25:50 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked the checklist item add motors for DMM2 crystal as completed

marked the checklist item **add motors for DMM2 crystal** as completed
appel_c commented 2025-06-27 16:25:51 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked the checklist item add motors for DMM2 crystal as incomplete

marked the checklist item **add motors for DMM2 crystal** as incomplete
appel_c commented 2025-06-27 16:25:53 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked the checklist item add motors for DMM2 crystal as completed

marked the checklist item **add motors for DMM2 crystal** as completed
appel_c commented 2025-06-27 16:25:56 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked the checklist item add motors for DMM2 crystal as incomplete

marked the checklist item **add motors for DMM2 crystal** as incomplete
diaz commented 2025-07-01 11:39:22 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked the checklist item add motors for DMM2 crystal as completed

marked the checklist item **add motors for DMM2 crystal** as completed
diaz commented 2025-07-01 14:47:21 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • fad46111 - set readOnly to false for DMM motors and correct description

Compare with previous version

added 1 commit <ul><li>fad46111 - set readOnly to false for DMM motors and correct description</li></ul> [Compare with previous version](/bec/csaxs_bec/-/merge_requests/69/diffs?diff_id=46199&start_sha=c51379a2ccc93c199e88b5cbb4f3fe0a9ec3a51b)
diaz commented 2025-07-04 14:25:19 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked the checklist item test motion for both crystals as completed

marked the checklist item **test motion for both crystals** as completed
diaz commented 2025-07-04 14:25:23 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked the checklist item remove readOnly flag in config after motion is tested as completed

marked the checklist item **remove readOnly flag in config after motion is tested** as completed
diaz commented 2025-07-04 14:29:49 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • 8ca1f00d - add channel-cut motors and change motor names to shorter names

Compare with previous version

added 1 commit <ul><li>8ca1f00d - add channel-cut motors and change motor names to shorter names</li></ul> [Compare with previous version](/bec/csaxs_bec/-/merge_requests/69/diffs?diff_id=46232&start_sha=fad46111444e074135563be8a69cca343c93a3ee)
diaz commented 2025-07-04 15:27:24 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • e9fc6930 - add and test smaract stages inside OPbox

Compare with previous version

added 1 commit <ul><li>e9fc6930 - add and test smaract stages inside OPbox</li></ul> [Compare with previous version](/bec/csaxs_bec/-/merge_requests/69/diffs?diff_id=46234&start_sha=8ca1f00d1cb6583d254dd5b515bdbf02dd477c9a)
diaz commented 2025-07-04 15:32:43 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • 66622fd7 - change cu_foilx motor name to lower case c

Compare with previous version

added 1 commit <ul><li>66622fd7 - change cu_foilx motor name to lower case c</li></ul> [Compare with previous version](/bec/csaxs_bec/-/merge_requests/69/diffs?diff_id=46236&start_sha=e9fc6930fffd90dc979128fb6a675309c71e69ff)
diaz commented 2025-07-04 15:35:28 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

@appel_c I think we can merge this now. We have fulfilled all the items in the TODO list, and we have further added and tested the Smaract stages in the OPbox. We will for sure add more elements to this config file, but the one which we have now should go to main.

@appel_c I think we can merge this now. We have fulfilled all the items in the TODO list, and we have further added and tested the Smaract stages in the OPbox. We will for sure add more elements to this config file, but the one which we have now should go to main.
appel_c commented 2025-07-04 15:49:57 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

approved this merge request

approved this merge request
appel_c commented 2025-07-04 15:50:40 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

keep or remove? @diaz

keep or remove? @diaz
appel_c commented 2025-07-04 15:51:23 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

these are temporary? SO no tags?

these are temporary? SO no tags?
diaz commented 2025-07-04 15:54:03 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

Some of the Smaract stages will remain there, some are temporary. But we can treat them all as the current stages in the optics hutch. I can add cSAXS and optics as tags for all of them, if you prefer

Some of the Smaract stages will remain there, some are temporary. But we can treat them all as the current stages in the optics hutch. I can add cSAXS and optics as tags for all of them, if you prefer
diaz commented 2025-07-04 15:54:36 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

What do you mean? Keep or remove what?

What do you mean? Keep or remove what?
diaz commented 2025-07-04 15:58:19 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

What does the tag "optics" mean anyway? That the device is in the optics hutch? We shoudl then probably change it to "optics hutch" or "optics_hutch", if a single word is required

What does the tag "optics" mean anyway? That the device is in the optics hutch? We shoudl then probably change it to "optics hutch" or "optics_hutch", if a single word is required
appel_c commented 2025-07-04 16:37:15 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

resolved all threads

resolved all threads
appel_c (Migrated from gitlab.psi.ch) scheduled this pull request to auto merge when all checks succeed 2025-07-04 16:37:18 +02:00
appel_c commented 2025-07-04 16:57:32 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked this merge request as ready

marked this merge request as **ready**
appel_c (Migrated from gitlab.psi.ch) merged commit into main 2025-07-04 16:57:33 +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#81
Delete Branch "feat/add_config_for_monochromator"

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?