Skip to content
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

Updated multipeak capabilities (Dev) #22

Merged
merged 23 commits into from
Jan 30, 2024
Merged

Updated multipeak capabilities (Dev) #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
32e350a
Additional documentation for multipeak phasing
jacione Mar 27, 2023
c61905b
Update setup.py
bfrosik Jun 8, 2023
c3574c5
Update meta.yaml
bfrosik Jun 8, 2023
9804dec
Merge remote-tracking branch 'origin/Dev' into main
bfrosik Jun 8, 2023
4217f2c
Refactored get_centered to reduce number of numpy function calls.
jacione Jun 21, 2023
c0bbc2d
Added a bunch of functions to cplib.py
jacione Jun 21, 2023
357c3c4
Get strain from final reconstruction. This commit also contains comme…
jacione Jun 21, 2023
b70c954
Merge remote-tracking branch 'origin/main' into main
jacione Jun 21, 2023
83eb804
Merge pull request #1 from AdvancedPhotonSource/main
jacione Jun 23, 2023
30f8148
Added several new methods to the cohlib signature:
jacione Jun 27, 2023
4683c7e
Merge remote-tracking branch 'origin/main' into main
jacione Jun 27, 2023
e58d0a6
Removed some experimental code that accidentally got included in this…
jacione Jun 27, 2023
e1aef2b
Merge branch 'Dev' into main
bfrosik Jun 28, 2023
cab58fe
Merge branch 'AdvancedPhotonSource:main' into main
jacione Jun 28, 2023
2f73345
assigned release tag
bfrosik Jun 28, 2023
c26231e
fixed doc for developers
bfrosik Jul 18, 2023
f8275ae
fixed crop issue in ui
bfrosik Aug 28, 2023
7e41374
Added the following functions to cplib.py: amin(), affine_transform()…
jacione Jan 24, 2024
3f3cde4
Significant changes that should have been committed earlier:
jacione Jan 24, 2024
617d03f
Merge remote-tracking branch 'origin/main'
jacione Jan 24, 2024
204db14
Merge branch 'AdvancedPhotonSource:main' into main
jacione Jan 24, 2024
ccb14f2
Fixed compatibility issues with Dev branch
jacione Jan 30, 2024
b8f3070
Merging commits from bfrosik
jacione Jan 30, 2024
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
1 change: 0 additions & 1 deletion cohere-ui
Open in desktop
Submodule cohere-ui deleted from b99d9c
4 changes: 4 additions & 0 deletions cohere_core/controller/op_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,10 @@ def get_flow_arr(params, flow_items_list, curr_gen=None, first_run=False):
if 'progress_trigger' in params:
flow_arr[i] = trigger_row(params['progress_trigger'], iter_no)
flow_arr[i][-1] = 1
elif flow_item == "switch_resampling":
if 'switch_resamp_trigger' in params:
flow_arr[i] = trigger_row(params['switch_resamp_trigger'], iter_no)
flow_arr[i][-1] = 1
elif flow_item == 'switch_peaks':
if 'switch_peak_trigger' in params:
flow_arr[i] = trigger_row(params['switch_peak_trigger'], iter_no)
Expand Down
Loading