Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Apr 5, 2024
1 parent 76099c9 commit ff96376
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 80 deletions.
77 changes: 27 additions & 50 deletions linien-common/linien_common/communication.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,86 +39,63 @@


class LinienControlService(Protocol):
def exposed_get_server_version(self) -> str:
...
def exposed_get_server_version(self) -> str: ...

def exposed_get_param(self, param_name: str) -> bytes:
...
def exposed_get_param(self, param_name: str) -> bytes: ...

def exposed_set_param(self, param_name: str, value: bytes) -> None:
...
def exposed_set_param(self, param_name: str, value: bytes) -> None: ...

def exposed_reset_param(self, param_name: str) -> None:
...
def exposed_reset_param(self, param_name: str) -> None: ...

def exposed_init_parameter_sync(
self, uuid: str
) -> List[Tuple[str, Any, bool, bool, bool, bool]]:
...
) -> List[Tuple[str, Any, bool, bool, bool, bool]]: ...

def exposed_register_remote_listener(self, uuid: str, param_name: str) -> None:
...
def exposed_register_remote_listener(self, uuid: str, param_name: str) -> None: ...

def exposed_register_remote_listeners(
self, uuid: str, param_names: List[str]
) -> None:
...
) -> None: ...

def exposed_get_changed_parameters_queue(self, uuid: str) -> List[Tuple[str, Any]]:
...
def exposed_get_changed_parameters_queue(
self, uuid: str
) -> List[Tuple[str, Any]]: ...

def exposed_write_registers(self) -> None:
...
def exposed_write_registers(self) -> None: ...

def exposed_start_optimization(self, x0, x1, spectrum) -> None:
...
def exposed_start_optimization(self, x0, x1, spectrum) -> None: ...

def exposed_start_psd_acquisition(self) -> None:
...
def exposed_start_psd_acquisition(self) -> None: ...

def exposed_start_pid_optimization(self) -> None:
...
def exposed_start_pid_optimization(self) -> None: ...

def exposed_start_sweep(self) -> None:
...
def exposed_start_sweep(self) -> None: ...

def exposed_start_lock(self) -> None:
...
def exposed_start_lock(self) -> None: ...

def exposed_shutdown(self) -> None:
...
def exposed_shutdown(self) -> None: ...

def exposed_pause_acquisition(self) -> None:
...
def exposed_pause_acquisition(self) -> None: ...

def exposed_continue_acquisition(self) -> None:
...
def exposed_continue_acquisition(self) -> None: ...

def exposed_set_csr_direct(self, key: str, value: int) -> None:
...
def exposed_set_csr_direct(self, key: str, value: int) -> None: ...

def exposed_set_parameter_log(self, param_name: str, value: bool) -> None:
...
def exposed_set_parameter_log(self, param_name: str, value: bool) -> None: ...

def exposed_get_parameter_log(self, param_name: str) -> bool:
...
def exposed_get_parameter_log(self, param_name: str) -> bool: ...

def exposed_update_influxdb_credentials(
self, credentials: InfluxDBCredentials
) -> Tuple[bool, int, str]:
...
) -> Tuple[bool, int, str]: ...

def exposed_get_influxdb_credentials(self) -> InfluxDBCredentials:
...
def exposed_get_influxdb_credentials(self) -> InfluxDBCredentials: ...

def exposed_start_logging(self, interval: float) -> None:
...
def exposed_start_logging(self, interval: float) -> None: ...

def exposed_stop_logging(self) -> None:
...
def exposed_stop_logging(self) -> None: ...

def exposed_get_logging_status(self) -> bool:
...
def exposed_get_logging_status(self) -> bool: ...


def pack(value: ParameterValues) -> Union[bytes, ParameterValues]:
Expand Down
6 changes: 3 additions & 3 deletions linien-gui/linien_gui/ui/spectroscopy_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@ def change_signal_offset(self):
self.control.exposed_write_registers()

def change_demod_phase(self):
self.get_param(
"demodulation_phase"
).value = self.demodulationPhaseSpinBox.value()
self.get_param("demodulation_phase").value = (
self.demodulationPhaseSpinBox.value()
)
self.control.exposed_write_registers()

def change_demod_multiplier(self, idx):
Expand Down
10 changes: 7 additions & 3 deletions linien-server/linien_server/acquisition.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,13 @@ def program_acquisition_and_rearm(self, trigger_delay=16384):

self.red_pitaya.scope.rearm(trigger_source=TriggerSource.ext_posedge)

