Skip to content

Fix the controller cleanup after a refused run and the window close during cleanup #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bls337 merged 2 commits into from
Oct 31, 2026
Merged

Fix the controller cleanup after a refused run and the window close during cleanup #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b11e81
leave the controller alone after a run refused before it set one up
Oct 30, 2026
e7f25dc
let the image window close once the acquisition has finished writing
Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,11 @@ public boolean abortRequest() {
if (acq == null) {
return true; // nothing is running, so there is nothing to protect
}
// the data is written and finish() is only restoring the hardware, so it is safe to
// close the window
if (cleaningUp_ && acq.getDataSink().isFinished()) {
return true;
}
// always refuse while a run is live: closing the live window would close the datastore
// the run is still writing. answering yes only aborts, so the close succeeds on the next
// attempt.
Expand Down
7 changes: 3 additions & 4 deletions ...in/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ boolean setup() {
updateSettings();

// set before any validation below can return early: finish() runs on every exit from setup()
controller_ = null;
stageScanState_ = null;
originalCoreCamera_ = null;
originalChannelPreset_ = null;
Expand Down Expand Up @@ -1306,10 +1307,8 @@ void finish() {
// TODO: figure out if we really want to return piezos to 0 position (maybe center position,
// maybe not at all since we move when we switch to setup tab, something else??)
if (model_.devices().isUsingPLogic() && controller_ != null) {
// SCAPE: leave the imaging piezo where it is instead of driving it to 0. diSPIM 1.4
// passes centerPiezos=false for SCOPE (AcquisitionPanel line 4979). Parking at 0
// defocuses the live view and re-introduces the first-frame jump on the next run
// (issues #404 symptom 3 / #407).
// SCAPE: leave the imaging piezo where it is instead of driving it to 0. Parking at 0
// defocuses the live view and re-introduces the first-frame jump on the next run.
controller_.cleanUpControllerAfterAcquisition(acqSettings_, false);
controller_.stopSPIMStateMachines();
}
Expand Down
Loading