Skip to content

detector_residuals: resolve per-frame XFELBeam for composite stills #1164

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

Draft
dwmoreau wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −2
Draft

detector_residuals: resolve per-frame XFELBeam for composite stills #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a34f7dd
detector_residuals: resolve per-frame XFELBeam for composite stills
May 22, 2026
efb5f0d
fix(xfel): accept any BeamBase in cspad_ana mod_view setup
May 29, 2026
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
8 changes: 8 additions & 0 deletions xfel/command_line/detector_residuals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,14 @@ def run(self):

experiments = flatten_experiments(params.input.experiments)

# XFEL stills .expt files carry a shared wavelength-less XFELBeam plus
# per-frame wavelengths in the scan; resolve each experiment's monochromatic
# beam up front so the residual/prediction code can call beam.get_s0().
# A no-op for ordinary beams. This tool only reads experiments, so it is
# safe to replace the beam in place here.
for expt in experiments:
expt.beam = expt.get_monochromatic_beam()

# Find all detector objects
detectors = experiments.detectors()

Expand Down
4 changes: 2 additions & 2 deletions xfel/cxi/cspad_ana/mod_view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def __init__(self, **kwargs):

from copy import deepcopy

from dxtbx.model.beam import Beam, BeamFactory
from dxtbx.model.beam import BeamBase, BeamFactory
from dxtbx.model.detector import Detector, DetectorFactory
from dxtbx.model.goniometer import Goniometer, GoniometerFactory
from dxtbx.model import Scan, ScanFactory
Expand Down Expand Up @@ -119,7 +119,7 @@ def __init__(self, **kwargs):
self._detector_instance = detector_instance

beam_instance = self._beam()
assert(isinstance(beam_instance, Beam))
assert(isinstance(beam_instance, BeamBase))
self._beam_instance = beam_instance

scan_instance = self._scan()
Expand Down
Loading