Code

Bimorph mirrors#992

Code

Open

dan-fernandes wants to merge 128 commits intomainDiamondLightSource/dodal:mainfrom bimorph-mirrorsDiamondLightSource/dodal:bimorph-mirrorsCopy head branch name to clipboard

+100-98

Commits

Commits on Nov 27, 2024

• Create bimorph_mirrors dir with __init__.py

  dan-fernandes

  committed
  8728995

  Copy full SHA for 8728995

• Create bimorph_mirror.py with basic class structure

  dan-fernandes

  committed
  ec85bd8

  Copy full SHA for ec85bd8

• Add VOUT_RBV channel creation to __init__

  dan-fernandes

  committed
  62f5488

  Copy full SHA for 62f5488

Commits on Nov 28, 2024

• Move bimorph_mirror.py out of bimorph_mirrors directory

  dan-fernandes

  committed
  6bd8b07

  Copy full SHA for 6bd8b07

• Create BimorphMirrorChannel with vout_rbv SignalR

  dan-fernandes

  committed
  70a75f5

  Copy full SHA for 70a75f5

• Change BimorphMirrorChannel child creation to procedural

  dan-fernandes

  committed
  4a129a2

  Copy full SHA for 4a129a2

• Replace BimorphMirror child decleration to use BimorphMirrorChannel

  dan-fernandes

  committed
  82ec406

  Copy full SHA for 82ec406

• Remove unused imports

  dan-fernandes

  committed
  9bb6e50

  Copy full SHA for 9bb6e50

• Remove unused import

  dan-fernandes

  committed
  c6ab0dd

  Copy full SHA for c6ab0dd

• Remove uneccesary Format in add_children_as_readables

  dan-fernandes

  committed
  b615c94

  Copy full SHA for b615c94

• Add super().__init__ call

  dan-fernandes

  committed
  3f265bf

  Copy full SHA for 3f265bf

• Add VTRGT_RBV, STATUS to BimorphMirrorChannel

  dan-fernandes

  committed
  24cf9d9

  Copy full SHA for 24cf9d9

• Add BimorphMirror.set method

  dan-fernandes

  committed
  5b10523

  Copy full SHA for 5b10523

• Add bimorph test file

  dan-fernandes

  committed
  fcec361

  Copy full SHA for fcec361

• Fix STATUS type

  dan-fernandes

  committed
  e7e8021

  Copy full SHA for e7e8021

• Make BimorphMirror.set await values in VOUT_RBV

  dan-fernandes

  committed
  3944b78

  Copy full SHA for 3944b78

Commits on Nov 29, 2024

• Add assertion that channel exists to BimorphMirror.set

  dan-fernandes

  committed
  3139761

  Copy full SHA for 3139761

• Replace .get with square brackets in BimorphMirror.set to avoid typing errors

  dan-fernandes

  committed
  503aa0a

  Copy full SHA for 503aa0a

• Add BimorphMirrorChannel.shift

  dan-fernandes

  committed
  a4fd4d3

  Copy full SHA for a4fd4d3

• Add BimorphMirror.all_shift, .add_volt

  dan-fernandes

  committed
  bebf974

  Copy full SHA for bebf974

• Add BimorphMirror.channels, .status, .temps

  dan-fernandes

  committed
  81870c6

  Copy full SHA for 81870c6

• Rename previous BimorphMirror.channels to BimorphMirror.channel_list to avoid member name clash

  dan-fernandes

  committed
  5bdaf89

  Copy full SHA for 5bdaf89

• Add BimorphMirror.reset_err_proc, .err

  dan-fernandes

  committed
  8c17c91

  Copy full SHA for 8c17c91

• Add BimorphOnOff Strict Enum

  dan-fernandes

  committed
  b6df119

  Copy full SHA for b6df119

• Add BimorphMirror.on_off

  dan-fernandes

  committed
  1823217

  Copy full SHA for 1823217

