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

Jump to bottom

Qs rebase #40

Open
wants to merge 67 commits into
base: main
Choose a base branch
from
Open

Qs rebase #40

wants to merge 67 commits into from

Commits on Dec 12, 2023

  1. improve logging code

    @gwbischof @tacaswell
    gwbischof authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    0df17fa View commit details
    Browse the repository at this point in the history

  2. Update ci to test latest environment

    @AbbyGi @tacaswell
    AbbyGi authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    09d9261 View commit details
    Browse the repository at this point in the history

  3. Update beamline specific steps

    @AbbyGi @tacaswell
    AbbyGi authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    26a56ab View commit details
    Browse the repository at this point in the history

  4. Add timeout fix for CI

    @AbbyGi @tacaswell
    AbbyGi authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    e5cfc14 View commit details
    Browse the repository at this point in the history

  5. Added config file for CI

    @AbbyGi @tacaswell
    AbbyGi authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    facb6c3 View commit details
    Browse the repository at this point in the history

  6. Added glbl.yml file

    @AbbyGi @tacaswell
    AbbyGi authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    b772a75 View commit details
    Browse the repository at this point in the history

  7. Changed where glbl.yml is located

    @AbbyGi @tacaswell
    AbbyGi authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    4382862 View commit details
    Browse the repository at this point in the history

  8. Added xpd_beamline_config.yml file

    @AbbyGi @tacaswell
    AbbyGi authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    dfba4ed View commit details
    Browse the repository at this point in the history

  9. HACK: make the profile not ask for config confirmation

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    da2eec4 View commit details
    Browse the repository at this point in the history

  10. MNT: make forgiving of missing slack token

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    8443377 View commit details
    Browse the repository at this point in the history

  11. MNT: add missing commas 

    This was a syntax error that never got exercised.
    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    341f55b View commit details
    Browse the repository at this point in the history

  12. MNT: avoid bare except

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    b29405c View commit details
    Browse the repository at this point in the history

  13. MNT: lift missing value from _py file

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    48c89e9 View commit details
    Browse the repository at this point in the history

  14. MNT: add missing import to keep the linter happy

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    d4aca17 View commit details
    Browse the repository at this point in the history

  15. MNT: put back in an RE API compatibly wrapper of xrun

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    77b7ee2 View commit details
    Browse the repository at this point in the history

  16. MNT: files for queueserver startup

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    c13a82e View commit details
    Browse the repository at this point in the history

  17. ENH: add plan that looks up sample metadata from xpdacq

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    53ad8a6 View commit details
    Browse the repository at this point in the history

  18. ENH: update and curate published plans

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    5dfcbb2 View commit details
    Browse the repository at this point in the history

  19. rapid development of sorensen power supply

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    e4b9d12 View commit details
    Browse the repository at this point in the history

  20. ENH: add caproto IOC for ramp plan

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    3f84d6c View commit details
    Browse the repository at this point in the history

  21. tweak controlled ramp plan

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    8fa9a59 View commit details
    Browse the repository at this point in the history

  22. MNT: make writing the CSV optional

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    9647a75 View commit details
    Browse the repository at this point in the history

  23. FIX: the grid objects are in globals not locals

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    6371cc3 View commit details
    Browse the repository at this point in the history

  24. BUG: add ability to optionally write out a CSV of temperatures

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    0cf75c7 View commit details
    Browse the repository at this point in the history

  25. Collection of on-the-fly changes to thermo control

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    2ae3057 View commit details
    Browse the repository at this point in the history

  26. formatting + changes db insertion

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    ef5f490 View commit details
    Browse the repository at this point in the history

  27. add flag to IOC to control xrd collection

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    367bffd View commit details
    Browse the repository at this point in the history

  28. HACK: overnight script to stop experiment after it melts

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    b216d87 View commit details
    Browse the repository at this point in the history

  29. remove suspenders

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    289c007 View commit details
    Browse the repository at this point in the history

  30. Add plans for demo

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    4973085 View commit details
    Browse the repository at this point in the history

  31. Regenerate list of known plans + use existing filtering

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    4be5596 View commit details
    Browse the repository at this point in the history

  32. STY: fix indentation of comments

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    71817a8 View commit details
    Browse the repository at this point in the history

  33. ENH: skeletons of the plans we need for the demo

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    87996ff View commit details
    Browse the repository at this point in the history

  34. FIX: make positions actually optional

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    2185506 View commit details
    Browse the repository at this point in the history

  35. MNT: simplify signature of sample_aware_count 

    Assume pe1c is the detector we are using
    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    bcbcf52 View commit details
    Browse the repository at this point in the history

  36. CI: collection-2021-1.2

    @mrakitin @tacaswell
    mrakitin authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    497c0f0 View commit details
    Browse the repository at this point in the history

  37. Do not install xpdacq (already in the env)

    @mrakitin @tacaswell
    mrakitin authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    3fec055 View commit details
    Browse the repository at this point in the history

  38. Run tests for both collection-2021-1.0/1.2

    @mrakitin @tacaswell
    mrakitin authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    b16f18e View commit details
    Browse the repository at this point in the history

  39. Use collection-2021-1.2 from main

    @mrakitin @tacaswell
    mrakitin authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    072b601 View commit details
    Browse the repository at this point in the history

  40. MNT: remove plans that QS can not describe 

    plans as defaults does not work
    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    dc481a8 View commit details
    Browse the repository at this point in the history

  41. ENH: add sample aware move + ct plan

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    2ceb224 View commit details
    Browse the repository at this point in the history

  42. ENH: update QS config with new plans

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    86b7bd6 View commit details
    Browse the repository at this point in the history

  43. MNT: update detector / beamstop position

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    fc9f307 View commit details
    Browse the repository at this point in the history

  44. FIX: pre-move in rocking_ct 

    avoids spending time moving with shutter open.
    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    50cb323 View commit details
    Browse the repository at this point in the history

  45. STY: apply black

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    9df5419 View commit details
    Browse the repository at this point in the history

  46. MNT: add envs for qserver startup

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    f2f3445 View commit details
    Browse the repository at this point in the history

  47. MNT: improve local name 

    The old name confused us because we thought it was going to
