refactor(falcon): bugfix from beamlines
This commit is contained in:
@@ -24,9 +24,8 @@ class FalconAcquiringStatus(int, enum.Enum):
|
|||||||
class DeadTimeCorrectedSignal(SignalRO):
|
class DeadTimeCorrectedSignal(SignalRO):
|
||||||
"""Signal for dead time corrected counts."""
|
"""Signal for dead time corrected counts."""
|
||||||
|
|
||||||
def __init__(self, *args, parent: Device | None = None, **kwargs):
|
def __init__(self, name:str, *args, parent: Device | None = None, **kwargs):
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(name=name,*args, parent=parent,**kwargs)
|
||||||
self.parent = parent
|
|
||||||
self._dead_time = 1.182e-7 # Dead time in seconds
|
self._dead_time = 1.182e-7 # Dead time in seconds
|
||||||
|
|
||||||
def get(self, **kwargs) -> float | None:
|
def get(self, **kwargs) -> float | None:
|
||||||
@@ -112,7 +111,7 @@ class FalconControl(Device):
|
|||||||
# Configuration attributes
|
# Configuration attributes
|
||||||
collect_mode: EpicsSignal = Cpt(EpicsSignal, "CollectMode", doc="Collect mode signal")
|
collect_mode: EpicsSignal = Cpt(EpicsSignal, "CollectMode", doc="Collect mode signal")
|
||||||
preset_real_time: EpicsSignal = Cpt(
|
preset_real_time: EpicsSignal = Cpt(
|
||||||
EpicsSignal, "PresetRealTime", doc="Preset real time signal"
|
EpicsSignal, "PresetReal", doc="Preset real time signal"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Preview Signal for Falcon detector
|
# Preview Signal for Falcon detector
|
||||||
@@ -121,14 +120,12 @@ class FalconControl(Device):
|
|||||||
name="spectrum",
|
name="spectrum",
|
||||||
ndim=1,
|
ndim=1,
|
||||||
kind=Kind.omitted,
|
kind=Kind.omitted,
|
||||||
auto_monitor=True,
|
|
||||||
doc="Preview signal for Falcon detector spectrum",
|
doc="Preview signal for Falcon detector spectrum",
|
||||||
)
|
)
|
||||||
|
|
||||||
# Computed signal for dead time corrected counts
|
# Computed signal for dead time corrected counts
|
||||||
dead_cor_roi0_count = Cpt(
|
dead_cor_roi0_count = Cpt(
|
||||||
DeadTimeCorrectedSignal,
|
DeadTimeCorrectedSignal,
|
||||||
name="dead_cor_roi0_count",
|
|
||||||
kind=Kind.hinted,
|
kind=Kind.hinted,
|
||||||
doc="Dead time corrected ROI 0 count",
|
doc="Dead time corrected ROI 0 count",
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user