• Add BimorphMirrorMode StrictEnum

  dan-fernandes

  committed
  a216906

  Copy full SHA for a216906

• Add BimorphMirror.op_mode

  dan-fernandes

  committed
  e9916c2

  Copy full SHA for e9916c2

• Change BimorphMirror.on_off datatype to BimorphMirrorOnOff rather than StrictEnum

  dan-fernandes

  committed
  5867146

  Copy full SHA for 5867146

• Add docstrings

  dan-fernandes

  committed
  916d909

  Copy full SHA for 916d909

• Remove uneccesary signals from BimorphMirror

  dan-fernandes

  committed
  ea19f02

  Copy full SHA for ea19f02

• Add missing attribute to docstring

  dan-fernandes

  committed
  0794a9b

  Copy full SHA for 0794a9b

• Remove duplicate signal decleration

  dan-fernandes

  committed
  c2cbf88

  Copy full SHA for c2cbf88

• Remove uneccesary BimorphMirror signal

  dan-fernandes

  committed
  90a842c

  Copy full SHA for 90a842c

• Change BimorphMirrorChannel.status to datatype BimorphMirrorOnOff

  dan-fernandes

  committed
  bd405eb

  Copy full SHA for bd405eb

• Add BimorphMirrorStatus, set as BimorphMirror.status datatype

  dan-fernandes

  committed
  20e9768

  Copy full SHA for 20e9768

• Change BimorphMirror.channels datatype to str

  dan-fernandes

  committed
  0f9a081

  Copy full SHA for 0f9a081

• Change BimorphMirrorChannel to declare all signals declaratively

  dan-fernandes

  committed
  3ff0a06

  Copy full SHA for 3ff0a06

• Remove uneccesary argument

  dan-fernandes

  committed
  5b7325b

  Copy full SHA for 5b7325b

• Move all PV delimiters from suffix into prefix

  dan-fernandes

  committed
  664d636

  Copy full SHA for 664d636

• Fix incorrect use of PVSuffix

  dan-fernandes

  committed
  a2327a5

  Copy full SHA for a2327a5

• Make BimorphMirrorChannel inherit from EpicsDevice

  dan-fernandes

  committed
  521963f

  Copy full SHA for 521963f

• Remove :CHANNELS signal from BimorphMirror

  dan-fernandes

  committed
  7199a8c

  Copy full SHA for 7199a8c

• Rename BimorphMirror.channel_list to .channels

  dan-fernandes

  committed
  051f23e

  Copy full SHA for 051f23e

• Remove unused import

  dan-fernandes

  committed
  2dc2bab

  Copy full SHA for 2dc2bab

• Replace BimorphMirror.set wait on rbv with wait=True

  dan-fernandes

  committed
  f827c05

  Copy full SHA for f827c05

• Add bimorph test_set_channels

  dan-fernandes

  committed
  3af9f88

  Copy full SHA for 3af9f88

• Organise imports

  dan-fernandes

  committed
  bd86838

  Copy full SHA for bd86838

• Make wait_for_value in BimorphMirror.set use DEFAULT_TIMEOUT instead of None

  dan-fernandes

  committed
  5a7cfa8

  Copy full SHA for 5a7cfa8

• Rename test_set_channels, fix said test, and add test_set_channels_triggers_alltrgt_proc

  dan-fernandes

  committed
  d0156c0

  Copy full SHA for d0156c0

• Remove whitespace

  dan-fernandes

  committed
  dcb0b7e

  Copy full SHA for dcb0b7e

• Remove unused import

  dan-fernandes

  committed
  507139c

  Copy full SHA for 507139c

• Add comments

  dan-fernandes

  committed
  aff1a58

  Copy full SHA for aff1a58

Commits on Dec 2, 2024

• Parametrize test_set_channels_wait_for_readback

  dan-fernandes

  committed
  6b83f14

  Copy full SHA for 6b83f14

