Skip to content

Commit

Permalink
Merge pull request #1130 from ZLLentz/rel_v7.3.0
Browse files Browse the repository at this point in the history
REL: v7.3.0
  • Loading branch information
ZLLentz authored Apr 17, 2023
2 parents 6e8b1c8 + 93ee4c2 commit f891ad4
Show file tree
Hide file tree
Showing 5 changed files with 142 additions and 113 deletions.
140 changes: 120 additions & 20 deletions docs/source/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ pcdsdevices.areadetector.detectors
pcdsdevices.areadetector.detectors.Basler
pcdsdevices.areadetector.detectors.BaslerBase
pcdsdevices.areadetector.detectors.LasBasler
pcdsdevices.areadetector.detectors.LasBaslerFF
pcdsdevices.areadetector.detectors.LasBaslerNF
pcdsdevices.areadetector.detectors.PCDSAreaDetector
pcdsdevices.areadetector.detectors.PCDSAreaDetectorBase
pcdsdevices.areadetector.detectors.PCDSAreaDetectorEmbedded
Expand Down Expand Up @@ -72,25 +74,31 @@ pcdsdevices.atm
pcdsdevices.atm.TM1K4Target
pcdsdevices.atm.TM2K2
pcdsdevices.atm.TM2K2Target
pcdsdevices.atm.TM2K4
pcdsdevices.atm.TM2K4Target

pcdsdevices.attenuator
----------------------

.. autosummary::
:toctree: generated

pcdsdevices.attenuator.AT1K2
pcdsdevices.attenuator.AT1K4
pcdsdevices.attenuator.AT2K2
pcdsdevices.attenuator.AT2L0
pcdsdevices.attenuator.AttBase
pcdsdevices.attenuator.AttBaseWith3rdHarmonic
pcdsdevices.attenuator.AttBaseWith3rdHarmonicLP
pcdsdevices.attenuator.Attenuator
pcdsdevices.attenuator.AttenuatorCalculatorBase
pcdsdevices.attenuator.AttenuatorCalculatorFilter
pcdsdevices.attenuator.AttenuatorCalculatorSXR_Blade
pcdsdevices.attenuator.AttenuatorCalculatorSXR_FourBlade
pcdsdevices.attenuator.AttenuatorCalculatorSXR_TwoBlade
pcdsdevices.attenuator.AttenuatorCalculator_AT2L0
pcdsdevices.attenuator.AttenuatorSXR_Ladder
pcdsdevices.attenuator.AttenuatorSXR_LadderTwoBladeLBD
pcdsdevices.attenuator.FEESolidAttenuatorBlade
pcdsdevices.attenuator.FEESolidAttenuatorStates
pcdsdevices.attenuator.FeeAtt
Expand All @@ -111,7 +119,12 @@ pcdsdevices.beam_stats
:toctree: generated

pcdsdevices.beam_stats.BeamEnergyRequest
pcdsdevices.beam_stats.BeamEnergyRequestACRWait
pcdsdevices.beam_stats.BeamEnergyRequestNoWait
pcdsdevices.beam_stats.BeamStats
pcdsdevices.beam_stats.FakeBeamEnergyRequest
pcdsdevices.beam_stats.FakeBeamEnergyRequestACRWait
pcdsdevices.beam_stats.FakeBeamEnergyRequestNoWait
pcdsdevices.beam_stats.LCLS

pcdsdevices.ccm
Expand Down Expand Up @@ -256,8 +269,31 @@ pcdsdevices.evr
.. autosummary::
:toctree: generated

pcdsdevices.evr.EvrMotor
pcdsdevices.evr.Trigger

pcdsdevices.fms
---------------

.. autosummary::
:toctree: generated

pcdsdevices.fms.LCP1
pcdsdevices.fms.LCP2
pcdsdevices.fms.PDU_Humidity2
pcdsdevices.fms.PDU_Humidity4
pcdsdevices.fms.PDU_Humidity6
pcdsdevices.fms.PDU_Humidity8
pcdsdevices.fms.PDU_Load1
pcdsdevices.fms.PDU_Load2
pcdsdevices.fms.PDU_Load3
pcdsdevices.fms.PDU_Load4
pcdsdevices.fms.PDU_Temp2
pcdsdevices.fms.PDU_Temp4
pcdsdevices.fms.PDU_Temp6
pcdsdevices.fms.PDU_Temp8
pcdsdevices.fms.Setra5000

pcdsdevices.gauge
-----------------

Expand Down Expand Up @@ -311,6 +347,7 @@ pcdsdevices.inout
pcdsdevices.inout.InOutPVStatePositioner
pcdsdevices.inout.InOutPositioner
pcdsdevices.inout.InOutRecordPositioner
pcdsdevices.inout.LightpathInOutRecordPositioner
pcdsdevices.inout.Reflaser
pcdsdevices.inout.TTReflaser
pcdsdevices.inout.TwinCATInOutPositioner
Expand All @@ -323,8 +360,9 @@ pcdsdevices.interface

