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.

Sign up for GitHub

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

Jump to bottom

Add base AD PVs such as SDK, Firmware, Serial Number #1070

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add base AD PVs such as SDK, Firmware, Serial Number #1070

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ophyd/areadetector/cam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,12 @@ class CamBase(ADBase):
gain = ADCpt(SignalWithRBV, "Gain")

image_mode = ADCpt(SignalWithRBV, "ImageMode")

manufacturer = ADCpt(EpicsSignalRO, "Manufacturer_RBV")
model = ADCpt(EpicsSignalRO, "Model_RBV")
serial_number = ADCpt(EpicsSignalRO, "SerialNumber_RBV")
Copy link
Member

Choose a reason for hiding this comment

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

I believe these came in from AreaDetector R2-6: https://klauer.github.io/ad_compare/ (search for SerialNumber_RBV and check the first column that doesn't say 'no').

It's (probably) fine if ophyd starts assuming a newer version of AreaDetector than the ancient R1-9-1, but it should at least be a very prominent part of the release notes.

Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we could read the Signal for ADCoreVersion_RBV and then conditionally include functionality based on that? Though I agree that assuming newer than R1-9-1 going forward is probably OK

firmware_version = ADCpt(EpicsSignalRO, "FirmwareVersion_RBV")
sdk_version = ADCpt(EpicsSignalRO, "SDKVersion_RBV")

max_size = DDC(
ad_group(
Expand All @@ -118,7 +123,6 @@ class CamBase(ADBase):

min_x = ADCpt(SignalWithRBV, "MinX")
min_y = ADCpt(SignalWithRBV, "MinY")
model = ADCpt(EpicsSignalRO, "Model_RBV")

num_exposures = ADCpt(SignalWithRBV, "NumExposures")
num_exposures_counter = ADCpt(EpicsSignalRO, "NumExposuresCounter_RBV")
Expand Down