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

Making ExitSlits subclass with FDQ component, only for SL1K2 for now #1307

Merged
merged 8 commits into from
Dec 12, 2024
Merged

Making ExitSlits subclass with FDQ component, only for SL1K2 for now #1307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d978492
Making ExitSlits subclass with FDQ component, only for SL1K2 for now
Nov 13, 2024
bbd38fd
Addings urn
Nov 13, 2024
7cb05da
Merge branch 'master' into sl1k2
KaushikMalapati Nov 13, 2024
7e4ec36
Merge branch 'master' into sl1k2
KaushikMalapati Dec 4, 2024
65a107b
Adding docstring
Dec 5, 2024
d922f9f
Merge branch 'master' into sl1k2
ZLLentz Dec 5, 2024
a48ff54
Adding FDQ to ExitSlits directly instead of subclassing
Dec 12, 2024
88304ba
Merge branch 'master' into sl1k2
KaushikMalapati Dec 12, 2024
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
30 changes: 30 additions & 0 deletions docs/source/upcoming_release_notes/1307-ExitSlits_With_FDQ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
1307 ExitSlits_With_FDQ
#################

API Breaks
----------
- N/A

Library Features
----------------
- N/A

Device Features
---------------
- Adding an FDQ component to ExitSlits

New Devices
-----------
- N/A

Bugfixes
--------
- N/A

Maintenance
-----------
- N/A

Contributors
------------
- KaushikMalapati
5 changes: 5 additions & 0 deletions pcdsdevices/slits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from ophyd.status import Status
from ophyd.status import wait as status_wait

from .analog_signals import FDQ
from .areadetector.detectors import PCDSAreaDetectorTyphosTrigger
from .device import GroupDevice
from .device import UpdateComponent as UpCpt
Expand Down Expand Up @@ -688,6 +689,10 @@ class ExitSlits(BaseInterface, GroupDevice, LightpathInOutCptMixin):
doc='Thermocouple on the Heat Sync.'
)
set_metadata(cam_power, dict(variety='command-enum'))
flow_meter = Cpt(
FDQ, '', kind='normal',
doc='Device that measures PCW Flow Rate.'
)

@property
def y_states(self):
Expand Down