• Abstract setting vout mock values into fixture

  dan-fernandes

  committed
  6774344

  Copy full SHA for 6774344

• Parametrize test_set_channels_wait_for_readback

  dan-fernandes

  committed
  0b13698

  Copy full SHA for 0b13698

• Add whitespace

  dan-fernandes

  committed
  550f406

  Copy full SHA for 550f406

• Renam set_vout_mock_values to set_vout_mock_and_return_value

  dan-fernandes

  committed
  27f72fb

  Copy full SHA for 27f72fb

• Add test_set_channels_waits_for_vout_readback unimplemented

  dan-fernandes

  committed
  81e0ddb

  Copy full SHA for 81e0ddb

• Add test_read, and BIMORPH_NAME global variable

  dan-fernandes

  committed
  5ffad56

  Copy full SHA for 5ffad56

Commits on Dec 4, 2024

• Make mirror fixture take number_of_channels argument

  dan-fernandes

  committed
  31c6bec

  Copy full SHA for 31c6bec

• Correct BimorphMirrorChannel Format signal types

  dan-fernandes

  committed
  b7cf4bd

  Copy full SHA for b7cf4bd

• Add valid_bimorph_values fixture

  dan-fernandes

  committed
  6f83b30

  Copy full SHA for 6f83b30

• Change test parametrization from bimorph input to number of channels

  dan-fernandes

  committed
  0de2413

  Copy full SHA for 0de2413

Commits on Dec 5, 2024

• Add format changes generated by tox pre-commit

  dan-fernandes

  committed
  35f253b

  Copy full SHA for 35f253b

• Change explcit channel number parameter to reference to global list of channel numbers

  dan-fernandes

  committed
  5dae56f

  Copy full SHA for 5dae56f

• Implement test_set_channels_waits_for_vout_readback

  dan-fernandes

  committed
  e3e5a31

  Copy full SHA for e3e5a31

• Add test_set_invalid_chanel_throws_error

  dan-fernandes

  committed
  e9c578e

  Copy full SHA for e9c578e

• Add Raises section to BimorphMirror.set docstring

  dan-fernandes

  committed
  ffce233

  Copy full SHA for ffce233

Commits on Dec 9, 2024

• Make BiorphMirror.__init__ number_of_channels have no default value

  dan-fernandes

  committed
  61a39af

  Copy full SHA for 61a39af

• Replace all asserts inside for loops, to comprehension and comparison

  dan-fernandes

  committed
  6ea4522

  Copy full SHA for 6ea4522

• Remove BIMORPH_NAME global variable

  dan-fernandes

  committed
  b8d81ee

  Copy full SHA for b8d81ee

• Remove prng from test input generation

  dan-fernandes

  committed
  e015ba5

  Copy full SHA for e015ba5

• Add BimorphMirror.__init__ number_of_channels validation

  dan-fernandes

  committed
  09185f0

  Copy full SHA for 09185f0

• Add test_init_mirror_with_invalid_channels_throws_error

  dan-fernandes

  committed
  cfe357d

  Copy full SHA for cfe357d

• Add BimorphMirror.__init__ docstring

  dan-fernandes

  committed
  bdd93d5

  Copy full SHA for bdd93d5

• Replace assertion in BimorphMirror.set arg validation with raise ValueError

  dan-fernandes

  committed
  aba2bc1

  Copy full SHA for aba2bc1

• Make test_set_invalid_channel_throws_error expect correct error type

  dan-fernandes

  committed
  db20860

  Copy full SHA for db20860

• Replace real PV prefix with fake

  dan-fernandes

  committed
  b4ca49d

  Copy full SHA for b4ca49d

Commits on Dec 10, 2024

• Add mock_vtrgt_vout_propogation, remove set_vout_mock fixtures

  dan-fernandes

  committed
  d028438

  Copy full SHA for d028438

