Pressure jump fast adc based on area detector #745

barnettwilliam · 2024-08-13T08:46:32Z

Closes #727
Area detector for pressure jump cell fast capture.

Checks for reviewer

Would the PR title make sense to a scientist on a set of release notes
If a new device has been added does it follow the standards
If changing the API for a pre-existing device, ensure that any beamlines using this device have updated their Bluesky plans accordingly
Have the connection tests for the relevant beamline(s) been run via dodal connect ${BEAMLINE}

DiamondJoseph · 2024-08-13T09:07:22Z

src/dodal/devices/pressure_jump_cell_adc.py

+from ophyd import ADComponent as ADC
+from ophyd import (
+    AreaDetector,
+    CamBase,
+    Component,
+    Device,
+    EpicsSignal,
+    HDF5Plugin,
+    OverlayPlugin,
+    ProcessPlugin,
+    ROIPlugin,
+    StatsPlugin,
+    Signal,
+    StatusBase,
+)


Should use ophyd-async instead of ophyd implementation of things.

This then is an implementation of StandardDetector

+1, in general all new devices should be exclusively ophyd-async. The aim is to eventually remove ophyd as a dependency of dodal.

Updated to use ophyd-async in 5f9f808.

DiamondJoseph · 2024-08-13T09:31:07Z

src/dodal/devices/pressure_jump_cell_adc.py

