Merge pull request #31 from toastisme/allow_tof_goniometer

allow_tof_goniometer
toastisme · Oct 5, 2023 · 7b973b9 · 7b973b9
2 parents 2fbd926 + a0d08fd
commit 7b973b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/dials/algorithms/refinement/target.py b/src/dials/algorithms/refinement/target.py
@@ -7,6 +7,7 @@
 import math
 from typing import Any, Tuple, Union
 
+from dxtbx.model import TOFSequence
 from libtbx.phil import parse
 from scitbx import sparse
 from scitbx.array_family import flex
@@ -235,7 +236,7 @@ def predict_for_reflection_table(self, reflections, skip_derivatives=False):
  sel = reflections["id"] == iexp
 
  # keep all reflections if there is no rotation axis
- if exp.goniometer is None:
+ if exp.goniometer is None or isinstance(exp.sequence, TOFSequence):
  to_keep.set_selected(sel, True)
  continue
 

diff --git a/src/dials/array_family/flex_ext.py b/src/dials/array_family/flex_ext.py
@@ -1588,7 +1588,7 @@ def calculate_entering_flags(self, experiments):
  if not experiment.goniometer:
  continue
  axis = matrix.col(experiment.goniometer.get_rotation_axis())
- s0 = matrix.col(experiment.beam.get_s0())
+ s0 = matrix.col(experiment.beam.get_unit_s0())
  vec = s0.cross(axis)
  sel = self["id"] == iexp
  enterings.set_selected(sel, self["s1"].dot(vec) < 0.0)