pcdsdevices.interface.BaseInterface
pcdsdevices.interface.FltMvInterface
pcdsdevices.interface.LightpathInOutMixin
pcdsdevices.interface.LegacyLightpathMixin
pcdsdevices.interface.LightpathInOutCptMixin
pcdsdevices.interface.LightpathInOutMixin
pcdsdevices.interface.LightpathMixin
pcdsdevices.interface.MvInterface
pcdsdevices.interface.TabCompletionHelperClass
Expand Down Expand Up @@ -390,13 +428,15 @@ pcdsdevices.lasers.btps
.. autosummary::
:toctree: generated

pcdsdevices.lasers.btps.BtpsSourceStatus
pcdsdevices.lasers.btps.BtpsState
pcdsdevices.lasers.btps.BtpsVGC
pcdsdevices.lasers.btps.CentroidConfig
pcdsdevices.lasers.btps.DestinationConfig
pcdsdevices.lasers.btps.GlobalConfig
pcdsdevices.lasers.btps.LssShutterStatus
pcdsdevices.lasers.btps.RangeComparison
pcdsdevices.lasers.btps.ShutterSafety
pcdsdevices.lasers.btps.SourceConfig
pcdsdevices.lasers.btps.SourceToDestinationConfig

pcdsdevices.lasers.counters
---------------------------
Expand Down Expand Up @@ -452,6 +492,11 @@ pcdsdevices.lasers.rfof

pcdsdevices.lasers.rfof.CycleRfofRx
pcdsdevices.lasers.rfof.CycleRfofTx
pcdsdevices.lasers.rfof.ItechRfofAll
pcdsdevices.lasers.rfof.ItechRfofErrors
pcdsdevices.lasers.rfof.ItechRfofRx
pcdsdevices.lasers.rfof.ItechRfofStatus
pcdsdevices.lasers.rfof.ItechRfofTx

pcdsdevices.lasers.thorlabsWFS
------------------------------
Expand Down Expand Up @@ -500,6 +545,14 @@ pcdsdevices.lic
pcdsdevices.lic.LICMirror
pcdsdevices.lic.LaserInCoupling

pcdsdevices.light_control
-------------------------

.. autosummary::
:toctree: generated

pcdsdevices.light_control.LightControl

pcdsdevices.lodcm
-----------------

Expand All @@ -525,6 +578,8 @@ pcdsdevices.lodcm
pcdsdevices.lodcm.SimFirstTower
pcdsdevices.lodcm.SimLODCM
pcdsdevices.lodcm.SimSecondTower
pcdsdevices.lodcm.XCSLODCM
pcdsdevices.lodcm.XPPLODCM
pcdsdevices.lodcm.Y1
pcdsdevices.lodcm.Y2
pcdsdevices.lodcm.YagLom
Expand All @@ -545,18 +600,38 @@ pcdsdevices.lxe
pcdsdevices.lxe._ScaledUnitConversionDerivedSignal
pcdsdevices.lxe.load_calibration_file

pcdsdevices.make_ophyd_device
-----------------------------

.. autosummary::
:toctree: generated

pcdsdevices.make_ophyd_device.flatten_list
pcdsdevices.make_ophyd_device.get_components
pcdsdevices.make_ophyd_device.make_class
pcdsdevices.make_ophyd_device.make_class_line
pcdsdevices.make_ophyd_device.make_class_name
pcdsdevices.make_ophyd_device.make_cpt
pcdsdevices.make_ophyd_device.make_signal
pcdsdevices.make_ophyd_device.make_signal_wrbv
pcdsdevices.make_ophyd_device.print_class
pcdsdevices.make_ophyd_device.recurse_record
pcdsdevices.make_ophyd_device.write_file

pcdsdevices.mirror
------------------

.. autosummary::
:toctree: generated

pcdsdevices.mirror.CoatingState
pcdsdevices.mirror.FFMirror
pcdsdevices.mirror.FFMirrorZ
pcdsdevices.mirror.Gantry
pcdsdevices.mirror.KBOMirror
pcdsdevices.mirror.KBOMirrorHE
pcdsdevices.mirror.KBOMirrorHEStates
pcdsdevices.mirror.KBOMirrorStates
pcdsdevices.mirror.MirrorInsertState
pcdsdevices.mirror.OMMotor
pcdsdevices.mirror.OffsetMirror
pcdsdevices.mirror.OpticsPitchNotepad
Expand All @@ -567,15 +642,9 @@ pcdsdevices.mirror
pcdsdevices.mirror.XOffsetMirrorBend
pcdsdevices.mirror.XOffsetMirrorRTDs
pcdsdevices.mirror.XOffsetMirrorState
pcdsdevices.mirror.XOffsetMirrorStateCool
pcdsdevices.mirror.XOffsetMirrorSwitch