+class PressureJumpAdcConfigParams:
+    pass
+
+class PressureJumpCellADC(AreaDetector):
+    """
+    High pressure X-ray cell fast ADC, used to capture pressure jumps.
+    """
+    cam = ADC(CamBase, "-EA-HPXC-01:CAM:")
+    scale = ADC(ROIPlugin, "-EA-HPXC-01:SCALE:")
+    # trig = # TODO support module adUtil NDPluginReframe? 
+    # arr = # TODO support module ADCore NDPluginStdArrays? required?
+    hdf5 = ADC(HDF5Plugin, "-DI-OAV-01:HDF5:")
+
+    p1Roi = ADC(ROIPlugin, "-EA-HPXC-01:ROIP1:")
+    p1Proc = ADC(ProcessPlugin, "-EA-HPXC-01:PROCP1:")
+    p1Stats = ADC(StatsPlugin, "-EA-HPXC-01:STATP1:")
+
+    p2Roi = ADC(ROIPlugin, "-EA-HPXC-01:ROIP2:")
+    p2Proc = ADC(ProcessPlugin, "-EA-HPXC-01:PROCP2:")
+    p2Stats = ADC(StatsPlugin, "-EA-HPXC-01:STATP2:")
+
+    p3Roi = ADC(ROIPlugin, "-EA-HPXC-01:ROIP3:")
+    p3Proc = ADC(ProcessPlugin, "-EA-HPXC-01:PROCP3:")
+    p3Stats = ADC(StatsPlugin, "-EA-HPXC-01:STATP3:")
+
+    def __init__(self, *args, params: PressureJumpAdcConfigParams, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.parameters = params
+        self.snapshot.oav_params = params
+        self.subscription_id = None
+        self._snapshot_trigger_subscription_id = None
+
+    def wait_for_connection(self, all_signals=False, timeout=2):
+        connected = super().wait_for_connection(all_signals, timeout)
+        return connected
+


Compare the implementation of e.g. the AdAravis in ophyd-async
https://github.com/bluesky/ophyd-async/tree/e4fb8492bfad29dff9f539f6adc63c8152f68493/src/ophyd_async/epics/adaravis

This should be EthercatADC(StandardDetector) with an EthercatController, EthercatDriver if appropriate (from the looks of this can just use AdBase though, as no special signals?)

Thank you Joseph I'll have a look. At the moment I'm not sure what would make a signal 'special'.

Are there any signals for the pressure exposed on the camera itself? From the ophyd definition I don't see any signals that are unique to function of the device class or particularly sought out for the experimental procedure, which is what I mean by "special".

Ah ok, looking at the ioc configuration for the pressure jump cell BL38P-EA-IOC-12 it uses ADEthercat, ADCore, and adUtil standard support modules where there are 4 ethercat channels likely for the pressures. I wasn't sure if this will be picked up from the IOC by the ophyd modules or whether this needs to be specified in the ophyd device?

There is an additional support module specific to the pressure cell where pressureCell.scale is used in the IOC configuration which I presume adjusts the scale for the visualisation.

Updated to use ophyd-async in 5f9f808.

codecov · 2024-09-17T14:56:27Z

Codecov Report

Attention: Patch coverage is 87.87879% with 4 lines in your changes missing coverage. Please review.

Project coverage is 94.49%. Comparing base (1c77f3c) to head (4456dd2).

Files with missing lines	Patch %	Lines
src/dodal/devices/pressure_jump_cell_adc.py	86.66%	4 Missing ⚠️

Additional details and impacted files

@@                    Coverage Diff                     @@
##           658-pressure-jump-cell     #745      +/-   ##
==========================================================
- Coverage                   94.53%   94.49%   -0.05%     
==========================================================
  Files                         116      117       +1     
  Lines                        4743     4776      +33     
==========================================================
+ Hits                         4484     4513      +29     
- Misses                        259      263       +4

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

… and pressure jumps.

…s and formatting.

… added unit test for readback values.

stan-dot · 2024-09-27T14:35:41Z

will review on Monday if rebased and tests passing OR if help needed

barnettwilliam · 2024-09-27T14:40:35Z

Thanks, yes still need some tidy up and tests adding etc.

barnettwilliam requested review from callumforrester, DiamondJoseph and stan-dot August 13, 2024 08:46

DiamondJoseph reviewed Aug 13, 2024

View reviewed changes

stan-dot force-pushed the 658-pressure-jump-cell branch 4 times, most recently from 15996f2 to 4a7b253 Compare August 23, 2024 12:07

stan-dot force-pushed the 658-pressure-jump-cell branch 2 times, most recently from 26e46cd to 1c77f3c Compare August 30, 2024 09:36

barnettwilliam force-pushed the 727-pressure-jump-cell-area-detector branch from 94497c4 to 4456dd2 Compare September 17, 2024 14:53

barnettwilliam self-assigned this Sep 18, 2024

barnettwilliam and others added 16 commits September 18, 2024 11:47

Created PressureJumpCell device and the main PVs for setting pressure…

c83d389

… and pressure jumps.

Added pump motor and valve manual control PVs and corrected some typo…

d7715c4

…s and formatting.

Pressure jump cell: Added enums for valve and limit switch states and…

4294d75

… added unit test for readback values.

Linting and formatting fixes.

9068423

Restructured pressure jump cell device to be by component.

4dee191

Define pressure jump adc numbering in constructor.

e6e38f6

Minor formatting fixes.

49eae38

Pressure jump cell corrected enums extend str and Enum

8b2707d

Pressure jump cell removed empty enum values.

8ff69a7

use devicevector

fc20987

change names

22106f1

adapt the tests to the changes

054db16

forgot to delete the not used device

07afb58

Cell connected following testing in P38

cc7639e

respond to feedback

e7c4980

fix test

1cdf74b

stan-dot added 5 commits September 18, 2024 11:47

pressure jump cell ready reviewed

f0a94f6

adapt pressure jump cell tests

e222f16

ruff

6e73f47

chane pressure controller prefix logic

abddcb4

respond to feedback

3ab8d4f

stan-dot force-pushed the 658-pressure-jump-cell branch from 1c77f3c to 3ab8d4f Compare September 18, 2024 10:47

stan-dot and others added 4 commits September 18, 2024 15:51

pjump cell add prefix to initalize correctly

68db33d

adapt pressure jumpt to use the clear prefix

acaf6bf

Pressure jump adc initial attempt based on area detector.

04cc496

Revised pressure jump cell adc to use ophyd-async.

5f9f808

barnettwilliam force-pushed the 727-pressure-jump-cell-area-detector branch from 4456dd2 to 5f9f808 Compare September 27, 2024 14:06

stan-dot force-pushed the 658-pressure-jump-cell branch from 03dc7c7 to 1ed5229 Compare November 14, 2024 13:56

Base automatically changed from 658-pressure-jump-cell to main November 14, 2024 16:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pressure jump fast adc based on area detector #745

Pressure jump fast adc based on area detector #745

barnettwilliam commented Aug 13, 2024

DiamondJoseph Aug 13, 2024

callumforrester Aug 14, 2024

barnettwilliam Sep 27, 2024

DiamondJoseph Aug 13, 2024

barnettwilliam Aug 15, 2024

DiamondJoseph Aug 15, 2024

barnettwilliam Aug 15, 2024

barnettwilliam Sep 27, 2024

codecov bot commented Sep 17, 2024

stan-dot commented Sep 27, 2024

barnettwilliam commented Sep 27, 2024

Pressure jump fast adc based on area detector #745

Are you sure you want to change the base?

Pressure jump fast adc based on area detector #745

Conversation

barnettwilliam commented Aug 13, 2024

Checks for reviewer

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Sep 17, 2024

Codecov Report

stan-dot commented Sep 27, 2024

barnettwilliam commented Sep 27, 2024