• Remove unused import

  dan-fernandes

  committed
  318fcd6

  Copy full SHA for 318fcd6

• Merge branch 'main' into bimorph-mirrors

  dan-fernandes

  committed
  0bb79d8

  Copy full SHA for 0bb79d8

• Fix import for ophyd async 0.9.0a1

  dan-fernandes

  committed
  448eb19

  Copy full SHA for 448eb19

Commits on Dec 11, 2024

• Update src/dodal/devices/bimorph_mirror.py

  Show description for 7272218
  

  dan-fernandes

  and

  callumforrester

  authored
  7272218

  Copy full SHA for 7272218

• Update src/dodal/devices/bimorph_mirror.py

  Show description for 3237790
  

  dan-fernandes

  and

  callumforrester

  authored
  3237790

  Copy full SHA for 3237790

• Update src/dodal/devices/bimorph_mirror.py

  Show description for 7953ceb
  

  dan-fernandes

  and

  callumforrester

  authored
  7953ceb

  Copy full SHA for 7953ceb

• Remove BimorphMirror.number_of_channels

  dan-fernandes

  committed
  d06a8ab

  Copy full SHA for d06a8ab

• Rename BimorphMirror.alltrgt_proc, .on_off for readability

  dan-fernandes

  committed
  db19e2a

  Copy full SHA for db19e2a

• Rename BimorphMirrorChannel.vtrgt, .vout for readbility

  dan-fernandes

  committed
  095861d

  Copy full SHA for 095861d

• Change BimorphMirror.set type hinting

  dan-fernandes

  committed
  8ceaad1

  Copy full SHA for 8ceaad1

Commits on Dec 12, 2024

• Replace BimorphMirror.set sequential input validation with collection

  Show description for 86d9cf2
  

  dan-fernandes

  and

  callumforrester

  authored
  86d9cf2

  Copy full SHA for 86d9cf2

• Add test_init_mirror_with_zero_channels

  dan-fernandes

  committed
  0bfb429

  Copy full SHA for 0bfb429

Commits on Jan 7, 2025

• Ensure bimorph has finished moving after set

  DiamondRC

  committed
  bfe6832

  Copy full SHA for bfe6832

• Merge branch 'main' into bimorph-mirrors

  DiamondRC

  authored
  289a324

  Copy full SHA for 289a324

• wait for value

  DiamondRC

  committed
  5b1beca

  Copy full SHA for 5b1beca

• Update test_bimorph_mirror.py

  DiamondRC

  authored
  b79924d

  Copy full SHA for b79924d

• Crop PV name for BUSY toggle

  DiamondRC

  committed
  18f6438

  Copy full SHA for 18f6438

• Crop PV name for BUSY toggle

  DiamondRC

  committed
  d3a80ae

  Copy full SHA for d3a80ae

• await IDLE status

  DiamondRC

  committed
  8f98f54

  Copy full SHA for 8f98f54

Commits on Jan 8, 2025

• Update test to account for idling

  DiamondRC

  committed
  519349e

  Copy full SHA for 519349e

Commits on Jan 9, 2025

• Make BimorphMirrorChannel Movable, add set method

  dan-fernandes

  committed
  b849a67

  Copy full SHA for b849a67

• Merge branch 'main' into bimorph-mirrors

  dan-fernandes

  authored
  4fe2693

  Copy full SHA for 4fe2693

• Remove unnecessary fixture from test_bimorph_mirror_channel_set

  dan-fernandes

  committed
  489c931

  Copy full SHA for 489c931

Commits on Jan 16, 2025

• Make BimorphMirror.set set to target_voltage in serial, and wait check for mirror status.

  dan-fernandes

  committed
  ea2e1c8

  Copy full SHA for ea2e1c8

• Add wait for BimorphMirrorStatus.IDLE before trigger in BimorphMirror.set

  dan-fernandes

  committed
  502040c

  Copy full SHA for 502040c

