Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apsuite/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.61.0
2.61.1
6 changes: 4 additions & 2 deletions apsuite/commisslib/meas_bpms_signals.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,10 @@ def get_data(self):
data["trig_delay_raw"] = self.devices["trigbpm"].delay_raw
data["switching_mode"] = bpm0.switching_mode_str
data["switching_frequency"] = fbpms.get_switching_frequency(rf_freq)
data["tunex_enable"] = tune.enablex
data["tuney_enable"] = tune.enabley
data["tunex_acq_enable"] = tune.acquisition_enabledx
data["tuney_acq_enable"] = tune.acquisition_enabledy
data["tunex_exc_enable"] = tune.excitation_enabledx
data["tuney_exc_enable"] = tune.excitation_enabledy
return data

@staticmethod
Expand Down
4 changes: 2 additions & 2 deletions apsuite/commisslib/meas_touschek_lifetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -752,8 +752,8 @@ def _do_measure(self):
tune = self.devices['tune']
bpm = self.devices[parms.bpm_name]
bpm.cmd_sync_tbt() # Sync TbT BPM acquisition
excx0 = tune.enablex
excy0 = tune.enabley
excx0 = tune.excitation_enabledx
excy0 = tune.excitation_enabledy
# Ensures that tune excitation is off before measurement.
tune.cmd_disablex()
tune.cmd_disabley()
Expand Down
2 changes: 1 addition & 1 deletion apsuite/commisslib/turnoff_correctors.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def _do_process(self):
"""
tune, tunecorr = self.devices['tune'], self.devices['tunecorr']
sofb, prms = self.devices['sofb'], self.params
excx0, excy0 = tune.enablex, tune.enabley
excx0, excy0 = tune.excitation_enabledx, tune.excitation_enabledy
if not excx0:
tune.cmd_enablex()
_time.sleep(prms.wait_tunecorr)
Expand Down