Remove references to Experiment.is_still() and Experiments.all_sequen…

…ces().

.azure-pipelines/unix-build.yml

@@ -18,6 +18,10 @@ steps:
 - bash: |
  set -eux
  python modules/dials/installer/bootstrap.py update
+ cd modules/dxtbx 
+ git remote add toastisme https://github.com/toastisme/dxtbx
+ git fetch toastisme
+ git checkout -b add_experiment_type toastisme/add_experiment_type
  displayName: Repository checkout
  workingDirectory: $(Pipeline.Workspace)
 

.azure-pipelines/windows-build.yml

@@ -47,7 +47,10 @@ steps:
 
 # Build and install dxtbx
 - script: |
- git clone https://github.com/cctbx/dxtbx ./modules/dxtbx
+ git clone https://github.com/toastisme/dxtbx ./modules/dxtbx
+ cd ./modules/dxtbx 
+ git checkout add_experiment_type
+ cd ../../
  call activate conda_base/
  mkdir build_dxtbx
  cd build_dxtbx

newsfragments/XXX.misc

@@ -0,0 +1 @@
+Remove references to `Experiment.is_still()` and `Experiments.all_sequences()`.

src/dials/algorithms/integration/integrator.py

@@ -1357,7 +1357,7 @@ def summary(self, block_size, block_size_units):
  group = job.index()
  f0, f1 = job.frames()
  rows.append([str(i), str(group), str(f0), str(f1)])
- elif self._experiments.all_sequences():
+ elif self._experiments.all_rotations():
  rows = [["#", "Group", "Frame From", "Frame To", "Angle From", "Angle To"]]
  for i in range(len(self)):
  job = self._manager.job(i)
@@ -1589,7 +1589,7 @@ def summary(self, block_size, block_size_units):
  group = job.index()
  f0, f1 = job.frames()
  rows.append([str(i), str(group), str(f0), str(f1)])
- elif self._experiments.all_sequences():
+ elif self._experiments.all_rotations():
  rows = [["#", "Group", "Frame From", "Frame To", "Angle From", "Angle To"]]
  for i in range(len(self)):
  job = self._manager.job(i)

src/dials/algorithms/integration/parallel_integrator.py

@@ -715,7 +715,7 @@ def summary(self):
  f0, f1 = job.frames()
  n = self.manager.num_reflections(i)
  rows.append([str(i), str(group), str(f0), str(f1), str(n)])
- elif self.experiments.all_sequences():
+ elif self.experiments.all_rotations():
  rows = [
  [
  "#",
@@ -1182,7 +1182,7 @@ def summary(self):
  f0, f1 = job.frames()
  n = self.manager.num_reflections(i)
  rows.append([str(i), str(group), str(f0), str(f1), str(n)])
- elif self.experiments.all_sequences():
+ elif self.experiments.all_rotations():
  rows = [
  [
  "#",

src/dials/algorithms/integration/processor.py

@@ -315,7 +315,7 @@ def __init__(self, experiments, manager):
  :param manager: The processing manager
  """
  # Ensure we have the correct type of data
- if not experiments.all_sequences():
+ if not experiments.all_rotations():
  raise RuntimeError(
  """
  An inappropriate processing algorithm may have been selected!
@@ -842,7 +842,7 @@ def summary(self):
  f0, f1 = job.frames()
  n = self.manager.num_reflections(i)
  rows.append([str(i), str(group), str(f0), str(f1), str(n)])
- elif self.experiments.all_sequences():
+ elif self.experiments.all_rotations():
  rows = [
  [
  "#",

src/dials/command_line/detect_blanks.py

@@ -79,7 +79,7 @@ def run(args=None):
 
  imagesets = experiments.imagesets()
 
- if any(experiment.is_still() for experiment in experiments):
+ if not experiments.all_rotations():
  sys.exit("dials.detect_blanks can only be used with rotation data")
 
  assert len(imagesets) == 1