• Refactor mock_vtrgt_vout_propogation to use callback_on_mock_put

  dan-fernandes

  committed
  3b6c62d

  Copy full SHA for 3b6c62d

• Add mock_bimorph_mirror_status_functionality

  dan-fernandes

  committed
  792d8e1

  Copy full SHA for 792d8e1

• Aggregate mock_vtrgt_vout_propogation, mock_bimorph_mirror_status_functionality, into single bimorph_functionality fixture

  dan-fernandes

  committed
  2049ac1

  Copy full SHA for 2049ac1

• Make test_set_channels_waits_for_vout_readback check subset of call_args rather than equality

  dan-fernandes

  committed
  62c50f2

  Copy full SHA for 62c50f2

• Add bimorph_functionality fixture to test_set_channels_allows_tolerance

  dan-fernandes

  committed
  08091ab

  Copy full SHA for 08091ab

• Merge branch 'main' into bimorph-mirrors

  dan-fernandes

  committed
  fe8bae5

  Copy full SHA for fe8bae5

• Remove tolerance in BimorphMirror.set

  dan-fernandes

  committed
  c81c50c

  Copy full SHA for c81c50c

• Merge branch 'main' into bimorph-mirrors

  dan-fernandes

  authored
  6ceefb6

  Copy full SHA for 6ceefb6

• Remove unused argument in BimorphMirror.set

  dan-fernandes

  committed
  eec80b4

  Copy full SHA for eec80b4

• Add comment to BimorphMirror.set explaining serial set

  dan-fernandes

  committed
  cfa4185

  Copy full SHA for cfa4185

• Refactor test_bimorph_mirror to use mirror_with_mocked_put fixture

  dan-fernandes

  committed
  15c7077

  Copy full SHA for 15c7077

Commits on Jan 24, 2025

• Add typing to mirror_with_mocked_put status function

  dan-fernandes

  committed
  2f7ec85

  Copy full SHA for 2f7ec85

• Add type hinting to mirror_with_mocked_put vout_propogation_and_status function

  dan-fernandes

  committed
  fba60a7

  Copy full SHA for fba60a7

• Rename all ..vout.. references to ..output_voltage..

  dan-fernandes

  committed
  4c6403b

  Copy full SHA for 4c6403b

• Make BimorphMirror.set use set_and_wait_for_other_value rather than two seperate calls

  dan-fernandes

  committed
  597198a

  Copy full SHA for 597198a

• Rewrite mirror_with_mocked_put to not use default arguments in helper functions, add docstring

  dan-fernandes

  committed
  bad136f

  Copy full SHA for bad136f

Commits on Jan 27, 2025

• Renamed functions in mirror_with_mocked_put fixture for readability

  dan-fernandes

  committed
  3e05c45

  Copy full SHA for 3e05c45

Commits on Jan 28, 2025

• Set DEFAULT_TIMEOUT to 60

  dan-fernandes

  committed
  f0e4877

  Copy full SHA for f0e4877

• Change BimorphMirror.set to write to output_voltage and to not trigger commit_target_voltages

  dan-fernandes

  committed
  dae23a1

  Copy full SHA for dae23a1

• Remove BimorphMirror.commit_target_voltages

  dan-fernandes

  committed
  5aa7c20

  Copy full SHA for 5aa7c20

• Remove test_set_channels_triggers_alltrgt_proc

  dan-fernandes

  committed
  316ff61

  Copy full SHA for 316ff61

• Change test_set_channels_waits_for_readback to read from output_voltage

  dan-fernandes

  committed
  e8e36c3

  Copy full SHA for e8e36c3

• Make test_set_one_channel read from output_voltage

  dan-fernandes

  committed
  4b6a65b

  Copy full SHA for 4b6a65b

• Merge branch 'main' into bimorph-mirrors

  dan-fernandes

  authored
  5d0de0b

  Copy full SHA for 5d0de0b