feat(flomni): keep feedback_* as aliases of rt_feedback_*
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit was merged in pull request #341.
This commit is contained in:
1 parent
c1cc2cbc8e
commit
ac633d5634
3 files changed
+12
-3
No files matched your search
+3
-3
@@ -8,7 +8,7 @@ real-time system, and the names match across all three endstations.
|
||||
| Function | flOMNI name | former name |
|
||||
| --- | --- | --- |
|
||||
| BEC device enable rtx/rty/rtz | `rt_on()` / `rt_off()` | unchanged |
|
||||
| feedback | `rt_feedback_enable_with_reset()`, `rt_feedback_enable_without_reset()`, `rt_feedback_disable()`, `rt_feedback_status()` | `feedback_*` |
|
||||
| feedback | `rt_feedback_enable_with_reset()`, `rt_feedback_enable_without_reset()`, `rt_feedback_disable()`, `rt_feedback_status()` | `feedback_*` (kept as aliases) |
|
||||
| laser tracker | `rt_laser_tracker_on()`, `rt_laser_tracker_off()`, `rt_laser_tracker_show_all()`, `rt_laser_tracker_tweak()` | `laser_tracker_*`, `laser_parameters_tweak_tracking` |
|
||||
| signal strength | `rt_signal_strength()`, alias `show_signal_strength_interferometer()` | `show_signal_strength_interferometer` |
|
||||
| loop settings (staff) | `rt_settings` incl. `tracking_show/set_target_y/set_target_z/set_interferometer_threshold/set_psd_threshold_low` | `realtime_system`, `laser_parameters_*` |
|
||||
@@ -17,7 +17,7 @@ real-time system, and the names match across all three endstations.
|
||||
|
||||
- `rt_on` / `rt_off` already exist (line ~774).
|
||||
- `feedback_enable_with_reset`, `feedback_enable_without_reset`, `feedback_disable`, `feedback_status`
|
||||
-> `rt_feedback_*`; also `feedback_disable_and_reset_angle` -> `rt_feedback_disable_and_reset_angle`.
|
||||
-> `rt_feedback_*` (keep the old names as aliases, as on flOMNI); also `feedback_disable_and_reset_angle` -> `rt_feedback_disable_and_reset_angle`.
|
||||
- `show_signal_strength` -> `rt_signal_strength` (keep the old name as an alias).
|
||||
- LamNI has no laser tracker and no `rt_settings` (no web HMI loop settings).
|
||||
- Callers: `plugins/LamNI/x_ray_eye_align.py` and `plugins/omny/x_ray_eye_align.py` (the LamNI one calls
|
||||
@@ -27,7 +27,7 @@ real-time system, and the names match across all three endstations.
|
||||
## OMNY (`plugins/omny/omny.py`, `plugins/omny/omny_rt.py`)
|
||||
|
||||
- `rt_on` / `rt_off` already exist (`omny.py` ~2166).
|
||||
- `omny_rt.py`: `feedback_*` -> `rt_feedback_*`, `laser_tracker_on/off/show_all` -> `rt_laser_tracker_*`,
|
||||
- `omny_rt.py`: `feedback_*` -> `rt_feedback_*` (old names as aliases), `laser_tracker_on/off/show_all` -> `rt_laser_tracker_*`,
|
||||
`laser_tracker_check_and_wait_for_signalstrength` -> `rt_laser_tracker_check_and_wait_for_signalstrength`,
|
||||
`show_signal_strength_interferometer` -> `rt_signal_strength` + alias.
|
||||
- Callers: OMNY tomo/alignment code, `docs/user/ptychography/omny.md`, `test_omny_tomo_scan.py`
|
||||
|
||||
@@ -701,6 +701,12 @@ class FlomniSampleTransferMixin:
|
||||
else:
|
||||
print("The rt feedback is \x1b[91mNOT\x1b[0m running.")
|
||||
|
||||
# the familiar names, kept as aliases
|
||||
feedback_disable = rt_feedback_disable
|
||||
feedback_enable_with_reset = rt_feedback_enable_with_reset
|
||||
feedback_enable_without_reset = rt_feedback_enable_without_reset
|
||||
feedback_status = rt_feedback_status
|
||||
|
||||
# detector trigger: flomni.rt_settings.trigger_* (the former flomni.interferometer_trigger_* removed
|
||||
# 2026-10-23, Mirko: "interferometer" was confusing next to flomni.laser_*)
|
||||
|
||||
|
||||
@@ -221,6 +221,9 @@ _There is also an enable without reset, which is used during tomography scans, w
|
||||
- `flomni.rt_feedback_disable()`
|
||||
- `flomni.rt_feedback_status()`
|
||||
|
||||
The former names `flomni.feedback_enable_with_reset()`, `feedback_enable_without_reset()`, `feedback_disable()`
|
||||
and `feedback_status()` still work.
|
||||
|
||||
#### Detector trigger: position stability
|
||||
|
||||
In step scans the detector is triggered when the sample is stable at the scan point: the relative position
|
||||
|
||||
Reference in new issue
Block a user