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 filter or nearby spots for ToF data. identify merge conflicts #251: Commit 080bda8 pushed by toastisme
February 22, 2024 14:59 12s filter_nearby_tof_spots
filter_nearby_tof_spots
February 22, 2024 14:59 12s
Rename newsfragments/XXX.misc to newsfragments/2603.misc identify merge conflicts #250: Commit d45d798 pushed by DiamondLightSource-build-server
February 7, 2024 16:10 14s remove_unit_from_indexed_column
remove_unit_from_indexed_column
February 7, 2024 16:10 14s
Removed % from % indexed column. identify merge conflicts #249: Commit f1faabe pushed by toastisme
February 7, 2024 16:02 12s remove_unit_from_indexed_column
remove_unit_from_indexed_column
February 7, 2024 16:02 12s
Rename newsfragments/XXX.feature to newsfragments/2602.feature identify merge conflicts #248: Commit 611c6ed pushed by DiamondLightSource-build-server
February 7, 2024 15:31 10s add_tof_spotfinding
add_tof_spotfinding
February 7, 2024 15:31 10s
newsfragment identify merge conflicts #247: Commit 91b8501 pushed by toastisme
February 7, 2024 15:27 10s add_tof_spotfinding
add_tof_spotfinding
February 7, 2024 15:27 10s
Added method for correcting time of flight spot centroids. identify merge conflicts #246: Commit 1de2e91 pushed by toastisme
February 7, 2024 11:37 12s add_tof_spotfinding
add_tof_spotfinding
February 7, 2024 11:37 12s
Added _post_process method to SpotFinder. Added TOFSpotFinder. Added … identify merge conflicts #245: Commit c90d6fc pushed by toastisme
February 6, 2024 11:50 10s add_tof_spotfinding
add_tof_spotfinding
February 6, 2024 11:50 10s
Merge pull request #42 from toastisme/remove_hardcoded_params_in_line… identify merge conflicts #244: Commit f5521c7 pushed by toastisme
January 30, 2024 13:59 11s main
main
January 30, 2024 13:59 11s
Removed hardcoded params from line profile. identify merge conflicts #243: Commit 2d0bcd2 pushed by toastisme
January 30, 2024 13:58 15s remove_hardcoded_params_in_line_profile
remove_hardcoded_params_in_line_profile
January 30, 2024 13:58 15s
Merge pull request #41 from toastisme/integration_fixes identify merge conflicts #242: Commit f5f9267 pushed by toastisme
December 15, 2023 00:03 10s main
main
December 15, 2023 00:03 10s
Fixed frame not being in indexed reflections. Fixed dmin being calcul… identify merge conflicts #241: Commit 566f7c3 pushed by toastisme
December 15, 2023 00:02 11s integration_fixes
integration_fixes
December 15, 2023 00:02 11s
Merge pull request #40 from toastisme/tof_mtz identify merge conflicts #240: Commit 6b3ea42 pushed by toastisme
December 14, 2023 15:12 9s main
main
December 14, 2023 15:12 9s
Enabled export mtz for tof data. identify merge conflicts #239: Commit 8e35c8d pushed by toastisme
December 14, 2023 15:10 10s tof_mtz
tof_mtz
December 14, 2023 15:10 10s
Merge pull request #39 from toastisme/remove_s0_from_radial_profile identify merge conflicts #238: Commit eb3646c pushed by toastisme
December 14, 2023 14:45 13s main
main
December 14, 2023 14:45 13s
Remove s0 from radial profile algorithm. identify merge conflicts #237: Commit 72e0daf pushed by toastisme
December 14, 2023 14:44 11s remove_s0_from_radial_profile
remove_s0_from_radial_profile
December 14, 2023 14:44 11s
Merge pull request #38 from toastisme/pixel_lineplot_ix identify merge conflicts #236: Commit a25a530 pushed by toastisme
December 14, 2023 14:18 13s main
main
December 14, 2023 14:18 13s
Fixed pixel line plot requiring idxs reflection column. identify merge conflicts #235: Commit 3ff9c9f pushed by toastisme
December 14, 2023 14:17 13s pixel_lineplot_ix
pixel_lineplot_ix
December 14, 2023 14:17 13s
Merge pull request #37 from toastisme/enable_multiple_tof_orientations identify merge conflicts #234: Commit 2e97283 pushed by toastisme
December 14, 2023 10:22 9s main
main
December 14, 2023 10:22 9s
Added goniometer rotations to ToF workflow. identify merge conflicts #233: Commit 4418bb7 pushed by toastisme
December 14, 2023 10:20 11s enable_multiple_tof_orientations
enable_multiple_tof_orientations
December 14, 2023 10:20 11s
Merge pull request #36 from toastisme/integration_bbox_fix identify merge conflicts #232: Commit fe5884f pushed by Justin-Bergmann
December 13, 2023 14:10 14s main
main
December 13, 2023 14:10 14s
Fixed bounds of calculcated bounding boxes and allowed size of boundi… identify merge conflicts #231: Commit 28fdbef pushed by Justin-Bergmann
December 13, 2023 14:08 11s integration_bbox_fix
integration_bbox_fix
December 13, 2023 14:08 11s
Merge pull request #35 from toastisme/enable_cmake_build identify merge conflicts #230: Commit 2dd121d pushed by toastisme
December 13, 2023 10:18 12s main
main
December 13, 2023 10:18 12s
Changes to allow for CMake build. identify merge conflicts #229: Commit 0a07bac pushed by toastisme
December 13, 2023 10:16 18s enable_cmake_build
enable_cmake_build
December 13, 2023 10:16 18s
Merge pull request #34 from toastisme/integration_improvements identify merge conflicts #228: Commit 6065277 pushed by toastisme
December 6, 2023 15:39 10s main
main
December 6, 2023 15:39 10s
Rewrote Lorentz and spherical absorption corrections in c++. identify merge conflicts #227: Commit 94f52b6 pushed by toastisme
December 6, 2023 15:35 16s integration_improvements
integration_improvements
December 6, 2023 15:35 16s