bec/debye_bec
0
0
Fork 0
Code Issues 9 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix: formatting

Browse Source
This commit is contained in:
appel_c
2025-09-16 17:36:43 +02:00
parent 1d6caa2291
commit 190eae2c3f
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debye_bec/devices/ionization_chambers/ionization_chamber.py
View File

@@ -4,7 +4,6 @@ from __future__ import annotations
from typing import TYPE_CHECKING, Literal
from typeguard import typechecked
import numpy as np
from ophyd import Component as Cpt
from ophyd import Device
@@ -13,7 +12,7 @@ from ophyd import EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV
from ophyd.status import DeviceStatus, SubscriptionStatus
from ophyd_devices import CompareStatus, TransitionStatus
from ophyd_devices.interfaces.base_classes.psi_device_base import PSIDeviceBase
from typeguard import typechecked
from debye_bec.devices.ionization_chambers.ionization_chamber_enums import (
AmplifierEnable,
@@ -259,6 +258,7 @@ class IonizationChamber0(PSIDeviceBase):
else:
return status
class IonizationChamber1(IonizationChamber0):
"""Ionization Chamber 1, prefix should be 'X01DA-'."""

9
debye_bec/devices/mo1_bragg/mo1_bragg.py
View File

@@ -223,7 +223,7 @@ class Mo1Bragg(PSIDeviceBase, Mo1BraggPositioner):
status = CompareStatus(self.scan_control.scan_msg, ScanControlLoadMessage.SUCCESS)
self.cancel_on_stop(status)
self.scan_control.scan_load.put(1)
# Wait for params to be checked from controller
# Wait for params to be checked from controller
status.wait(self.timeout_for_pvwait)
return None
@@ -321,7 +321,7 @@ class Mo1Bragg(PSIDeviceBase, Mo1BraggPositioner):
status_list.append(self.scan_settings.s_scan_scantime.set(scan_time))
self.cancel_on_stop(status_list[-1])
for s in status_list:
s.wait(timeout=self.timeout_for_pvwait)
@@ -352,7 +352,7 @@ class Mo1Bragg(PSIDeviceBase, Mo1BraggPositioner):
status = CompareStatus(self.calculator.calc_done, 1)
self.cancel_on_stop(status)
status.wait(self.timeout_for_pvwait)
time.sleep(0.25) #TODO needed still? Needed due to update frequency of softIOC
time.sleep(0.25) # TODO needed still? Needed due to update frequency of softIOC
if mode == "AngleToEnergy":
return self.calculator.calc_energy.get()
elif mode == "EnergyToAngle":
@@ -407,7 +407,6 @@ class Mo1Bragg(PSIDeviceBase, Mo1BraggPositioner):
cycle_high: int,
exp_time: float,
n_of_trigger: int,
) -> None:
"""Set TRIG settings for the upcoming scan.
@@ -451,7 +450,6 @@ class Mo1Bragg(PSIDeviceBase, Mo1BraggPositioner):
for s in status_list:
s.wait(timeout=self.timeout_for_pvwait)
def set_scan_control_settings(self, mode: ScanControlMode, scan_duration: float) -> None:
"""Set the scan control settings for the upcoming scan.
@@ -472,7 +470,6 @@ class Mo1Bragg(PSIDeviceBase, Mo1BraggPositioner):
for s in status_list:
s.wait(timeout=self.timeout_for_pvwait)
def _update_scan_parameter(self):
"""Get the scan_info parameters for the scan."""
for key, value in self.scan_info.msg.request_inputs["inputs"].items():

12
debye_bec/devices/nidaq/nidaq.py
View File

@@ -302,17 +302,11 @@ class NidaqControl(Device):
SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 7. STD"
)
xas_timestamp = Cpt(
SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream XAS timestamp"
)
xas_timestamp = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream XAS timestamp")
xrd_timestamp = Cpt(
SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream XRD timestamp"
)
xrd_timestamp = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream XRD timestamp")
xrd_energy = Cpt(
SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream XRD energy"
)
xrd_energy = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream XRD energy")
di0_max = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream digital input 0, MAX")
di1_max = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream digital input 1, MAX")