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.

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

Update p38 to use device_factory #921

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

Update p38 to use device_factory #921

wants to merge 2 commits into from

Conversation

DiamondJoseph
Copy link
Contributor

Updates p38 beamline definition to use device_factory

Instructions to reviewer on how to test:

  1. Check p38 beamline can still connect with dodal connect test

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}

Copy link

codecov bot commented Nov 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.05%. Comparing base (cb7717c) to head (f8b08e0).

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #921      +/-   ##
==========================================
+ Coverage   96.04%   96.05%   +0.01%     
==========================================
  Files         136      136              
  Lines        5639     5656      +17     
==========================================
+ Hits         5416     5433      +17     
  Misses        223      223              

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

@stan-dot
Copy link
Contributor

dodal connect p38 fails but so it does on main, so it's a net improvement

Copy link
Contributor

@stan-dot stan-dot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better than main even if does not connect

@DiamondJoseph
Copy link
Contributor Author

DiamondJoseph commented Nov 26, 2024

Reveals #925 when trying to connect- connects to all non-sim devices

high_pressure_xray_cell: NotConnected:
    all_valves_control: NotConnected:
        fast_valve_control: NotConnected:
            5: NotConnected:
                open: TypeError: BL38P-EA-HPXC-01:V5:OPENSEQ with inferred datatype int cannot be coerced to ValveOpenSeqRequest
            6: NotConnected:
                open: TypeError: BL38P-EA-HPXC-01:V6:OPENSEQ with inferred datatype int cannot be coerced to ValveOpenSeqRequest
        valve_control: NotConnected:
            1: NotConnected:
                open: TypeError: BL38P-EA-HPXC-01:V1:OPENSEQ with inferred datatype int cannot be coerced to ValveOpenSeqRequest
            3: NotConnected:
                open: TypeError: BL38P-EA-HPXC-01:V3:OPENSEQ with inferred datatype int cannot be coerced to ValveOpenSeqRequest
    pressure_transducers: NotConnected:
        3: NotConnected:
            slow_beckhoff_voltage_readout: NotConnected: ca://BL38P-EA-ADC-03:CH1
ppump: NotConnected:
    direction: TypeError: Differing datatypes: BL38P-EA-PUMP-01:INFO:DIR has 0, BL38P-EA-PUMP-01:SET:DIR has 3
    state: TypeError: Differing choices: BL38P-EA-PUMP-01:INFO:RUN has ('STOPped', 'STARTed'), BL38P-EA-PUMP-01:SET:RUN has ('STOP', 'START')

@stan-dot @barnettwilliam can I leave this with you to resolve the ppump and hpxc?

d3, d12, i0 I am investigating, as they also do not connect

e: i0, it are both disconnected from the synoptic screen on p38: I can only assume the IOC has not been started up since power loss.

@stan-dot
Copy link
Contributor

ppump
idk where it is tbh

@stan-dot stan-dot mentioned this pull request Nov 27, 2024
4 tasks
@stan-dot
Copy link
Contributor

fixing this now

high_pressure_xray_cell: NotConnected:
    all_valves_control: NotConnected:
        fast_valve_control: NotConnected:
            5: NotConnected:
                open: TypeError: BL38P-EA-HPXC-01:V5:OPENSEQ with inferred datatype int cannot be coerced to ValveOpenSeqRequest
            6: NotConnected:
                open: TypeError: BL38P-EA-HPXC-01:V6:OPENSEQ with inferred datatype int cannot be coerced to ValveOpenSeqRequest
        valve_control: NotConnected:
            1: NotConnected:
                open: TypeError: BL38P-EA-HPXC-01:V1:OPENSEQ with inferred datatype int cannot be coerced to ValveOpenSeqRequest
            3: NotConnected:
                open: TypeError: BL38P-EA-HPXC-01:V3:OPENSEQ with inferred datatype int cannot be coerced to ValveOpenSeqRequest
    pressure_transducers: NotConnected:
        3: NotConnected:
            slow_beckhoff_voltage_readout: NotConnected: ca://BL38P-EA-ADC-03:CH1

@stan-dot
Copy link
Contributor

slits return not connected at the moment, even though they should be mocked

@stan-dot
Copy link
Contributor

I presume that the mock logic is not working for the slits

@stan-dot stan-dot marked this pull request as ready for review November 27, 2024 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants