Skip to content

Select which BPMs to control in AcqBPMsSignals. #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fernandohds564 wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −5
Open

Select which BPMs to control in AcqBPMsSignals. #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions apsuite/commisslib/meas_bpms_signals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ class AcqBPMsSignals(_BaseClass):
BPM_TRIGGER = "SI-Fam:TI-BPM"
PSM_TRIGGER = "SI-Fam:TI-BPM-PsMtm"

def __init__(self, isonline=True, ispost_mortem=False):
def __init__(self, isonline=True, ispost_mortem=False, bpmnames=None):
"""."""
super().__init__(params=AcqBPMsSignalsParams(), isonline=isonline)
self._ispost_mortem = ispost_mortem

if self.isonline:
self.create_devices()
self.create_devices(bpmnames=bpmnames)

calc_positions_from_amplitudes = staticmethod(
FamBPMs.calc_positions_from_amplitudes)
Expand All @@ -122,11 +122,12 @@ def load_and_apply(self, fname: str):
self.data = data
return ret

def create_devices(self):
def create_devices(self, bpmnames=None):
"""."""
self.devices["currinfo"] = CurrInfoSI()
self.devices["fambpms"] = FamBPMs(
devname=FamBPMs.DEVICES.SI,
bpmnames=bpmnames,
ispost_mortem=self._ispost_mortem,
props2init="acq",
)
Expand Down
4 changes: 2 additions & 2 deletions apsuite/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class MeasBaseClass(DataBaseClass):

def __init__(self, params=None, isonline=True):
"""."""
super().__init__(params=params)
DataBaseClass.__init__(self, params=params)
self.isonline = bool(isonline)
self.devices = dict()
self.analysis = dict()
Expand Down Expand Up @@ -170,7 +170,7 @@ class ThreadedMeasBaseClass(MeasBaseClass):

def __init__(self, params=None, target=None, isonline=True):
"""."""
super().__init__(params=params, isonline=isonline)
MeasBaseClass.__init__(self, params=params, isonline=isonline)
self._target = target
self._stopevt = _Event()
self._finished = _Event()
Expand Down