Skip to content
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

Jump to bottom

increase odin meta timeout to 30 #671

Merged
merged 8 commits into from
Jul 19, 2024
Merged

increase odin meta timeout to 30 #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e1e41a1
increase odin meta timeout to 30
dperl-dls Jul 15, 2024
d87b79f
fix linting
dperl-dls Jul 15, 2024
3d6863c
Merge branch 'main' into 654_increase_odin_meta_timeout
dperl-dls Jul 17, 2024
a05526e
add comment
dperl-dls Jul 17, 2024
44a8835
make root validator signature pydantic2 compatible
dperl-dls Jul 17, 2024
4b5fffe
Merge branch '654_increase_odin_meta_timeout' of github.com:DiamondLi…
dperl-dls Jul 17, 2024
0ad86e9
update ophyd async req
dperl-dls Jul 17, 2024
52b3068
Merge branch 'main' into 654_increase_odin_meta_timeout
dperl-dls Jul 19, 2024
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
5 changes: 2 additions & 3 deletions src/dodal/devices/detector/detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,8 @@ class Config:
DetectorSizeConstants: lambda d: d.det_type_string,
}

@root_validator(
pre=True, skip_on_failure=True
) # should be replaced with model_validator once move to pydantic 2 is complete
# should be replaced with model_validator once move to pydantic 2 is complete
@root_validator(pre=True)
def create_beamxy_and_runnumber(cls, values: dict[str, Any]) -> dict[str, Any]:
values["beam_xy_converter"] = DetectorDistanceToBeamXYConverter(
values["det_dist_to_beam_converter_path"]
Expand Down
4 changes: 3 additions & 1 deletion src/dodal/devices/eiger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ def set(self, value, *, timeout=None, settle_time=None, **kwargs):

STALE_PARAMS_TIMEOUT = 60
GENERAL_STATUS_TIMEOUT = 10
# Long timeout for meta file to compensate for filesystem issues
META_FILE_READY_TIMEOUT = 30
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Might be nice to have a comment here about file system issues requiring this

ALL_FRAMES_TIMEOUT = 120
ARMING_TIMEOUT = 60

Expand Down Expand Up @@ -305,7 +307,7 @@ def _wait_for_odin_status(self) -> StatusBase:
)
LOGGER.info("Eiger staging: awaiting odin metadata")
status &= await_value(
self.odin.meta.ready, 1, timeout=self.GENERAL_STATUS_TIMEOUT
self.odin.meta.ready, 1, timeout=self.META_FILE_READY_TIMEOUT
)
return status

Expand Down
Loading