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.

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

Merging multipeak updates with new preprocessing pipeline #17

Merged
merged 28 commits into from
Jul 11, 2024

Conversation

jacione
Copy link
Contributor

@jacione jacione commented Jul 10, 2024

This brings the multipeak changes I've made into agreement with your new preprocessing pipeline (which I love, by the way!)

jacione and others added 28 commits March 27, 2023 14:06
Make sure the results get saved in the right place, etc.
…have detectable signal in reciprocal space, but were beyond the scan range in one or more dimensions.
Conflicts:
	cohere-scripts/beamlines/aps_34idc/beam_stuff.py
	cohere-scripts/multipeak.py
# Conflicts:
#	cohere-scripts/multipeak.py
# Conflicts:
#	cohere-scripts/beamline_visualization.py
#	cohere-scripts/multipeak.py
#	cohere-scripts/prep_helper.py
#	cohere-scripts/standard_preprocess.py
…rectory.

It was trying to save to exp_dir/results_phasing/results_viz, when it should have been saving to exp_dir/results_viz
- Changed the rs_voxel_size to be the mean of the three dimensions, rather than the maximum.
- Changed the ds_voxel_size to be defined by the final (resampled) image size rather than the initial (measured) image size.
# Conflicts:
#	cohere-scripts/multipeak.py
#	cohere-scripts/prep_helper.py
#	cohere-scripts/run_reconstruction.py
@bfrosik bfrosik merged commit a922f43 into AdvancedPhotonSource:Dev Jul 11, 2024
@jacione jacione deleted the Dev branch September 27, 2024 20:09
@jacione jacione restored the Dev branch September 27, 2024 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants