Use BlueAPI abort #124
Use BlueAPI abort #124
Conversation
There was a problem hiding this comment.
Looks like it should work. I'm not a fan of the ABORTED global variable. I think that you should just call dcid.collection_complete(end_time, aborted=False) in an else_plan and dcid.collection_complete(end_time, aborted=True) in the except plan. Ultimately we should be using a callback for ispyb and it will be handled in there, could you make an issue for this if there isn't one already?
| if detector_name == "pilatus": | ||
| caput(pv.pilat_acquire, 0) | ||
| elif detector_name == "eiger": | ||
| caput(pv.eiger_acquire, 0) |
There was a problem hiding this comment.
Should: The finally plan will do the detector disarm, right?
| caput(pv.pilat_acquire, 0) | ||
| elif detector_name == "eiger": | ||
| caput(pv.eiger_acquire, 0) | ||
| sleep(1.0) |
There was a problem hiding this comment.
Should: Why are we sleeping?
There was a problem hiding this comment.
I believe it's to allow the PVs to actually be set - since there is no wait option on this caput. 1s is probably quite long though, in other parts of the code when setting these PVs it's 0.5...
| global ABORTED | ||
| ABORTED = True | ||
| logger.warning("Data Collection Aborted") | ||
| yield from disarm_zebra(zebra) # If aborted/timed out zebra still armed |
There was a problem hiding this comment.
Should: Doesn't reset_zebra_when_collection_done_plan in the finally plan deal with this?
There was a problem hiding this comment.
Yes, although after going through these changes I'm not entirely sure we should be disarming the zebra in that plan. Or to be more precise, it's fine as it is for the fixed target, but in the extruder the zebra is disarmed at collection end so we shouldn't need to do it unless the collection failed/was aborted
There was a problem hiding this comment.
I don't think it really costs anything to do it in both places
Closes #117
Needs Dodal661