Skip to content

make acqSettings_ volatile and mark the immutable-run stop-gaps #488

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
Aug 14, 2026
Merged

make acqSettings_ volatile and mark the immutable-run stop-gaps #488

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
24b6bc4
make acqSettings_ volatile and mark the immutable-run stop-gaps
Aug 14, 2026
1501266
bump the version to 0.8.4
Aug 14, 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
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class LightSheetManagerPlugin implements MenuPlugin, SciJavaPlugin {
public static final String copyright = "Applied Scientific Instrumentation (ASI), 2022-2026";
public static final String description = "A plugin to control various types of light sheet microscopes.";
public static final String menuName = "Light Sheet Manager";
public static final String version = "0.8.3";
public static final String version = "0.8.4";

private Studio studio_;

Expand Down
14 changes: 10 additions & 4 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 @@ -42,7 +42,11 @@ public abstract class AcquisitionEngine implements AcquisitionManager, MMAcquist
private static final AtomicLong runIdCounter_ = new AtomicLong();

protected ScapeAcquisitionSettings.Builder asb_;
protected ScapeAcquisitionSettings acqSettings_;
// TODO(IMMUTABLE-RUN): stop-gap. The user interface writes this field and the acquisition
// thread reads it. Volatile only makes publication safe, so a reader cannot see a partly
// built snapshot; it does NOT stop the user interface rebuilding this field mid-run, it only
// makes those rebuilds land sooner. Remove when the run reads a snapshot frozen at arm time.
protected volatile ScapeAcquisitionSettings acqSettings_;

private final ExecutorService acquisitionExecutor_ = Executors.newSingleThreadExecutor(
r -> new Thread(r, "Acquisition Thread"));
Expand Down Expand Up @@ -288,9 +292,11 @@ public void updateSettings() {
// Build fully before assigning: acqSettings_ is read from other threads, and a second
// assignment here would briefly publish the user's settings during a test acquisition.
ScapeAcquisitionSettings settings = asb_.build();
// Re-apply here and not at the call site: acqSettings_ is rebuilt from the builder at
// several points during a run, and the builder holds the user's settings, so an override
// applied once is discarded by the next rebuild.
// TODO(IMMUTABLE-RUN): stop-gap. Re-applied here and not at the call site because
// acqSettings_ is rebuilt from the builder at several points during a run, and the builder
// holds the user's settings, so an override applied once is discarded by the next rebuild.
// Once the run reads a snapshot frozen at arm time this is applied once at the freeze and
// testAcquisition_ goes away.
if (testAcquisition_) {
settings = settings.copyBuilder()
.saveImagesDuringAcquisition(false)
Expand Down
Loading