bec/debye_bec
0
0
Fork 0
Code Issues 9 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge feature branch of Debye back to main #51

Merged
appel_c merged 31 commits from resolve_mr_conflict into main 2025-05-07 13:42:11 +02:00
Conversation 30 Commits 31 Files Changed 32 +3272 -2508
appel_c commented 2025-05-05 18:05:38 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

Summary

MR with various online changes and developments in the weeks preparing for the first commissioning with beam. Before merging to main, the code should be tested at the beamline.

closes #11 #9 #8 #5

TODO

  • Fix occasional error upon calling stage after restarting the server. #10
  • Investigate whether complete method logic is now properly implemented #3
  • Plotting of multiple channels from NIDAQ is tackled in BECWidgets MR -> https://gitlab.psi.ch/bec/bec_widgets/-/merge_requests/507
  • Test codes at the beamline, scheduled for Wednesday 7th.
  • Create issue for adding tests after merge to main. --> #15

Note:
Extra tests should be added later on to ensure functionality of integrations and scans.

## Summary MR with various online changes and developments in the weeks preparing for the first commissioning with beam. Before merging to main, the code should be tested at the beamline. closes #11 #9 #8 #5 ## TODO - [x] Fix occasional error upon calling stage after restarting the server. #10 - [x] Investigate whether complete method logic is now properly implemented #3 - [x] Plotting of multiple channels from NIDAQ is tackled in BECWidgets MR -> https://gitlab.psi.ch/bec/bec_widgets/-/merge_requests/507 - [x] Test codes at the beamline, scheduled for Wednesday 7th. - [x] Create issue for adding tests after merge to main. --> #15 Note: Extra tests should be added later on to ensure functionality of integrations and scans.
appel_c commented 2025-05-05 18:05:38 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

assigned to @appel_c

assigned to @appel_c
wakonig_k (Migrated from gitlab.psi.ch) approved these changes 2025-05-05 18:05:38 +02:00
appel_c commented 2025-05-05 18:11:37 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

changed the description

changed the description
appel_c commented 2025-05-05 18:11:37 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

requested review from @wakonig_k and @clark_a

requested review from @wakonig_k and @clark_a
appel_c commented 2025-05-06 11:19:21 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • 6ab1a294 - fix: fix typo in device config mo1_bragg

Compare with previous version

added 1 commit <ul><li>6ab1a294 - fix: fix typo in device config mo1_bragg</li></ul> [Compare with previous version](/bec/debye_bec/-/merge_requests/28/diffs?diff_id=44904&start_sha=b8a050c42489cb2f8a2dddbdff984b2ec3fd4ac7)
appel_c commented 2025-05-06 16:26:31 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • 03e3b1c6 - fix: fix imports in basler_cam

Compare with previous version

added 1 commit <ul><li>03e3b1c6 - fix: fix imports in basler_cam</li></ul> [Compare with previous version](/bec/debye_bec/-/merge_requests/28/diffs?diff_id=44946&start_sha=6ab1a2941c3f19d17c4164f5cdfd376b5197e20b)
appel_c commented 2025-05-07 11:17:23 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • 32e24cd9 - fix: fix occasional crash of mo1_bragg for scan; closes #11

Compare with previous version

added 1 commit <ul><li>32e24cd9 - fix: fix occasional crash of mo1_bragg for scan; closes #11</li></ul> [Compare with previous version](/bec/debye_bec/-/merge_requests/28/diffs?diff_id=44989&start_sha=03e3b1c605d38e14258190a47c39291907c7c022)
appel_c commented 2025-05-07 12:40:35 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 4 commits

  • 24d81bb1 - build: update black dependency to ~=25.0
  • 002a3323 - fix(ion-chambers): fix ion chamber code at beamline
  • 31ff2823 - fix: update config, remove cameras for the moment
  • 7b7a24b6 - refactor: formatting

Compare with previous version

added 4 commits <ul><li>24d81bb1 - build: update black dependency to ~=25.0</li><li>002a3323 - fix(ion-chambers): fix ion chamber code at beamline</li><li>31ff2823 - fix: update config, remove cameras for the moment</li><li>7b7a24b6 - refactor: formatting</li></ul> [Compare with previous version](/bec/debye_bec/-/merge_requests/28/diffs?diff_id=44991&start_sha=32e24cd92a5d90f3fb67a80715a43036ac310ba4)
appel_c commented 2025-05-07 12:41:09 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked the checklist item Fix occasional error upon calling stage after restarting the server. #10 as completed

marked the checklist item **Fix occasional error upon calling stage after restarting the server. #10** as completed
appel_c commented 2025-05-07 12:41:25 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked the checklist item Investigate whether complete method logic is now properly implemented #3 as completed

marked the checklist item **Investigate whether complete method logic is now properly implemented #3** as completed
appel_c commented 2025-05-07 12:41:28 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked the checklist item Test codes at the beamline, scheduled for Wednesday 7th. as completed

