Skip to content

Commit 462e64e

Browse files
committed
Revert "Disable I19 collection merging"
This reverts commit 3d2609e.
1 parent 3d2609e commit 462e64e

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

src/dlstbx/mimas/i19.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,6 @@ def handle_i19_end(scenario: mimas.MimasScenario, **kwargs) -> List[mimas.Invoca
166166
if scenario.dcclass == mimas.MimasDCClass.DIAMOND_ANVIL_CELL:
167167
xia2_dials_extra_params = (*XIA2_DIALS_DAC_PARAMS,)
168168

169-
# Find the scenario sweep that matches this DCID
170-
dcid_sweep = [
171-
x for x in scenario.getsweepslistfromsamedcg if x.DCID == scenario.DCID
172-
]
173-
assert len(dcid_sweep) == 1
174169
for params in extra_params:
175170
tasks.extend(
176171
[
@@ -183,7 +178,7 @@ def handle_i19_end(scenario: mimas.MimasScenario, **kwargs) -> List[mimas.Invoca
183178
else "autoprocessing-multi-xia2-smallmolecule-nexus"
184179
),
185180
source="automatic",
186-
sweeps=tuple(dcid_sweep),
181+
sweeps=tuple(scenario.getsweepslistfromsamedcg),
187182
displayname="xia2 dials",
188183
parameters=(
189184
*params,
@@ -200,7 +195,7 @@ def handle_i19_end(scenario: mimas.MimasScenario, **kwargs) -> List[mimas.Invoca
200195
else "autoprocessing-multi-xia2-smallmolecule-d-a-nexus"
201196
),
202197
source="automatic",
203-
sweeps=tuple(dcid_sweep),
198+
sweeps=tuple(scenario.getsweepslistfromsamedcg),
204199
displayname="xia2 dials-aimless",
205200
parameters=(
206201
*params,

0 commit comments

Comments
 (0)