Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

315 split fgs communicator #357

Merged
merged 38 commits into from
Nov 21, 2022
Merged

315 split fgs communicator #357

merged 38 commits into from
Nov 21, 2022

Commits on Nov 15, 2022

  1. #315 move external interactions to submodule

    @dperl-dls
    dperl-dls committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    ee25e37 View commit details
    Browse the repository at this point in the history

  2. #315 rename fgs_communicator

    @dperl-dls
    dperl-dls committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    a9273ea View commit details
    Browse the repository at this point in the history

  3. #315 separate out nexus writing

    @dperl-dls
    dperl-dls committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    545378d View commit details
    Browse the repository at this point in the history

  4. #315 add collection for communication classes

    @dperl-dls
    dperl-dls committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    ef874a0 View commit details
    Browse the repository at this point in the history

  5. #315 tidy and adjust tests

    @dperl-dls
    dperl-dls committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    9254327 View commit details
    Browse the repository at this point in the history

  6. fix mypy error

    @dperl-dls
    dperl-dls committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    3d06671 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. #315 split up ispyb and zocalo

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    3ad1289 View commit details
    Browse the repository at this point in the history

  2. #315 split up ispyb and zocalo

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    2a2d432 View commit details
    Browse the repository at this point in the history

  3. #315 connect ispyb and zocalo handlers

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    84ec38e View commit details
    Browse the repository at this point in the history

  4. #315 rearrange tests and update names

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    69c90bd View commit details
    Browse the repository at this point in the history

  5. #315 fix imports and tests

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    47d9a8b View commit details
    Browse the repository at this point in the history

  6. fix test

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    3c94e00 View commit details
    Browse the repository at this point in the history

  7. #315 fix test data handling

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    88594ec View commit details
    Browse the repository at this point in the history

  8. #fix test data handling

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    9d8c745 View commit details
    Browse the repository at this point in the history

  9. don't use dataclass

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    0a9d571 View commit details
    Browse the repository at this point in the history

  10. set zocalo env to dev

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    5eee253 View commit details
    Browse the repository at this point in the history

  11. tidy plan

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    a10f4dd View commit details
    Browse the repository at this point in the history

  12. tidy tests

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    b579971 View commit details
    Browse the repository at this point in the history

  13. add ispyb exception

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    c842fe2 View commit details
    Browse the repository at this point in the history

  14. #315 add test for callback collection order

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    4bdd4cd View commit details
    Browse the repository at this point in the history

  15. #315 add docstring and comment

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    ffafa8a View commit details
    Browse the repository at this point in the history

  16. fix zocalo interaction test

    @dperl-dls
    dperl-dls committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    13777ee View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2022

  1. Merge main into 315 

    and add changes from test_fgs_communicator
to appropriate individual callback test files

Squashed commit of the following:

commit 59739c2
Merge: 0a0c534 67c49cc
Author: David Perl <[email protected]>
Date:   Fri Nov 18 11:31:31 2022 +0000

    Merge pull request #371 from DiamondLightSource/353_merge_smargons

commit 67c49cc
Author: Dominic Oram <[email protected]>
Date:   Fri Nov 18 11:23:07 2022 +0000

    (#353) Merged smargons into one

commit 0a0c534
Merge: 8b58b3d 0172183
Author: Dominic Oram <[email protected]>
Date:   Thu Nov 17 15:40:52 2022 +0000

    Merge pull request #362 from DiamondLightSource/361_default_interpreter

    (#361) updating default python interpreter

commit 8b58b3d
Merge: b65f8f0 4f2de21
Author: Dominic Oram <[email protected]>
Date:   Thu Nov 17 15:17:35 2022 +0000

    Merge pull request #347 from DiamondLightSource/231_adjust_zocalo_coords

commit 0172183
Author: Neil.Smith <[email protected]>
Date:   Thu Nov 17 14:56:51 2022 +0000

    (#361) updating default python interpreter

commit 4f2de21
Author: David Perl <[email protected]>
Date:   Thu Nov 17 14:44:58 2022 +0000

commit b65f8f0
Merge: 2bb56e8 9c2d58d
Author: Dominic Oram <[email protected]>
Date:   Thu Nov 17 13:54:07 2022 +0000

    Merge pull request #360 from DiamondLightSource/344_update_nexgen

    344 update nexgen

commit 9c2d58d
Author: David Perl <[email protected]>
Date:   Thu Nov 17 11:58:02 2022 +0000

commit 0baf4f4
Author: David Perl <[email protected]>
Date:   Thu Nov 17 11:53:33 2022 +0000

commit 0e27def
Author: David Perl <[email protected]>
Date:   Thu Nov 17 11:51:59 2022 +0000

commit 2c8d12e
Author: David Perl <[email protected]>
Date:   Thu Nov 17 09:59:01 2022 +0000

commit a7f94b7
Author: David Perl <[email protected]>
Date:   Fri Nov 11 14:44:37 2022 +0000

commit a5896ab
Author: David Perl <[email protected]>
Date:   Fri Nov 11 14:40:37 2022 +0000

    and update tests to match
    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    dcb4316 View commit details
    Browse the repository at this point in the history

  2. #315 fix test

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    c1bb0a9 View commit details
    Browse the repository at this point in the history

  3. #315 delete empy testdata

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    45e7fed View commit details
    Browse the repository at this point in the history

  4. #315 move zocalo to external interaction folder

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    8fc2f8a View commit details
    Browse the repository at this point in the history

  5. #315 improve docstrings

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    28cf1d0 View commit details
    Browse the repository at this point in the history

  6. dont store whole params in zocalo handler

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    eab9f2b View commit details
    Browse the repository at this point in the history

  7. #315 check event name before triggering zocalo

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    308165c View commit details
    Browse the repository at this point in the history

  8. #315 fix checking event name

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    318c96d View commit details
    Browse the repository at this point in the history

  9. #315 add init docstring

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    0a350a3 View commit details
    Browse the repository at this point in the history

  10. #315 update comments

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    39da3a4 View commit details
    Browse the repository at this point in the history

  11. #315 fix comments

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    c50da32 View commit details
    Browse the repository at this point in the history

  12. small fixes

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    650e42d View commit details
    Browse the repository at this point in the history

  13. fix tests

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    4c0f26b View commit details
    Browse the repository at this point in the history

  14. #315 improve tests

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    868bb77 View commit details
    Browse the repository at this point in the history

  15. #315 improve tests

    @dperl-dls
    dperl-dls committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    2b82e83 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2022

  1. Merge branch 'main' into 315_split_fgs_communicator

    @DominicOram
    DominicOram committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    f3c1fdf View commit details
    Browse the repository at this point in the history