-
Notifications
You must be signed in to change notification settings - Fork 12
1384 rebased: Requested use of PyDantic validation in Attenuator Motor Squad position demands for EH-1 / EH-2 in DLS i19 #1559
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
Open
CoePaul
wants to merge
23
commits into
main
Choose a base branch
from
1384_rebased
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Creates AttenuatorPositionDemand in i19 access controlled dodal such that either EH can request a set of motor position demands using a dict to store axis, position pairings e.g. "x" : 12.7 for a continuous motor motion along the x-axis e.g. "w" : 3 for a discrete indexed filter wheel This APD provides a restful format of the dict which is POSTed to the i19 optics that will decide whether or not it is appropriate to honour the demand and either passes that on to the real motors or ignores ( on the basis of which active EH has control of i19 )
* Fixes typo ( en passant ) in test_shutter corrently -> correctly * Provides separate test scripts for i19 dodal python classes -- AttenuatorPositionDemand -- AttenuatorMotorSet * Adds previously absent tests for AttenuatorMotorSet
* Corrects typo for experiment_hutch key in dict * Applies pytest.with in place of ad-hoc error traps in unhappy path test * Production code class AttenuatorMotorSet renamed -> AttenuatorMotorClique ( since set is an overloaded term ) * Production code class AttenuatorPositionDemand now generates restful_format in dict form rather than as a string since the json parser can cope and it makes for simpler testing enerates a
as detected by latest failures in CI
* replaces ad hoc validation with pydantic usage * renames badly named motor clique -> motor squad where the new name retains the sense of motor independence yet working towards a common purpose ( even if not a single point in 3D space : compare "stage" ) * tests adapted to the above changes where necessary
* replaces ad hoc validation with pydantic usage -- includes regex restriction of keys (motor axes or indexed positions to alphanumeric, underscore or dash) * renames badly named motor clique -> motor squad where the new name retains the sense of motor independence yet working towards a common purpose ( even if not a single point in 3D space : compare "stage" ) * tests adapted to the above changes where necessary
* Fix watcher utils bug and add test
* added lakeshore * grouping vector into function * reorder structure * added lakeshore 340 an 336 * undo spaces change in pyproject * complete test * more tests * make set wait in test * correct lakeshore 340 name * correct some docstring * add lakeshore docstring * add i16 lakeshore * add i06 lakeshores * correct default for lakeshore340 * add docstring for base signals * correct endstation name * correct docstring * remove private methods from docstring and add explanation to control_channel * correct docsting * add user_ to readback and setpoint * change zero offset to custom offset * remove lakeshore on beamlines * remove sub class * remove sub class * rename single control channel to no_pv_suffix_index * signal only * update test to check off_set * add test to check pv for no_pv_index * create channels for group of signal instead of device vector each signal. * test signal channel control * move pid into control channel * add docstring * corrected snake_case and added docstring to clarify channel is readback channel * add channel_rw f * correct ramp_enable channel type * dropping channel in readback * update branch and make lakeshore work * correct temperature control test with lakeshoreIO * remove add readable in set channel * make hints_channel for changing hint signal in plan * move class docs string to collect place * correct enum * remove else and use map instead for suffix * add docstings * correct grammar Co-authored-by: Dominic Oram <[email protected]> * correct import * correct logic and test * move docstring * rename channel to current_hints_channel * fix wrong pv * Apply suggestions from code review Co-authored-by: oliwenmandiamond <[email protected]> * correct tests * Create lakeshoreHint to avoid calling ophyd function * revert lakeshore hashint back to _HintsFromName --------- Co-authored-by: Dominic Oram <[email protected]> Co-authored-by: oliwenmandiamond <[email protected]>
…s, read etc (#1561) * add data to tetramm * Fix naming of sum_y Co-authored-by: Dominic Oram <[email protected]> --------- Co-authored-by: Dominic Oram <[email protected]>
* Remove get_xyz_limits * Remove test in test_gridscan as test already in smargon * Remove i17.py --------- Co-authored-by: Dominic Oram <[email protected]>
Co-authored-by: Dominic Oram <[email protected]>
* Add basic outlier rejection for murko * Address PR comments * Clean up test structure (#1502) * Removed unit_tests dir from tests/devices/unit_tests, tests/unit_tests * Removed unit_tests folder from tests/beamlines/unit_tests * Updated test_data paths * Convert all remaining rst docs to md (#1487) * Add docs for handling devices shared between multiple endstations (#1483) * Create the file * Add link * Add decision * Fix typo * Wait for motors to start moving when doing deferred moves (#1401) * Wait for motors to start moving when doing deferred moves * Fix tests and linting * Check setpoints rather than dmov * Fix test * Fix typing * Fix tests * move patch_motors to dodal.testing (#1513) * move patch_motors to dodal.testing * Added arguments for default values with doc string * Updated docs --------- Co-authored-by: Dominic Oram <[email protected]> * Fix test motor limits with new ophyd async (#1516) * move patch_motors to dodal.testing * Added arguments for default values with doc string * Updated docs * Fixed i10 id and undulator_dcm tests * fixed bimorph test * Removed unused import * Update more tests to use proper motor patch --------- Co-authored-by: Dominic Oram <[email protected]> * When thawer is triggered again, reset the timer instead of raising an exception (#1510) * Change thawer behaviour so that starting the timer again does not throw * Ophyd async motor limit check in smargon (#1511) * Wait for motors to start moving when doing deferred moves * Fix tests and linting * Check setpoints rather than dmov * Fix test * Fix typing * Fix tests * Add motor limit checking from ophyd_async * Add mock values for motor limit * Add test for MotorLimitsException to be correctly raised * Fix linting * move patch_motors to dodal.testing * Fix wrong comparision between signal and float * Change ophyd-async requirement to test motor limit * Revert "Change ophyd-async requirement to test motor limit" This reverts commit 0a064f2. * Add dev-requirements.txt * Try changing pyproject.toml * Revert "Try changing pyproject.toml" This reverts commit e8fa65f. * Move dev-requirements.txt around * Revert "Move dev-requirements.txt around" This reverts commit 9d3dd24. * Test * Fix spelling * Chnge pyproject.toml * test * test * Changed pyproject.toml for ophyd-async * Fix typo * Added arguments for default values with doc string * Updated docs * Changing test * Fix test in i10apple2 * Test * Fixed i10 id and undulator_dcm tests * test * test * test * Add mock value for mock_id_pgm * Add mock value for slits in bimorph mirror * Fix bimorph test high limit sign typo * Fix typo * fixed bimorph test * Removed unused import * Update more tests to use proper motor patch * Change test value due to change in mock limit * Change limit for testing outside limit * Remove test_utils.py in the wrong place * Remove motor limit setting in test in i10apple2 * Removing the pin to ophyd-async as there is new release * Removing the pin to ophyd-async as there is new release * set mock value in test outside motor limit in smaron * Revert "Change limit for testing outside limit" This reverts commit c97e07e. --------- Co-authored-by: Dominic Oram <[email protected]> Co-authored-by: Oli Wenman <[email protected]> Co-authored-by: oliwenmandiamond <[email protected]> * Change tetramm statistic plugin to stop tetramms on i22 failing to connect (#1506) * remove tet plugins * removal of unused import * plugin changed --------- Co-authored-by: root <[email protected]> * add i17 to beamline with pgm. (#1525) * add i17 to beamline with pgm. * Fix tests * Address review comments --------- Co-authored-by: Jacob Williamson <[email protected]> Co-authored-by: oliwenmandiamond <[email protected]> Co-authored-by: Noemi Frisina <[email protected]> Co-authored-by: rtuck99 <[email protected]> Co-authored-by: Teo Ching <[email protected]> Co-authored-by: Oli Wenman <[email protected]> Co-authored-by: Richard Dixey <[email protected]> Co-authored-by: root <[email protected]> Co-authored-by: Raymond Fan <[email protected]>
* Create SelectedSource enum and remove used region parameter logic * Removed test to check for invalid source as no longer needed with enums * Updated this to only include addition of new devices, will update exisitng classes use in different branch * Added comment on removing pytest.fixture * Update energy_sources fixture * Fixed tests * Created common enums and updated devices to use (#1415) * Created common enums and updated devices to use * Corrected backlight OnOff * Switched ordering of enums * Correct spelling * Updated remaining enums that have extra options * Renamed InOut to InState * Updated to use enums from ophyd-async * Renamed enums to Upper * test * Restore previous whitespace formatting * Updated enums reusing ones from ophyd-async to use .value, same as ophyd-async --------- Co-authored-by: Joseph Ware <[email protected]> * Add i11 beamline module, Mythen3 detector and basic devices (#1377) * added i11.py, i11 specific devices * renamed stages * added diff stages * made cryostream into standardreadable * cryostreams 1+2 working * mythen3 baseclass added * mythen3 connecting * removed mac, renamed detector to mythen * changed cstrm to ocs * added deadtime to mythen3 * added sample spinner * added eurotherm + cyberstar blower * add with children as readbles to classes * changed eurotherm signals to rbv * change blower names to csb1/2 * fixed error on mythen3 docstring * added basic methods to cyberstar blower * fixed signal types in CryoStream * added series to cryostream * changed methods to bluesky protocol * added initial robot class * i11 robot connecting * changed sample_env name to spinner * fixed spinner in bl module, change start signal to x * spin signal to rw * i11 robot signals added * super added to mythen, modified robot * added mythen3 test * added mythen connect test * added docstrings for blower and eurotherm * i11 robot added load_sample and methods * changed jaws to grip * stop and start methods added * added robot test * added robot test * modify cyberstarblower and add test, updated mythen deadtime * import motors from ophyd_async * improve Eurotherm * impproved robot and spinner inheretance * fixed naming * fixes to tests * json * updates to tests * added blower tests * added more robot tests * parameterised tests * fixed type checking * add full coverage for i11robot * fixed type * added test to mythen3 * restored settings * tidied up mythen and added more tests * improved spinner, added set speed and test * edits to improve typechecking and other small improvements * added robot at position logging test * removed _get_i11_robot * changed i11robot to NX100 * reorganise imports * lowercase file * seperated spinner pause resume tests * removed eurotherm infixes * minor update to further paramterise nx100 test * Update test_i11devices.py * added missing type hints to eurotherm, blower and mythen3 * made eurothermal rbv suffix constant * made robot states more descriptive * fixed carousel spelling on robot * add readables to cryo * made blowers and eurotherms compositional * added docs strings to i11 robot * updated cryostream imports * using ophyd_async enums on/off enabled/disabled * type checking fixed for cyberstar blower, and Eurotherms * Add default image mode setting for analysers (#1443) * Add default image mode setting for analysers and clean up imports * Set default image mode to SINGLE in ElectronAnalyserController and clean up test assertions * set image mode before arm - may be we should improve doc to say the order explicitly here. * move image_mode set to stage method * Refactor staging methods to set image mode directly * Remove image mode setting from trigger method in AbstractElectronAnalyserDetector * Enhance staging methods to ensure detector readiness and set default image mode to SINGLE * Fixed tests * Fixed flakey test, added test for unstage * Removed debugging flakey test function * Removed unneeded tests * Move Stageable to ElectronAnalyserDetector * Reorded doc string of stage so it matches order of functions. --------- Co-authored-by: Oli Wenman <[email protected]> Co-authored-by: oliwenmandiamond <[email protected]> * Move test_data to where it is used and standardise (#1419) * Moved test_data to where it is used * Add back topup tests * Moved test_beamline_parameters.txt back to tests/test_data as used by more than one test * Move test_beamline_parameters.txt back to tests/test_data as used by multiple tests * Move beamline parameter files back to tests/test_data as they are used by several tests * Created constant.py files to strore file paths * Defined all file paths in local constants.py and import part * Move oav images to test_data * Changed test_data to be a python module where you can then import static paths * Removed spaces between variables * Removed hard coded paths * Removed paths.py and added the paths directly to the __init__.py * Fixed topup tests * Updated imports to be from test_data * Applied same standard to test_daq_configuration * Updated i10 ID tests * Fixed test on python 3.11 * Update i10 lookupTables to be test_data * applied feedback * Corrected text_oav_zoom_level file name * I24: Update pmac pvs (#1344) Fixes Issue #1319 Update PMAC PVs for I24 including * Fix pmac prefix * Fix pmac homing string * Fix coordinate system index * Update tests for string constants * Update prefix for stages * Modify devices for i03's default UDC state (#1364) * Allow reading when the aperture scatterguard is parked * If ap_sg is parked then unpark it correctly * Added ability to park the scintillator * Rename and tidy up collimation table * Correctly move beamstop out when parked * Add ability to check cryostream and move fluorescence detector * Add new devices to i03 * Fix test and address reviews * Update tests/devices/unit_tests/test_scintillator.py Co-authored-by: olliesilvester <[email protected]> * Address review comments * Fix test * Do not allow aperture scatterguard to be parked --------- Co-authored-by: olliesilvester <[email protected]> * Update electron analyser helper util for tests to be modular (#1400) * initial commit * Corrected import for device_factory * Updated device_factory to have create_detector and create_driver with doc string * Update device_factory.py create_detector doc string * Updated factory methods to remove prefix and have supplied by tests * Added RunEngine to detector driver fixtures * Removed connect=True as it is True by default * Tidy up allvalvescontrol (#1058) * Tidy up allvalvescontrol * Simplify with Generics --------- Co-authored-by: Joseph Ware <[email protected]> * Fix pressure cell controller PVs (#1444) * Pressure cell controller: Updated to use the wrapped PV declaration format, renamed duplicate attributes found during testing, and added docstring * Lint formatting fix * Updated PV's to be read only and to use _RBV (#1452) * Create SelectedSource enum and remove used region parameter logic (#1448) * Create SelectedSource enum and remove used region parameter logic * Removed test to check for invalid source as no longer needed with enums * Update energy_sources fixture * Replaced talisman with gitleaks as pre-commit hook for detecting potential credentials (#1454) * Updated sequence to use files defined from __init__ * Update test_undulator_dcm.py --------- Co-authored-by: Paul Hathaway <[email protected]> Co-authored-by: Dominic Oram <[email protected]> Co-authored-by: olliesilvester <[email protected]> Co-authored-by: barnettwilliam <[email protected]> Co-authored-by: Joseph Ware <[email protected]> Co-authored-by: wajidzahoor-dls <[email protected]> * Created AbstractEnergySource to create base signal * Updated doc string * Correct type hint for test * Updated source to be clearly a reference * Updated tests to be more dyanmic * Updated other electron analyser tests from rename * chore: Add support for python 3.13 (#1466) * chore: Add support for python 3.13 * fix: Fix problems caused by tighter type checking around StrictEnum * fix: Replace mocked behaviour in test_snapshots * Updated reads to use real energy signals to keep metadata * Updated docs * Updated DualEnergySource to allow SignalR in __init__ * Update src/dodal/devices/electron_analyser/energy_sources.py Co-authored-by: Joseph Ware <[email protected]> --------- Co-authored-by: Joseph Ware <[email protected]> Co-authored-by: Richard Dixey <[email protected]> Co-authored-by: Fajin Yuan <[email protected]> Co-authored-by: Paul Hathaway <[email protected]> Co-authored-by: Dominic Oram <[email protected]> Co-authored-by: olliesilvester <[email protected]> Co-authored-by: barnettwilliam <[email protected]> Co-authored-by: wajidzahoor-dls <[email protected]>
* Create SelectedSource enum and remove used region parameter logic * Removed test to check for invalid source as no longer needed with enums * Updated this to only include addition of new devices, will update exisitng classes use in different branch * Added comment on removing pytest.fixture * Updated electron analyser devices to use new energy_source devices * Update energy_sources fixture * Fixed tests * Fix linting issue * Created common enums and updated devices to use (#1415) * Created common enums and updated devices to use * Corrected backlight OnOff * Switched ordering of enums * Correct spelling * Updated remaining enums that have extra options * Renamed InOut to InState * Updated to use enums from ophyd-async * Renamed enums to Upper * test * Restore previous whitespace formatting * Updated enums reusing ones from ophyd-async to use .value, same as ophyd-async --------- Co-authored-by: Joseph Ware <[email protected]> * Add i11 beamline module, Mythen3 detector and basic devices (#1377) * added i11.py, i11 specific devices * renamed stages * added diff stages * made cryostream into standardreadable * cryostreams 1+2 working * mythen3 baseclass added * mythen3 connecting * removed mac, renamed detector to mythen * changed cstrm to ocs * added deadtime to mythen3 * added sample spinner * added eurotherm + cyberstar blower * add with children as readbles to classes * changed eurotherm signals to rbv * change blower names to csb1/2 * fixed error on mythen3 docstring * added basic methods to cyberstar blower * fixed signal types in CryoStream * added series to cryostream * changed methods to bluesky protocol * added initial robot class * i11 robot connecting * changed sample_env name to spinner * fixed spinner in bl module, change start signal to x * spin signal to rw * i11 robot signals added * super added to mythen, modified robot * added mythen3 test * added mythen connect test * added docstrings for blower and eurotherm * i11 robot added load_sample and methods * changed jaws to grip * stop and start methods added * added robot test * added robot test * modify cyberstarblower and add test, updated mythen deadtime * import motors from ophyd_async * improve Eurotherm * impproved robot and spinner inheretance * fixed naming * fixes to tests * json * updates to tests * added blower tests * added more robot tests * parameterised tests * fixed type checking * add full coverage for i11robot * fixed type * added test to mythen3 * restored settings * tidied up mythen and added more tests * improved spinner, added set speed and test * edits to improve typechecking and other small improvements * added robot at position logging test * removed _get_i11_robot * changed i11robot to NX100 * reorganise imports * lowercase file * seperated spinner pause resume tests * removed eurotherm infixes * minor update to further paramterise nx100 test * Update test_i11devices.py * added missing type hints to eurotherm, blower and mythen3 * made eurothermal rbv suffix constant * made robot states more descriptive * fixed carousel spelling on robot * add readables to cryo * made blowers and eurotherms compositional * added docs strings to i11 robot * updated cryostream imports * using ophyd_async enums on/off enabled/disabled * type checking fixed for cyberstar blower, and Eurotherms * Add default image mode setting for analysers (#1443) * Add default image mode setting for analysers and clean up imports * Set default image mode to SINGLE in ElectronAnalyserController and clean up test assertions * set image mode before arm - may be we should improve doc to say the order explicitly here. * move image_mode set to stage method * Refactor staging methods to set image mode directly * Remove image mode setting from trigger method in AbstractElectronAnalyserDetector * Enhance staging methods to ensure detector readiness and set default image mode to SINGLE * Fixed tests * Fixed flakey test, added test for unstage * Removed debugging flakey test function * Removed unneeded tests * Move Stageable to ElectronAnalyserDetector * Reorded doc string of stage so it matches order of functions. --------- Co-authored-by: Oli Wenman <[email protected]> Co-authored-by: oliwenmandiamond <[email protected]> * Move test_data to where it is used and standardise (#1419) * Moved test_data to where it is used * Add back topup tests * Moved test_beamline_parameters.txt back to tests/test_data as used by more than one test * Move test_beamline_parameters.txt back to tests/test_data as used by multiple tests * Move beamline parameter files back to tests/test_data as they are used by several tests * Created constant.py files to strore file paths * Defined all file paths in local constants.py and import part * Move oav images to test_data * Changed test_data to be a python module where you can then import static paths * Removed spaces between variables * Removed hard coded paths * Removed paths.py and added the paths directly to the __init__.py * Fixed topup tests * Updated imports to be from test_data * Applied same standard to test_daq_configuration * Updated i10 ID tests * Fixed test on python 3.11 * Update i10 lookupTables to be test_data * applied feedback * Corrected text_oav_zoom_level file name * I24: Update pmac pvs (#1344) Fixes Issue #1319 Update PMAC PVs for I24 including * Fix pmac prefix * Fix pmac homing string * Fix coordinate system index * Update tests for string constants * Update prefix for stages * Modify devices for i03's default UDC state (#1364) * Allow reading when the aperture scatterguard is parked * If ap_sg is parked then unpark it correctly * Added ability to park the scintillator * Rename and tidy up collimation table * Correctly move beamstop out when parked * Add ability to check cryostream and move fluorescence detector * Add new devices to i03 * Fix test and address reviews * Update tests/devices/unit_tests/test_scintillator.py Co-authored-by: olliesilvester <[email protected]> * Address review comments * Fix test * Do not allow aperture scatterguard to be parked --------- Co-authored-by: olliesilvester <[email protected]> * Update electron analyser helper util for tests to be modular (#1400) * initial commit * Corrected import for device_factory * Updated device_factory to have create_detector and create_driver with doc string * Update device_factory.py create_detector doc string * Updated factory methods to remove prefix and have supplied by tests * Added RunEngine to detector driver fixtures * Removed connect=True as it is True by default * Tidy up allvalvescontrol (#1058) * Tidy up allvalvescontrol * Simplify with Generics --------- Co-authored-by: Joseph Ware <[email protected]> * Fix pressure cell controller PVs (#1444) * Pressure cell controller: Updated to use the wrapped PV declaration format, renamed duplicate attributes found during testing, and added docstring * Lint formatting fix * Updated PV's to be read only and to use _RBV (#1452) * Create SelectedSource enum and remove used region parameter logic (#1448) * Create SelectedSource enum and remove used region parameter logic * Removed test to check for invalid source as no longer needed with enums * Update energy_sources fixture * Replaced talisman with gitleaks as pre-commit hook for detecting potential credentials (#1454) * Updated sequence to use files defined from __init__ * Update test_undulator_dcm.py --------- Co-authored-by: Paul Hathaway <[email protected]> Co-authored-by: Dominic Oram <[email protected]> Co-authored-by: olliesilvester <[email protected]> Co-authored-by: barnettwilliam <[email protected]> Co-authored-by: Joseph Ware <[email protected]> Co-authored-by: wajidzahoor-dls <[email protected]> * Created AbstractEnergySource to create base signal * Updated doc string * Correct type hint for test * Updated source to be clearly a reference * Updated tests to be more dyanmic * Updated other electron analyser tests from rename * chore: Add support for python 3.13 (#1466) * chore: Add support for python 3.13 * fix: Fix problems caused by tighter type checking around StrictEnum * fix: Replace mocked behaviour in test_snapshots * Added missing stage method from merge * Updated driver energy_source func name to select_energy_source_from_region * Renamed select_energy_source_from_region to set_source_from_region_and_get_energy * Updated reads to use real energy signals to keep metadata * Updated docs * Correct test_energy_source * Update excitation_energy to be energy * Fix tests * Updated beamlines * Fix linting issue * Added doc string for set method * Removed commented out code from test * Fixed linting issue for p60 * Updated DualEnergySource to allow SignalR in __init__ * Remove unused import * Fixed missing device_factory --------- Co-authored-by: Joseph Ware <[email protected]> Co-authored-by: Richard Dixey <[email protected]> Co-authored-by: Fajin Yuan <[email protected]> Co-authored-by: Paul Hathaway <[email protected]> Co-authored-by: Dominic Oram <[email protected]> Co-authored-by: olliesilvester <[email protected]> Co-authored-by: barnettwilliam <[email protected]> Co-authored-by: wajidzahoor-dls <[email protected]>
* remove i11 static path provider * remove i11 static path comments * fix lint
* added lakeshore * grouping vector into function * reorder structure * added lakeshore 340 an 336 * undo spaces change in pyproject * complete test * more tests * make set wait in test * correct lakeshore 340 name * correct some docstring * add lakeshore docstring * add i16 lakeshore * add i06 lakeshores * correct default for lakeshore340 * add docstring for base signals * correct endstation name * correct docstring * remove private methods from docstring and add explanation to control_channel * correct docsting * add user_ to readback and setpoint * change zero offset to custom offset * remove lakeshore on beamlines * remove sub class * remove sub class * rename single control channel to no_pv_suffix_index * signal only * update test to check off_set * add test to check pv for no_pv_index * create channels for group of signal instead of device vector each signal. * test signal channel control * move pid into control channel * add docstring * corrected snake_case and added docstring to clarify channel is readback channel * add channel_rw f * correct ramp_enable channel type * dropping channel in readback * update branch and make lakeshore work * correct temperature control test with lakeshoreIO * remove add readable in set channel * make hints_channel for changing hint signal in plan * move class docs string to collect place * correct enum * remove else and use map instead for suffix * add docstings * correct grammar Co-authored-by: Dominic Oram <[email protected]> * correct import * correct logic and test * move docstring * rename channel to current_hints_channel * add lakeshore to i10 and i10-1 * add lakeshore to beamline * Lakeshore added to init * revert un-indented changes * Update src/dodal/devices/temperture_controller/lakeshore/lakeshore.py Co-authored-by: oliwenmandiamond <[email protected]> * add docstrings * fix typo * remove hint_signal all together * move test to correct folder to mirror src * fix typos --------- Co-authored-by: Dominic Oram <[email protected]> Co-authored-by: oliwenmandiamond <[email protected]>
* Add commissioning jungfrau device with temporary filewriter
* Correct mapping for vmxm zebra * Create 2d FGS device * Update FGS device, remove backlight
* Refactor common gridscan
…stop freezing on i22 (#1527) * skipped unused device * allow tetramm to recieve n triggers * use ophyd_async version of total_triggers * fixed most tests * removed assert from assert armed based on averaging time because aeraging time now dependent on file_io * remove reduntant set_avergaeing_time and mock exposure in test * added variable gate to tetramm * added unstage * make tetramm more reliable by setting an unstage * fix tests * stop acquisition before change trigger mode * set end to driver acquire false * tidy up * no timeout on wait_for_idle * added epics_signal_r back * added tests for freerunning disarm * minor edits * correctly asserted averging time == livetime in tests --------- Co-authored-by: root <[email protected]>
* Add event loop fuzzer
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1559 +/- ##
==========================================
+ Coverage 98.74% 98.82% +0.07%
==========================================
Files 243 251 +8
Lines 8769 9022 +253
==========================================
+ Hits 8659 8916 +257
+ Misses 110 106 -4 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replaces PR #1439
Fixes #1384
Part of #1007
Instructions to reviewer on how to test:
Checks for reviewer
dodal connect ${BEAMLINE}