658 create device for pressure jump cell #673

barnettwilliam · 2024-07-15T17:00:52Z

closes #658
Ophyd device for pressure jump cell #658, required for pressure jump experiment.

Initial control PVs, TODO fast adc 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}

stan-dot

At the moment it's implemented as one large object hard to debug, should be split into components

src/dodal/beamlines/p38.py

src/dodal/devices/pressure_jump_cell.py

codecov · 2024-07-25T09:12:37Z

Codecov Report

Attention: Patch coverage is 98.62069% with 2 lines in your changes missing coverage. Please review.

Project coverage is 95.78%. Comparing base (ad6cc0d) to head (8bfd8ed).
Report is 1 commits behind head on main.

Files with missing lines	Patch %	Lines
src/dodal/devices/pressure_jump_cell.py	98.59%	2 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #673      +/-   ##
==========================================
+ Coverage   95.70%   95.78%   +0.07%     
==========================================
  Files         132      133       +1     
  Lines        5334     5479     +145     
==========================================
+ Hits         5105     5248     +143     
- Misses        229      231       +2

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

src/dodal/devices/pressure_jump_cell.py

DiamondJoseph · 2024-07-30T12:37:48Z

src/dodal/devices/pressure_jump_cell.py

+            self.pump_forward_limit = epics_signal_r(
+                LimitSwitchState, prefix + "D74IN1"
+            )
+            self.pump_backward_limit = epics_signal_r(
+                LimitSwitchState, prefix + "D74IN0"
+            )


Are the limits settable and required to be Read signals or are they read-once Config signals?

how to check that?

They're epics_signal_r read only from the ophyd layer, which means they're read-only from the ophyd layer. They could be derived from other signals, and therefore changing on the rate of every point of a scan, but I would infer from the name that they are hardware limits that don't change over the lifetime of the device, let alone within a scan. I would make them config signals.

These signals are the state of limit switches for the pump so they will change during a scan if the pump is driven for a some length of time (approx 50s) in one direction. The name could be improved to pump_..._limit_state

src/dodal/devices/pressure_jump_cell.py

stan-dot

some small bits

src/dodal/devices/pressure_jump_cell.py

DiamondJoseph · 2024-08-19T12:48:29Z

src/dodal/devices/pressure_jump_cell.py

+            self.pump_forward_limit = epics_signal_r(
+                LimitSwitchState, prefix + "D74IN1"
+            )
+            self.pump_backward_limit = epics_signal_r(
+                LimitSwitchState, prefix + "D74IN0"
+            )


They're epics_signal_r read only from the ophyd layer, which means they're read-only from the ophyd layer. They could be derived from other signals, and therefore changing on the rate of every point of a scan, but I would infer from the name that they are hardware limits that don't change over the lifetime of the device, let alone within a scan. I would make them config signals.

src/dodal/devices/pressure_jump_cell.py

* Pressure jump cell removed manual pump control enums. * Grouped valve open and close PVs under valve control. * Pressure jump cell updated set_valve to use ValveControl. * Pressure jump cell fixed index error on setting ValveOpenSeq value and updated pressure transducer tests to match current naming. * Pressure jump cell mapped open to open_seq in set_valve to simplify interface. * Pressure jump cell set valve open requests to inactive after OPENSEQ_PULSE_LENGTH delay.

out of date

DiamondJoseph

Approval conditional on it connects with dodal connect p38 and the prefix is right for both devices, I'm happy to check tomorrow but no time today

DiamondJoseph · 2024-11-14T15:46:43Z

src/dodal/beamlines/p38.py