marked the checklist item **Test codes at the beamline, scheduled for Wednesday 7th.** as completed
appel_c commented 2025-05-07 12:43:09 +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-05-07 12:43:09 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

changed title from {-Draft: Resolve mr conflict-} to {+Merge feature branch of Debye back to main+}

changed title from **{-Draft: Resolve mr conflict-}** to **{+Merge feature branch of Debye back to main+}**
appel_c commented 2025-05-07 12:43:09 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

changed the description

changed the description
appel_c commented 2025-05-07 12:52:53 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>74e0b01b - fix: temporary comment, issue created #16</li></ul> [Compare with previous version](/bec/debye_bec/-/merge_requests/28/diffs?diff_id=44995&start_sha=7b7a24b6c89d5d5714f7df142b92ae4184625ceb)
appel_c commented 2025-05-07 13:11:36 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

In addition, this closes #17 .

In addition, this closes #17 .
wakonig_k commented 2025-05-07 13:13:00 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

this will never be the case, no?

I think you want

if not (0 < conc1 < 100)

same for all the following checks

this will never be the case, no? I think you want ``` if not (0 < conc1 < 100) ``` same for all the following checks
wakonig_k commented 2025-05-07 13:13:00 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

I'd suggest to use the same kind of checks for all ranges, just for consistency

I'd suggest to use the same kind of checks for all ranges, just for consistency
wakonig_k commented 2025-05-07 13:13:00 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

we should probably add all the boilerplate code for PSIDeviceBase. But this can also be done in another MR

we should probably add all the boilerplate code for PSIDeviceBase. But this can also be done in another MR
wakonig_k commented 2025-05-07 13:13:00 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

Looks good at first glance!

Looks good at first glance!
appel_c commented 2025-05-07 13:18:40 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

Yeah, agreed. This should be in the template! I fix the things above!

Yeah, agreed. This should be in the template! I fix the things above!
appel_c commented 2025-05-07 13:25:39 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

changed this line in version 7 of the diff

changed this line in [version 7 of the diff](/bec/debye_bec/-/merge_requests/28/diffs?diff_id=45005&start_sha=74e0b01b021db4b4c5b080730867bba35d3f6199#fd890d05009bd2400cbb4ad48decdcfa07d0c665_259_259)
appel_c commented 2025-05-07 13:25:39 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • d20d3b14 - fix: fix range checks in Mo1Bragg and IonizationChamber

Compare with previous version

added 1 commit <ul><li>d20d3b14 - fix: fix range checks in Mo1Bragg and IonizationChamber</li></ul> [Compare with previous version](/bec/debye_bec/-/merge_requests/28/diffs?diff_id=45005&start_sha=74e0b01b021db4b4c5b080730867bba35d3f6199)
appel_c commented 2025-05-07 13:27:07 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

resolved all threads

resolved all threads
appel_c commented 2025-05-07 13:32:46 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • 1fc5fe15 - fix: fix range checks in Mo1Bragg and IonizationChamber

Compare with previous version

added 1 commit <ul><li>1fc5fe15 - fix: fix range checks in Mo1Bragg and IonizationChamber</li></ul> [Compare with previous version](/bec/debye_bec/-/merge_requests/28/diffs?diff_id=45007&start_sha=d20d3b14e554b3942dfa9ed794dd5db433f8d14f)
appel_c commented 2025-05-07 13:38:50 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

changed this line in version 9 of the diff

changed this line in [version 9 of the diff](/bec/debye_bec/-/merge_requests/28/diffs?diff_id=45009&start_sha=1fc5fe154d41b10696006c64088664a2294caf22#0073972e3c8e808dd5624171b499bed97e4c4f34_45_45)
appel_c commented 2025-05-07 13:38:51 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 1 commit

  • b03b90a8 - fix: fix range checks in Mo1Bragg and IonizationChamber

Compare with previous version

added 1 commit <ul><li>b03b90a8 - fix: fix range checks in Mo1Bragg and IonizationChamber</li></ul> [Compare with previous version](/bec/debye_bec/-/merge_requests/28/diffs?diff_id=45009&start_sha=1fc5fe154d41b10696006c64088664a2294caf22)
wakonig_k commented 2025-05-07 13:40:45 +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-05-07 13:42:12 +02:00
appel_c commented 2025-05-07 13:52:21 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

mentioned in issue #17

mentioned in issue #17
appel_c commented 2025-05-07 13:52:41 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

mentioned in issue #10

mentioned in issue #10
Sign in to join this conversation.
Reviewers
No Reviewers
wakonig_k
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 clark_a debenjak_l divall_e hitz_s lombosi_c nachtegaal perl_d tiefenbacher_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/debye_bec#51
Delete Branch "resolve_mr_conflict"

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?