pcdsdevices.misc
----------------

.. autosummary::
:toctree: generated

pcdsdevices.misc.MyDevice2
pcdsdevices.mirror.XOffsetMirrorXYState

pcdsdevices.movablestand
------------------------
Expand Down Expand Up @@ -632,14 +701,6 @@ pcdsdevices.mrco_motion

pcdsdevices.mrco_motion.MRCO

pcdsdevices.my_device
---------------------

.. autosummary::
:toctree: generated

pcdsdevices.my_device.MyDevice

pcdsdevices.piezo
-----------------

Expand Down Expand Up @@ -678,6 +739,14 @@ pcdsdevices.pmps

pcdsdevices.pmps.TwinCATStatePMPS

pcdsdevices.pneumatic
---------------------

.. autosummary::
:toctree: generated

pcdsdevices.pneumatic.BeckhoffPneumatic

pcdsdevices.positioner
----------------------

Expand Down Expand Up @@ -745,6 +814,14 @@ pcdsdevices.pv_positioner
pcdsdevices.pv_positioner.PVPositionerDone
pcdsdevices.pv_positioner.PVPositionerIsClose

pcdsdevices.radiation
---------------------

.. autosummary::
:toctree: generated

pcdsdevices.radiation.HPI6030

pcdsdevices.ref
---------------

Expand All @@ -754,6 +831,15 @@ pcdsdevices.ref
pcdsdevices.ref.ReflaserL2SI
pcdsdevices.ref.ReflaserL2SIMirror

pcdsdevices.rs_powersupply
--------------------------

.. autosummary::
:toctree: generated

pcdsdevices.rs_powersupply.RSChannel
pcdsdevices.rs_powersupply.RohdeSchwarzPowerSupply

pcdsdevices.rtds_ebd
--------------------

Expand All @@ -764,6 +850,7 @@ pcdsdevices.rtds_ebd
pcdsdevices.rtds_ebd.RTDSBase
pcdsdevices.rtds_ebd.RTDSK0
pcdsdevices.rtds_ebd.RTDSL0
pcdsdevices.rtds_ebd.RTDSX0ThreeStage

pcdsdevices.sample_delivery
---------------------------
Expand Down Expand Up @@ -831,6 +918,7 @@ pcdsdevices.signal
pcdsdevices.signal.PytmcSignalRO
pcdsdevices.signal.PytmcSignalRW
pcdsdevices.signal.SignalEditMD
pcdsdevices.signal.SummarySignal
pcdsdevices.signal.UnitConversionDerivedSignal
pcdsdevices.signal._OptionalEpicsSignal
pcdsdevices.signal.pytmc_writable
Expand Down Expand Up @@ -873,6 +961,8 @@ pcdsdevices.spectrometer
.. autosummary::
:toctree: generated

pcdsdevices.spectrometer.Gen1VonHamos4Crystal
pcdsdevices.spectrometer.Gen1VonHamosCrystal
pcdsdevices.spectrometer.HXRSpectrometer
pcdsdevices.spectrometer.Kmono
pcdsdevices.spectrometer.Mono
Expand Down Expand Up @@ -949,6 +1039,14 @@ pcdsdevices.timetool
pcdsdevices.timetool.Timetool
pcdsdevices.timetool.TimetoolWithNav

pcdsdevices.usb_encoder
-----------------------

.. autosummary::
:toctree: generated

pcdsdevices.usb_encoder.UsDigitalUsbEncoder

pcdsdevices.utils
-----------------

Expand Down Expand Up @@ -985,6 +1083,8 @@ pcdsdevices.valve

pcdsdevices.valve.GateValve
pcdsdevices.valve.VCN
pcdsdevices.valve.VCN_VAT590
pcdsdevices.valve.VCN_VAT590_Status
pcdsdevices.valve.VFS
pcdsdevices.valve.VGC
pcdsdevices.valve.VGCLegacy
Expand Down
22 changes: 22 additions & 0 deletions docs/source/releases.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
Release History
###############

v7.3.0 (2023-04-17)
===================

Device Updates
--------------
- LODCM: Add energy setpoint and tweakXC.
- LODCM: fix energy functionality and add commonly used aliases.
- LasBasler: Add a new signal that can be used to auto-configure a camera based on an internal dictionary.

New Devices
-----------
- PCDSAreaDetectorTyphos class: Add in signals for camera binning and region size control.
- LasBaslerNF: A Basler camera intended to be used as a near-field diagnostic.
- LasBaslerFF: A Basler camera intended to be used as a far-field diagnostic.

Contributors
------------
- slactjohnson
- tangkong
- vespos
- zllentz


v7.2.0 (2023-04-04)
===================
Expand Down
32 changes: 0 additions & 32 deletions docs/source/upcoming_release_notes/1095-lodcm_energy.rst

This file was deleted.

Loading

0 comments on commit f891ad4

Please sign in to comment.