fix(flomni): make fovx=220 inclusive everywhere, default exp_time example to 0.1
CI for csaxs_bec / test (push) Successful in 2m19s
CI for csaxs_bec / test (push) Successful in 2m19s
- flomni_fermat_scan.py's fovx bound was lt=220 (exclusive), so 220 itself was rejected; change to le=220 to match flomni.py's fovx setter, which was already inclusive (only raises for val > 220). - tomo_params.py's flomni fov_fields spinbox max was still 200.0, an independent limit that wasn't updated when fovx's cap was raised elsewhere -- bring it to 220.0 for consistency. - exp_time's real default is now 0.1 instead of 0, so the generated scan doc's example (scans.flomni_fermat_scan?) shows a realistic exposure time instead of 0. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0197yD3hTxwvrgmYr7aaYiCD
This commit is contained in:
@@ -2267,7 +2267,7 @@ SETUP_PROFILES: dict[str, dict[str, Any]] = {
|
||||
"has_single_point": True,
|
||||
"has_zero_deg_reference": True,
|
||||
"fov_fields": [
|
||||
("fovx", "FOV x (µm)", 0.1, 200.0, 2),
|
||||
("fovx", "FOV x (µm)", 0.1, 220.0, 2),
|
||||
("fovy", "FOV y (µm)", 0.1, 100.0, 2),
|
||||
],
|
||||
"stitch_fields": [("stitch_x", "Stitch x", 0, 50), ("stitch_y", "Stitch y", 0, 50)],
|
||||
|
||||
@@ -70,7 +70,7 @@ class FlomniFermatScan(ScanBase):
|
||||
def __init__(
|
||||
# fmt: off
|
||||
self,
|
||||
fovx: Annotated[float, ScanArgument(display_name="Fovx", description="FOV in the piezo plane (i.e. piezo range). Max 220 um.", units=Units.µm, gt=0, lt=220, example=10)],
|
||||
fovx: Annotated[float, ScanArgument(display_name="Fovx", description="FOV in the piezo plane (i.e. piezo range). Max 220 um.", units=Units.µm, gt=0, le=220, example=10)],
|
||||
fovy: Annotated[float, ScanArgument(display_name="Fovy", description="FOV in the piezo plane (i.e. piezo range). Max 100 um.", units=Units.µm, gt=0, lt=100, example=10)],
|
||||
cenx: Annotated[float, ScanArgument(display_name="Cenx", description="Center position in x.", units=Units.µm, example=0)],
|
||||
ceny: Annotated[float, ScanArgument(display_name="Ceny", description="Center position in y.", units=Units.µm, example=0)],
|
||||
@@ -78,7 +78,7 @@ class FlomniFermatScan(ScanBase):
|
||||
zshift: Annotated[float, ScanArgument(display_name="Zshift", description="Shift in z. ", units=Units.µm, example=0)],
|
||||
angle: Annotated[float, ScanArgument(display_name="Angle", description="Rotation angle (will rotate first)", units=Units.deg, example=0)],
|
||||
corridor_size: Annotated[float | None, ScanArgument(display_name="Corridor Size", description="Corridor size for the corridor optimization.", units=Units.µm)] = None,
|
||||
exp_time: DefaultArgType.ExposureTime = 0,
|
||||
exp_time: DefaultArgType.ExposureTime = 0.1,
|
||||
frames_per_trigger: DefaultArgType.FramesPerTrigger = 1,
|
||||
burst_at_each_point: DefaultArgType.BurstAtEachPoint = 1,
|
||||
**kwargs,
|
||||
|
||||
Reference in New Issue
Block a user