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.

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

Make pilatus deadtime overridable and add tests #359

Merged
merged 2 commits into from
Jun 4, 2024

Conversation

callumforrester
Copy link
Contributor

@callumforrester callumforrester commented Jun 3, 2024

Fixes #355

@DiamondJoseph
Copy link
Contributor

Is the current Pilatus implementation compatible with a Pilatus2 such that we need to support the current value at all?

@callumforrester
Copy link
Contributor Author

Good question, either way the Pilatus 3 manual doesn't specify a deadtime: https://media.dectris.com/user-manual-pilatus3-2020.pdf

It seems to be more detector-dependant.

@DiamondJoseph
Copy link
Contributor

[...]the Pilatus 3 manual doesn't specify a deadtime: https://media.dectris.com/user-manual-pilatus3-2020.pdf

Found it:

The exposure period must be at least 0.95 ms longer than the exposure time

@callumforrester
Copy link
Contributor Author

Nevermind then, I can't read

@callumforrester
Copy link
Contributor Author

@coretl Shall we just support the Pilatus 3?

@coretl
Copy link
Collaborator

coretl commented Jun 4, 2024

@coretl Shall we just support the Pilatus 3?

yes, until someone else asks for an older one

Copy link
Collaborator

@coretl coretl left a comment

Choose a reason for hiding this comment

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

How about this?

#: The required minimum time difference between ExpPeriod and ExpTime
#: (readout time) is 2.28 ms
#: We provide an option to override for newer Pilatus models
DEFAULT_READOUT_TIME_SECONDS: float = 2.28e-3
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
DEFAULT_READOUT_TIME_SECONDS: float = 2.28e-3
class PilatusReadouttime(Enum):
"""Pilatus readout time per model in ms"""
pilatus2 = 2.28e-3
pilatus3 = 0.95e-3

drv_suffix="cam1:",
hdf_suffix="HDF1:",
name="",
readout_time: float = DEFAULT_READOUT_TIME_SECONDS,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
readout_time: float = DEFAULT_READOUT_TIME_SECONDS,
readout_time: PilatusReadoutTime = PilatusReadoutTime.pilatus3,

@DiamondJoseph DiamondJoseph merged commit 6ee3cfd into main Jun 4, 2024
18 checks passed
@DiamondJoseph DiamondJoseph deleted the 355-override-pilatus-deadtime branch June 4, 2024 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make PilatusController support Pilatus 3 deadtime
3 participants