From f25b2dbbdcec72639706cf93c09f6720be558458 Mon Sep 17 00:00:00 2001
From: davidmcdonagh <davidnmcdonagh@gmail.com>
Date: Tue, 5 Mar 2024 15:14:20 +0000
Subject: [PATCH] Remove references to Experiment.is_still() and
 Experiments.all_sequences().

---
 .azure-pipelines/unix-build.yml                         | 4 ++++
 .azure-pipelines/windows-build.yml                      | 5 ++++-
 newsfragments/XXX.misc                                  | 1 +
 src/dials/algorithms/integration/integrator.py          | 4 ++--
 src/dials/algorithms/integration/parallel_integrator.py | 4 ++--
 src/dials/algorithms/integration/processor.py           | 4 ++--
 src/dials/command_line/detect_blanks.py                 | 2 +-
 7 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 newsfragments/XXX.misc

diff --git a/.azure-pipelines/unix-build.yml b/.azure-pipelines/unix-build.yml
index c02d547c28..1f08cb3d70 100644
--- a/.azure-pipelines/unix-build.yml
+++ b/.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)
 
diff --git a/.azure-pipelines/windows-build.yml b/.azure-pipelines/windows-build.yml
index 4c2c752ada..ca302533c2 100644
--- a/.azure-pipelines/windows-build.yml
+++ b/.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
diff --git a/newsfragments/XXX.misc b/newsfragments/XXX.misc
new file mode 100644
index 0000000000..895eab80be
--- /dev/null
+++ b/newsfragments/XXX.misc
@@ -0,0 +1 @@
+Remove references to `Experiment.is_still()` and `Experiments.all_sequences()`.
diff --git a/src/dials/algorithms/integration/integrator.py b/src/dials/algorithms/integration/integrator.py
index dddb21fbd2..11c89d12f6 100644
--- a/src/dials/algorithms/integration/integrator.py
+++ b/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)
diff --git a/src/dials/algorithms/integration/parallel_integrator.py b/src/dials/algorithms/integration/parallel_integrator.py
index c4dce893be..ecf0d48b47 100644
--- a/src/dials/algorithms/integration/parallel_integrator.py
+++ b/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 = [
                 [
                     "#",
diff --git a/src/dials/algorithms/integration/processor.py b/src/dials/algorithms/integration/processor.py
index d8fdfaae72..55860a0adc 100644
--- a/src/dials/algorithms/integration/processor.py
+++ b/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 = [
                 [
                     "#",
diff --git a/src/dials/command_line/detect_blanks.py b/src/dials/command_line/detect_blanks.py
index 94ce904d10..e005de00f3 100644
--- a/src/dials/command_line/detect_blanks.py
+++ b/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