-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1199 from nrwslac/cooling-updates-fdq
Add flow sensor to devices
- Loading branch information
Showing
7 changed files
with
92 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
1199 cool-updates | ||
################# | ||
|
||
API Breaks | ||
---------- | ||
- N/A | ||
|
||
Features | ||
-------- | ||
- N/A | ||
|
||
Device Updates | ||
-------------- | ||
- in `atm.py` add `flow_meter` to `ArrivalTimeMonitor` | ||
- in `attenuator.py` add `flow_meter` to `AttenuatorSXR_Ladder` | ||
- in `attenuator.py` add `flow_meter` to `AttenuatorSXR_LadderTwoBladeLBD` | ||
- in `device_types.py` add `WaveFrontSensorTargetCool` , `WaveFrontSensorTargetFDQ` | ||
- in `mirror.py` add flow sensor variable to `FFMirror` | ||
|
||
New Devices | ||
----------- | ||
- add class `PhotonCollimator` to readout `flow_switch` in new module `pc.py` | ||
- add class `WaveFrontSensorTargetFDQ` to read out `flow_meter` | ||
- add class `MFXATM` in `atm.py` | ||
|
||
Bugfixes | ||
-------- | ||
- N/A | ||
|
||
Maintenance | ||
----------- | ||
- N/A | ||
|
||
Contributors | ||
------------ | ||
- nrwslac |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
""" | ||
Module for all device related to Photon Collimators. | ||
""" | ||
from ophyd import Component as Cpt | ||
from ophyd import Device | ||
|
||
from .digital_signals import J120K | ||
|
||
|
||
class PhotonCollimator(Device): | ||
""" | ||
Photon Collimator Stub for Cooling Readback | ||
""" | ||
flow_switch = Cpt(J120K, '', kind='normal', | ||
doc='Device that indicates nominal PCW Flow Rate.') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters