Merge branch 'master' of https://github.com/BCDA-APS/apstools

Author: prjemian

CHANGES.rst

@@ -4,7 +4,21 @@
 Change History
 ##############
 
-:1.1.15:  expected by *tba* : 
+:1.1.16:  expected by *tba* : 
+
+:1.1.15:  expected by *2019-11-29* : bug fixes
+
+    * `#259 <https://github.com/prjemian/spec2nexus/issues/259>`_
+       resolve AssertionError from setup_lorentzian_swait
+
+    * `#258 <https://github.com/prjemian/spec2nexus/issues/258>`_
+       swait record does not units, some other fields
+
+    * `#255 <https://github.com/prjemian/spec2nexus/issues/255>`_
+       plans: resolve indentation error
+
+    * `#252 <https://github.com/prjemian/spec2nexus/issues/252>`_
+       synApps: add asyn record support
 
 :1.1.14:  released *2019-09-03* : bug fixes, more synApps support
 

apstools/devices.py

@@ -6,6 +6,7 @@
 
 .. autosummary::
    
+    ~ApsCycleComputedRO
     ~ApsMachineParametersDevice
     ~ApsPssShutter
     ~ApsPssShutterWithStatus
@@ -129,6 +130,7 @@
 from ophyd import Signal, EpicsMotor, EpicsSignal, EpicsSignalRO
 from ophyd.mca import EpicsMCARecord
 from ophyd.scaler import EpicsScaler, ScalerCH
+from ophyd.sim import SignalRO
 
 from ophyd.areadetector.filestore_mixins import FileStoreBase
 from ophyd.areadetector.filestore_mixins import FileStorePluginBase
@@ -174,6 +176,23 @@ def use_EPICS_scaler_channels(scaler):
         scaler.channels.configuration_attrs = configuration_attrs
 
 
+class ApsCycleComputedRO(SignalRO):
+    """
+    compute the APS cycle name based on the calendar and the usual practice
+
+    Absent any facility PV that provides the name of the current operating 
+    cycle, this can be approximated by python computation (as long as the 
+    present scheduling pattern is maintained)
+
+    This signal is read-only.
+    """
+
+    def get(self):
+        dt = datetime.now()
+        aps_cycle = f"{dt.year}-{int((dt.month-0.1)/4) + 1}"
+        return aps_cycle
+
+
 class ApsOperatorMessagesDevice(Device):
     """general messages from the APS main control room"""
     operators = Component(EpicsSignalRO, "OPS:message1", string=True)
@@ -218,6 +237,7 @@ class ApsMachineParametersDevice(Device):
     """
     current = Component(EpicsSignalRO, "S:SRcurrentAI")
     lifetime = Component(EpicsSignalRO, "S:SRlifeTimeHrsCC")
+    aps_cycle = Component(ApsCycleComputedRO)
     machine_status = Component(EpicsSignalRO, "S:DesiredMode", string=True)
     # In [3]: APS.machine_status.enum_strs
     # Out[3]: 

apstools/plans.py

@@ -78,7 +78,7 @@ def addDeviceDataAsStream(devices, label):
         devices = [devices]
     for d in devices:
         yield from bps.read(d)
-        yield from bps.save()
+    yield from bps.save()
 
 
 def execute_command_list(filename, commands, md={}):

apstools/synApps/swait.py

@@ -46,6 +46,7 @@
     DynamicDeviceComponent as DDC,
     FormattedComponent as FC)
 from ophyd import EpicsSignal, Signal
+from ophyd.signal import EpicsSignalBase
 
 from ._common import EpicsRecordDeviceCommonAll, EpicsRecordFloatFields
 from .. import utils as APS_utils
@@ -90,7 +91,7 @@ def _swait_channels(channel_list):
     return defn
 
 
-class SwaitRecord(EpicsRecordFloatFields, EpicsRecordDeviceCommonAll):
+class SwaitRecord(EpicsRecordDeviceCommonAll):
     """
     synApps swait record: used as $(P):userCalc$(N)
 
@@ -99,6 +100,10 @@ class SwaitRecord(EpicsRecordFloatFields, EpicsRecordDeviceCommonAll):
         ~reset
 
     """
+    precision = Cpt(EpicsSignal, ".PREC")
+    high_operating_range = Cpt(EpicsSignal, ".HOPR")
+    low_operating_range = Cpt(EpicsSignal, ".LOPR")
+
     calculated_value = Cpt(EpicsSignal, ".VAL")
     calculation = Cpt(EpicsSignal, ".CALC")
 
@@ -224,7 +229,7 @@ def _setup_peak_swait_(calc, desc, swait, ref_signal, center=0, width=1, scale=1
     """
     # consider a noisy background, as well (needs a couple calcs)
     assert(isinstance(swait, SwaitRecord))
-    assert(isinstance(ref_signal, Signal))
+    assert(isinstance(ref_signal, EpicsSignalBase))
     assert(width > 0)
     assert(0.0 <= noise <= 1.0)
     swait.reset()