translate a sample stage.
    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    1580bed View commit details
    Browse the repository at this point in the history

  48. Set connection timeout back to 1s 

    It was 10s to work around slow IOCs, but it made the debug loop of missing
 PVs  unbearable.
    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    57950d0 View commit details
    Browse the repository at this point in the history

  49. Update to new allowed plan schema 

    - defaults to literal names
- explicitly mark things as regex
    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    ec6c787 View commit details
    Browse the repository at this point in the history

  50. Add "take a nap" demo plan

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    7912095 View commit details
    Browse the repository at this point in the history

  51. ENH: upgrade to using v34 versions of plugins 

    This has been broken fro a while, but bsui does not try to walk the tree
of all child devices so we never noticed.
    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    3bfcd89 View commit details
    Browse the repository at this point in the history

  52. Comment out Pilatus because it in not available

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    2f7f461 View commit details
    Browse the repository at this point in the history

  53. Correct PYTHONPATH location

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    818f300 View commit details
    Browse the repository at this point in the history

  54. Remove test user from permissions file

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    82f8555 View commit details
    Browse the repository at this point in the history

  55. Add client side script for setting up environment

    @maffettone @tacaswell
    maffettone authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    4134a30 View commit details
    Browse the repository at this point in the history

  56. MNT: the pilatus is unplugged

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    3be3fb8 View commit details
    Browse the repository at this point in the history

  57. Updated permissions for all plans starting with agent_

    @tacaswell
    PDF Operator authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    439a0e2 View commit details
    Browse the repository at this point in the history

  58. add agent permissions

    @tacaswell
    PDF Operator authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    f16bdfa View commit details
    Browse the repository at this point in the history

  59. Add plans for experiment

    @maffettone @tacaswell
    maffettone authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    3267b6a View commit details
    Browse the repository at this point in the history

  60. updated plans

    @tacaswell
    PDF Operator authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    fe6c43c View commit details
    Browse the repository at this point in the history

  61. update plan to vary motor

    @maffettone @tacaswell
    maffettone authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    1728c3e View commit details
    Browse the repository at this point in the history

  62. update pdf plans

    @tacaswell
    PDF Operator authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    7626f9c View commit details
    Browse the repository at this point in the history

  63. debugging msg hook on RE

    @maffettone @tacaswell
    maffettone authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    f158685 View commit details
    Browse the repository at this point in the history

  64. debugging msg hook on RE

    @maffettone @tacaswell
    maffettone authored and tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    6430661 View commit details
    Browse the repository at this point in the history

  65. uncommited changes

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    e0c2315 View commit details
    Browse the repository at this point in the history

  66. Merge remote-tracking branch 'upstream/main' into qs_main

    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    ba5aa09 View commit details
    Browse the repository at this point in the history

  67. MNT: remove .bak files 

    We do not need these with git
    @tacaswell
    tacaswell committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    4c417dd View commit details
    Browse the repository at this point in the history