From ffcb047e265188c535a14b88f5db3238754989f1 Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 26 Oct 2026 13:19:46 -0700 Subject: [PATCH 1/3] correct the settings javadoc and a stale save mode comment --- .../api/AcquisitionSettings.java | 4 ++-- .../api/AcquisitionSettingsDispim.java | 24 +++++++++---------- .../api/AcquisitionSettingsScape.java | 16 ++++++------- .../acquisitions/AcquisitionEngineDispim.java | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettings.java b/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettings.java index b924ea4e..0438a031 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettings.java +++ b/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettings.java @@ -21,9 +21,9 @@ interface Builder> { T saveDirectory(final String directory); /** - * Sets the folder name. + * Sets the save name prefix. * - * @param name the name of the folder + * @param name the save name prefix * @throws IllegalArgumentException if the name cannot be used as a Windows file name */ T saveNamePrefix(final String name); diff --git a/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettingsDispim.java b/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettingsDispim.java index 52cc7432..c2131602 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettingsDispim.java +++ b/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettingsDispim.java @@ -13,44 +13,44 @@ public interface AcquisitionSettingsDispim extends AcquisitionSettings { Builder copyBuilder(); /** - * Returns the immutable DefaultTimingSettings instance. + * Returns the immutable TimingSettings instance. * - * @return immutable DefaultTimingSettings instance. + * @return immutable TimingSettings instance. */ TimingSettings timing(); /** - * Returns the immutable DefaultSliceSettings instance. + * Returns the immutable SliceSettings instance. * - * @return immutable DefaultSliceSettings instance. + * @return immutable SliceSettings instance. */ SliceSettings slice(); /** - * Returns the immutable DefaultSliceSettingsLS instance. + * Returns the immutable SliceSettingsLightSheet instance. * - * @return immutable DefaultSliceSettingsLS instance. + * @return immutable SliceSettingsLightSheet instance. */ SliceSettingsLightSheet sliceLS(); /** - * Returns the immutable DefaultScanSettings instance. + * Returns the immutable StageScanSettings instance. * - * @return immutable DefaultScanSettings instance. + * @return immutable StageScanSettings instance. */ StageScanSettings stageScan(); /** - * Returns the immutable DefaultSheetCalibration instance. + * Returns the immutable SheetCalibration instance. * - * @return immutable DefaultSheetCalibration instance. + * @return immutable SheetCalibration instance. */ SheetCalibration sheetCalibration(final int view); /** - * Returns the immutable DefaultSliceCalibration instance. + * Returns the immutable SliceCalibration instance. * - * @return immutable DefaultSliceCalibration instance. + * @return immutable SliceCalibration instance. */ SliceCalibration sliceCalibration(final int view); diff --git a/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettingsScape.java b/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettingsScape.java index fcde89ec..2bb77c4d 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettingsScape.java +++ b/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettingsScape.java @@ -13,9 +13,9 @@ public interface AcquisitionSettingsScape extends AcquisitionSettings { Builder copyBuilder(); /** - * Returns the immutable DefaultTimingSettings instance. + * Returns the immutable TimingSettings instance. * - * @return immutable DefaultTimingSettings instance. + * @return immutable TimingSettings instance. */ TimingSettings timing(); @@ -27,23 +27,23 @@ public interface AcquisitionSettingsScape extends AcquisitionSettings { SliceSettings slice(); /** - * Returns the immutable DefaultScanSettings instance. + * Returns the immutable StageScanSettings instance. * - * @return immutable DefaultScanSettings instance. + * @return immutable StageScanSettings instance. */ StageScanSettings stageScan(); /** - * Returns the immutable DefaultSheetCalibration instance. + * Returns the immutable SheetCalibration instance. * - * @return immutable DefaultSheetCalibration instance. + * @return immutable SheetCalibration instance. */ SheetCalibration sheetCalibration(); /** - * Returns the immutable DefaultSliceCalibration instance. + * Returns the immutable SliceCalibration instance. * - * @return immutable DefaultSliceCalibration instance. + * @return immutable SliceCalibration instance. */ SliceCalibration sliceCalibration(); diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDispim.java b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDispim.java index a6840cd0..8ffb996d 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDispim.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDispim.java @@ -581,7 +581,7 @@ void finish() { final String savePath = FileUtils.createUniquePath( acqSettings_.saveDirectory(), acqSettings_.saveNamePrefix()); try { - // convert from DataStorage.SaveMode to Datastore.SaveMode + // convert from SaveMode to Datastore.SaveMode final Datastore.SaveMode saveMode = SaveMode.convert(acqSettings_.saveMode()); datastore_.save(saveMode, savePath); } catch (Exception e) { From 8870e58355bb4c7dac434d91e9f8c502b5f10f80 Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 26 Oct 2026 13:25:08 -0700 Subject: [PATCH 2/3] fix javadoc and add to description --- .../lightsheetmanager/api/AcquisitionSettings.java | 2 +- .../api/internal/BaseAcquisitionSettings.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettings.java b/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettings.java index 0438a031..0688532a 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettings.java +++ b/src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettings.java @@ -21,7 +21,7 @@ interface Builder> { T saveDirectory(final String directory); /** - * Sets the save name prefix. + * Sets the save name prefix, used for the acquisition folder name. * * @param name the save name prefix * @throws IllegalArgumentException if the name cannot be used as a Windows file name diff --git a/src/main/java/org/micromanager/lightsheetmanager/api/internal/BaseAcquisitionSettings.java b/src/main/java/org/micromanager/lightsheetmanager/api/internal/BaseAcquisitionSettings.java index f4df44a7..d1d333c3 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/api/internal/BaseAcquisitionSettings.java +++ b/src/main/java/org/micromanager/lightsheetmanager/api/internal/BaseAcquisitionSettings.java @@ -107,9 +107,9 @@ public T saveDirectory(final String directory) { } /** - * Sets the folder name. + * Sets the save name prefix, used for the acquisition folder name. * - * @param name the name of the folder + * @param name the save name prefix * @throws IllegalArgumentException if the name cannot be used as a Windows file name */ @Override From 2f499eb54f5bca1ae6e10cda8979af18bed0ef31 Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 26 Oct 2026 13:30:35 -0700 Subject: [PATCH 3/3] correct the reason given for the core-focus refusal --- .../model/acquisitions/AcquisitionEngineScape.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java index 0995f69c..2dd8b3ad 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java @@ -156,7 +156,8 @@ boolean setup() { model_.logging().reportError("XY positions expected but the position list is empty"); return false; } - // this is needed for LSMAcquisitionEvents to work with multiple positions + // a position's z is taken from its entry for the Core-Focus device, + // so without one a stored z would be skipped if (core_.getFocusDevice().isEmpty()) { model_.logging().reportError( "The default focus device \"Core-Focus\" needs to be set to use multiple positions.");