Skip to content

Actions: toastisme/dials

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflicts.yml
118 workflow runs
118 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Added wavelength residual column in output. identify merge conflicts #276: Commit e59f823 pushed by toastisme
March 27, 2024 09:06 11s tof_indexing_refinement
tof_indexing_refinement
March 27, 2024 09:06 11s
Add missing export for laue ray predictor. Add missing include. Fix t… identify merge conflicts #275: Commit 647a1a7 pushed by toastisme
March 21, 2024 16:16 12s tof_indexing_refinement
tof_indexing_refinement
March 21, 2024 16:16 12s
Added LauePredictionParameterisation identify merge conflicts #274: Commit 89fa4bf pushed by toastisme
March 20, 2024 16:02 13s tof_indexing_refinement
tof_indexing_refinement
March 20, 2024 16:02 13s
Add LaueExperimentPredictor, TOFExperimentPredictor, LaueRayPredictor identify merge conflicts #273: Commit 8914057 pushed by toastisme
March 20, 2024 15:26 21s tof_indexing_refinement
tof_indexing_refinement
March 20, 2024 15:26 21s
Add additional columns to refinement reflections. identify merge conflicts #272: Commit b85fec4 pushed by toastisme
March 20, 2024 13:31 14s tof_indexing_refinement
tof_indexing_refinement
March 20, 2024 13:31 14s
Enabled find_max_cell to work with tof data. identify merge conflicts #271: Commit 63e8028 pushed by toastisme
March 19, 2024 12:15 18s tof_indexing_refinement
tof_indexing_refinement
March 19, 2024 12:15 18s
Merge pull request #49 from toastisme/fix_show_for_tof identify merge conflicts #270: Commit 3e4a2c4 pushed by toastisme
March 18, 2024 10:23 9s main
main
March 18, 2024 10:23 9s
Fixed errors when using dials.show for tof data. identify merge conflicts #269: Commit 206f446 pushed by toastisme
March 18, 2024 10:22 17s fix_show_for_tof
fix_show_for_tof
March 18, 2024 10:22 17s
Merge pull request #48 from toastisme/update_weighting_strategy identify merge conflicts #268: Commit 3be8b71 pushed by toastisme
March 15, 2024 14:10 11s main
main
March 15, 2024 14:10 11s
Updated weighting strategy after looking at more datasets. identify merge conflicts #267: Commit 936b363 pushed by toastisme
March 15, 2024 14:01 11s update_weighting_strategy
update_weighting_strategy
March 15, 2024 14:01 11s
Merge pull request #47 from toastisme/tof_outlier_rejection identify merge conflicts #266: Commit e14b321 pushed by toastisme
March 13, 2024 16:23 20s main
main
March 13, 2024 16:23 20s
Change default outlier rejection for tof data during refinement to mcd. identify merge conflicts #265: Commit 926324b pushed by toastisme
March 13, 2024 16:22 15s tof_outlier_rejection
tof_outlier_rejection
March 13, 2024 16:22 15s
Merge pull request #46 from toastisme/tof_integrate_remove_shoeboxes identify merge conflicts #264: Commit 6c72aa7 pushed by toastisme
March 11, 2024 14:52 11s main
main
March 11, 2024 14:52 11s
Remove reflection shoeboxes by default after integrating. identify merge conflicts #263: Commit 5f226b9 pushed by toastisme
March 11, 2024 14:51 11s tof_integrate_remove_shoeboxes
tof_integrate_remove_shoeboxes
March 11, 2024 14:51 11s
Merge pull request #45 from toastisme/tof_integrate_prf_guard identify merge conflicts #262: Commit 22fa15c pushed by toastisme
March 11, 2024 13:47 19s main
main
March 11, 2024 13:47 19s
Added guard to avoid writing prf intensities if they have not been ca… identify merge conflicts #261: Commit 73fe405 pushed by toastisme
March 11, 2024 13:46 15s tof_integrate_prf_guard
tof_integrate_prf_guard
March 11, 2024 13:46 15s
update unix-build-cmake.yml to use dxtbx branch. identify merge conflicts #260: Commit 9af0820 pushed by toastisme
March 6, 2024 10:33 13s use_experiment_type
use_experiment_type
March 6, 2024 10:33 13s
Rename newsfragments/XXX.misc to newsfragments/2627.misc identify merge conflicts #259: Commit 6392981 pushed by DiamondLightSource-build-server
March 5, 2024 15:26 11s use_experiment_type
use_experiment_type
March 5, 2024 15:26 11s
Remove references to Experiment.is_still() and Experiments.all_sequen… identify merge conflicts #258: Commit f25b2db pushed by toastisme
March 5, 2024 15:14 13s use_experiment_type
use_experiment_type
March 5, 2024 15:14 13s
Rename newsfragments/XXX.misc to newsfragments/2626.misc identify merge conflicts #257: Commit aaea896 pushed by DiamondLightSource-build-server
March 4, 2024 13:28 14s filter_reflections_by_tof_range
filter_reflections_by_tof_range
March 4, 2024 13:28 14s
Added filter to TOFSpotFinder._post_process to filter reflections out… identify merge conflicts #256: Commit 1646a43 pushed by toastisme
March 4, 2024 13:25 11s filter_reflections_by_tof_range
filter_reflections_by_tof_range
March 4, 2024 13:25 11s
Added guards for Scans being None. identify merge conflicts #255: Commit 2f6d79b pushed by toastisme
March 1, 2024 09:53 23s add_tof_spotfinding
add_tof_spotfinding
March 1, 2024 09:53 23s
Merge pull request #44 from toastisme/tof_integrate_profile_fitting_d… identify merge conflicts #254: Commit 9bb345d pushed by toastisme
February 26, 2024 09:47 12s main
main
February 26, 2024 09:47 12s
Only calculate integration via summation for tof data by default. identify merge conflicts #253: Commit f6ba5c8 pushed by toastisme
February 26, 2024 09:46 11s tof_integrate_profile_fitting_defaults
tof_integrate_profile_fitting_defaults
February 26, 2024 09:46 11s
Merge pull request #43 from toastisme/filter_nearby_tof_spots identify merge conflicts #252: Commit 61ea044 pushed by toastisme
February 22, 2024 15:02 11s main
main
February 22, 2024 15:02 11s