@@ -312,7 +313,7 @@ def linkam(
    return device_instantiation(
        Linkam3,
        "linkam",
-        "-EA-LINKM-02:",
+        f"{BeamlinePrefix(BL).insertion_prefix}-EA-LINKM-02:",


While device_factory is reverted, this isn't going to work and is unrelated: it'll cause merge issues when that change goes back in, so let's revert it for now.

Suggested change

f"{BeamlinePrefix(BL).insertion_prefix}-EA-LINKM-02:",

"-EA-LINKM-02:",

barnettwilliam requested a review from stan-dot July 15, 2024 17:00

barnettwilliam self-assigned this Jul 15, 2024

barnettwilliam force-pushed the 658-pressure-jump-cell branch from 92f4c0a to 0d07c25 Compare July 17, 2024 09:52

stan-dot suggested changes Jul 17, 2024

View reviewed changes

src/dodal/beamlines/p38.py Outdated Show resolved Hide resolved

src/dodal/devices/pressure_jump_cell.py Outdated Show resolved Hide resolved

src/dodal/devices/pressure_jump_cell.py Outdated Show resolved Hide resolved

DominicOram reviewed Jul 23, 2024

View reviewed changes

src/dodal/devices/pressure_jump_cell.py Outdated Show resolved Hide resolved

DominicOram reviewed Jul 23, 2024

View reviewed changes

src/dodal/devices/pressure_jump_cell.py Outdated Show resolved Hide resolved

barnettwilliam force-pushed the 658-pressure-jump-cell branch from 0d07c25 to 803b90a Compare July 25, 2024 09:09

stan-dot force-pushed the 658-pressure-jump-cell branch from 07522bb to 431887c Compare July 30, 2024 11:25

stan-dot marked this pull request as ready for review July 30, 2024 12:21

stan-dot requested review from DiamondJoseph and d-perl July 30, 2024 12:30

DiamondJoseph reviewed Jul 30, 2024

View reviewed changes

stan-dot force-pushed the 658-pressure-jump-cell branch from 7af5a66 to a6b8c74 Compare July 30, 2024 17:25

stan-dot suggested changes Jul 31, 2024

View reviewed changes

src/dodal/devices/pressure_jump_cell.py Outdated Show resolved Hide resolved

src/dodal/devices/pressure_jump_cell.py Outdated Show resolved Hide resolved

stan-dot mentioned this pull request Jul 31, 2024

Unify p38 and i22, swap out with env variables #678

Closed

4 tasks

stan-dot force-pushed the 658-pressure-jump-cell branch from 36c2344 to a91272f Compare August 16, 2024 12:57

stan-dot mentioned this pull request Aug 16, 2024

87 small test plan for the pressure cell alone DiamondLightSource/i22-bluesky#93

Merged

stan-dot requested review from stan-dot, DiamondJoseph, callumforrester and DominicOram and removed request for stan-dot August 16, 2024 15:24

DiamondJoseph requested changes Aug 19, 2024

View reviewed changes

stan-dot force-pushed the 658-pressure-jump-cell branch 2 times, most recently from 1ce82ad to 7567b94 Compare August 22, 2024 09:06

stan-dot requested a review from DiamondJoseph August 22, 2024 11:03

DiamondJoseph previously requested changes Aug 23, 2024

View reviewed changes

stan-dot force-pushed the 658-pressure-jump-cell branch 2 times, most recently from 4a7b253 to cadd4d2 Compare August 27, 2024 10:16

barnettwilliam and others added 20 commits November 14, 2024 13:56

Define pressure jump adc numbering in constructor.

623207c

Minor formatting fixes.

e0b266e

Pressure jump cell corrected enums extend str and Enum

d8d3bd4

Pressure jump cell removed empty enum values.

61bd8cf

use devicevector

e6610ef

change names

4d253bb

adapt the tests to the changes

52f94f8

forgot to delete the not used device

bc1205b

Cell connected following testing in P38

51aaf3e

respond to feedback

c638ac3

fix test

75aae6d

pressure jump cell ready reviewed

6f2b9d5

adapt pressure jump cell tests

d48f831

ruff

9835b8c

chane pressure controller prefix logic

f2c7296

respond to feedback

67f93aa

pjump cell add prefix to initalize correctly

d1a3776

adapt pressure jumpt to use the clear prefix

6387004

Update pressure_jump_cell.py to use snake_case

1ed5229

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

stan-dot added 3 commits November 14, 2024 13:57

lint

830fd87

fix imports

773843d

fix pressure jump cell

8bfd8ed

stan-dot self-requested a review November 14, 2024 14:31

DiamondJoseph approved these changes Nov 14, 2024

View reviewed changes

stan-dot merged commit 82d6afc into main Nov 14, 2024
19 checks passed

stan-dot deleted the 658-pressure-jump-cell branch November 14, 2024 16:39

	f"{BeamlinePrefix(BL).insertion_prefix}-EA-LINKM-02:",
	"-EA-LINKM-02:",

658 create device for pressure jump cell #673

658 create device for pressure jump cell #673

Uh oh!

Conversation

barnettwilliam commented Jul 15, 2024 • edited by stan-dot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checks for reviewer

Uh oh!

stan-dot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Jul 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

DiamondJoseph Jul 30, 2024

Choose a reason for hiding this comment

Uh oh!

stan-dot Jul 30, 2024

Choose a reason for hiding this comment

Uh oh!

DiamondJoseph Aug 19, 2024

Choose a reason for hiding this comment

Uh oh!

barnettwilliam Aug 21, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stan-dot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

DiamondJoseph Aug 19, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DiamondJoseph left a comment

Choose a reason for hiding this comment

Uh oh!

DiamondJoseph Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

barnettwilliam commented Jul 15, 2024 •

edited by stan-dot

Loading

codecov bot commented Jul 25, 2024 •

edited

Loading