def exposed_return_data(
self, last_hash: Optional[float]
) -> tuple[bool, float | None, bool | None, bytes | None, float | None,]:
def exposed_return_data(self, last_hash: Optional[float]) -> tuple[
bool,
float | None,
bool | None,
bytes | None,
float | None,
]:
no_data_available = self.data_hash is None
data_not_changed = self.data_hash == last_hash
if data_not_changed or no_data_available or self.pause_event.is_set():
Expand Down
42 changes: 23 additions & 19 deletions linien-server/linien_server/registers.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,17 @@ def phase_to_delay(phase):
# NOTE: Sweep center is set by `logic_out_offset`.
logic_sweep_min=-1 * max_(self.parameters.sweep_amplitude.value * 8191),
logic_sweep_max=max_(self.parameters.sweep_amplitude.value * 8191),
logic_mod_freq=self.parameters.modulation_frequency.value
if not self.parameters.pid_only_mode.value
else 0,
logic_mod_amp=self.parameters.modulation_amplitude.value
if (self.parameters.modulation_frequency.value > 0)
and (not self.parameters.pid_only_mode.value)
else 0,
logic_mod_freq=(
self.parameters.modulation_frequency.value
if not self.parameters.pid_only_mode.value
else 0
),
logic_mod_amp=(
self.parameters.modulation_amplitude.value
if (self.parameters.modulation_frequency.value > 0)
and (not self.parameters.pid_only_mode.value)
else 0
),
logic_dual_channel=int(self.parameters.dual_channel.value),
logic_pid_only_mode=int(self.parameters.pid_only_mode.value),
logic_chain_a_factor=factor_a,
Expand Down Expand Up @@ -139,24 +143,24 @@ def phase_to_delay(phase):
logic_autolock_robust_time_scale=self.parameters.autolock_time_scale.value,
logic_autolock_robust_final_wait_time=self.parameters.autolock_final_wait_time.value, # noqa: E501
# channel A
fast_a_demod_delay=phase_to_delay(
self.parameters.demodulation_phase_a.value
)
if (self.parameters.modulation_frequency.value > 0)
and (not self.parameters.pid_only_mode.value)
else 0,
fast_a_demod_delay=(
phase_to_delay(self.parameters.demodulation_phase_a.value)
if (self.parameters.modulation_frequency.value > 0)
and (not self.parameters.pid_only_mode.value)
else 0
),
fast_a_demod_multiplier=self.parameters.demodulation_multiplier_a.value,
fast_a_dx_sel=csrmap.signals.index("zero"),
fast_a_y_tap=2,
fast_a_dy_sel=csrmap.signals.index("zero"),
fast_a_invert=int(self.parameters.invert_a.value),
# channel B
fast_b_demod_delay=phase_to_delay(
self.parameters.demodulation_phase_b.value
)
if (self.parameters.modulation_frequency.value > 0)
and (not self.parameters.pid_only_mode.value)
else 0,
fast_b_demod_delay=(
phase_to_delay(self.parameters.demodulation_phase_b.value)
if (self.parameters.modulation_frequency.value > 0)
and (not self.parameters.pid_only_mode.value)
else 0
),
fast_b_demod_multiplier=self.parameters.demodulation_multiplier_b.value,
fast_b_dx_sel=csrmap.signals.index("zero"),
fast_b_y_tap=1,
Expand Down
8 changes: 5 additions & 3 deletions linien-server/linien_server/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,11 @@ def exposed_start_autolock(self, x0, x1, spectrum, additional_spectra=None):
spectrum,
should_watch_lock=start_watching,
auto_offset=auto_offset,
additional_spectra=pickle.loads(additional_spectra)
if additional_spectra is not None
else None,
additional_spectra=(
pickle.loads(additional_spectra)
if additional_spectra is not None
else None
),
)

def exposed_start_optimization(self, x0, x1, spectrum):
Expand Down
3 changes: 1 addition & 2 deletions tests/test_pid_transfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ def plot_transfer(x, y, label=None):
def plot_theory(f, p, i, d, plot_color):
plt.plot(
f,
20
* np.log10(np.abs(p / 4096 + 10 * i / f + d * (f / 125e6) / (2**6))),
20 * np.log10(np.abs(p / 4096 + 10 * i / f + d * (f / 125e6) / (2**6))),
color=plot_color,
linestyle="dashed",
)
Expand Down

0 comments on commit ff96376

Please sign in to comment.