From 8656759c4d16b94b38a79bf6294eef50e32dc78c Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 27 Oct 2026 01:48:44 -0700 Subject: [PATCH 1/5] remove the fallback for an unset stage angle --- .../lightsheetmanager/model/utils/GeometryUtils.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/utils/GeometryUtils.java b/src/main/java/org/micromanager/lightsheetmanager/model/utils/GeometryUtils.java index 4ba93e2b..df247f0e 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/utils/GeometryUtils.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/utils/GeometryUtils.java @@ -18,10 +18,6 @@ private GeometryUtils() { */ public static double getStageGeometricShiftFactor(double angle, final boolean pathA) { //double angle = 1.0; // TODO: props_.getPropValueFloat(Devices.Keys.PLUGIN, Properties.Keys.PLUGIN_STAGESCAN_ANGLE_PATHA); - if (angle < 1) { // case when property not defined - angle = 45.0; - //angle = ASIdiSPIM.oSPIM ? 60.0 : 45.0; - } if (!pathA) { angle = 90.0 - angle; } @@ -37,10 +33,6 @@ public static double getStageGeometricShiftFactor(double angle, final boolean pa */ public static double getStageTopViewCompressFactor(double angle, final boolean pathA) { //double angle = 1.0; // TODO: props_.getPropValueFloat(Devices.Keys.PLUGIN, Properties.Keys.PLUGIN_STAGESCAN_ANGLE_PATHA); - if (angle < 1) { // case when property not defined - angle = 45.0; - //angle = ASIdiSPIM.oSPIM ? 60.0 : 45.0; - } if (!pathA) { angle = 90.0 - angle; } From 04c01fe9341d8d009f8663b8f4eb59400a9687f2 Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 27 Oct 2026 02:20:19 -0700 Subject: [PATCH 2/5] remove the commented out angle lines from the geometry utils --- .../lightsheetmanager/model/utils/GeometryUtils.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/utils/GeometryUtils.java b/src/main/java/org/micromanager/lightsheetmanager/model/utils/GeometryUtils.java index df247f0e..f45ac55f 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/utils/GeometryUtils.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/utils/GeometryUtils.java @@ -17,7 +17,6 @@ private GeometryUtils() { * @return factor, e.g. 1.0 for 45 degrees, sqrt(3) for 60 degrees, etc. */ public static double getStageGeometricShiftFactor(double angle, final boolean pathA) { - //double angle = 1.0; // TODO: props_.getPropValueFloat(Devices.Keys.PLUGIN, Properties.Keys.PLUGIN_STAGESCAN_ANGLE_PATHA); if (!pathA) { angle = 90.0 - angle; } @@ -32,7 +31,6 @@ public static double getStageGeometricShiftFactor(double angle, final boolean pa * @return factor, e.g. 1/sqrt(2) for 45 degrees, 0.5 for 60 degrees, etc. */ public static double getStageTopViewCompressFactor(double angle, final boolean pathA) { - //double angle = 1.0; // TODO: props_.getPropValueFloat(Devices.Keys.PLUGIN, Properties.Keys.PLUGIN_STAGESCAN_ANGLE_PATHA); if (!pathA) { angle = 90.0 - angle; } From 10d8acf5e62c69606bbb55d21e6abbca789fc0cb Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 27 Oct 2026 02:28:05 -0700 Subject: [PATCH 3/5] remove the commented out stop and home from the navigation control panel --- .../gui/tabs/navigation/ControlPanel.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/navigation/ControlPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/navigation/ControlPanel.java index 005921f6..9f27629c 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/navigation/ControlPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/navigation/ControlPanel.java @@ -320,25 +320,6 @@ private void setOrigin() { } } - // Home and Stop - -// public void stop() { -// try { -// core_.stop(deviceName_); -// } catch (Exception e) { -// model_.studio().logs().showError(deviceName_ + " stop() failed!"); -// } -// } - -// // TODO: needed? -// private void home() { -// try { -// core_.home(deviceName_); -// } catch (Exception e) { -// model_.studio().logs().showError("failed!"); -// } -// } - //// Galvo // the galvo position is read inside the try, so a failed read skips the move instead of From 335b39f85d36f908a95001a66b30efa1613fb2dd Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 27 Oct 2026 02:30:31 -0700 Subject: [PATCH 4/5] remove commented out code from the save and calibration panels --- .../lightsheetmanager/gui/tabs/acquisition/SavePanel.java | 1 - .../lightsheetmanager/gui/tabs/setup/CalibrationPanel.java | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SavePanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SavePanel.java index 8a79e6f7..5237fcab 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SavePanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SavePanel.java @@ -252,7 +252,6 @@ public void createEventHandlers() { final String json = FileUtils.readFileToString(file.toString()); SettingsAdapter adapter = new SettingsAdapter(model_); adapter.convert(json); - //System.out.println(json); } }); } diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CalibrationPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CalibrationPanel.java index 70a12552..6e9742eb 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CalibrationPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CalibrationPanel.java @@ -117,10 +117,7 @@ private void createUserInterface() { pnlText.add(txtSlope_, "wrap"); pnlText.add(lblOffset, ""); pnlText.add(lblOffsetValue_, ""); - -// Panel pnlFields = new Panel(); -// pnlFields.setMinimumSize(new Dimension(20, 30)); - pnlText.add(txtOffset_, ""); + pnlText.add(txtOffset_, ""); switch (geometryType) { case DISPIM: @@ -140,7 +137,6 @@ private void createUserInterface() { break; case SCAPE: add(pnlText, "wrap"); - // add(pnlFields, "wrap"); add(btnUpdate_, "wrap, span 2, align center"); add(btnRunAutofocus_, "span 2, align center"); break; From 709aea8911464aeca160c89b3f20895492bfcc4c Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 27 Oct 2026 02:36:00 -0700 Subject: [PATCH 5/5] remove commented hardware hook --- .../acquisitions/AcquisitionEngineScape.java | 29 ------------------- 1 file changed, 29 deletions(-) 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 54a18017..02a2d2c9 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java @@ -678,32 +678,6 @@ public void close() { }, Acquisition.BEFORE_HARDWARE_HOOK); -// final PLogicSCAPE finalController = controller; -// currentAcquisition_.addHook(new AcquisitionHook() { -// @Override -// public AcquisitionEvent run(AcquisitionEvent event) { -// System.out.println("After hardware hook"); -// // for stage scanning: restore speed and set up scan at new position -// // non-multi-position situation is handled in prepareControllerForAcquisition instead -//// if (acqSettings_.stageScan().enabled() && acqSettings_.isUsingMultiplePositions()) { -//// final ASIXYStage xyStage = model_.devices().getDevice("SampleXY"); -//// final Point2D.Double pos = xyStage.getXYPosition(); -//// xyStage.setSpeedX(scanSpeedX_); -//// xyStage.setAccelerationX(scanAccelX_); -//// System.out.println("AFTER_HARDWARE_HOOK trigger"); -//// finalController.prepareStageScanForAcquisition(pos.x, pos.y, acqSettings_); -///// finalController.triggerControllerStartAcquisition(acqSettings_.acquisitionMode(), -//// acqSettings_.volumeSettings().firstView()); -//// } -// return event; -// } -// -// @Override -// public void close() { -// -// } -// }, Acquisition.AFTER_HARDWARE_HOOK); - final PLogicScape controllerInstance = controller_; // TODO This after camera hook is called after the camera has been readied to acquire a // sequence. I assume we want to tell the Tiger to start sending TTLs etc here @@ -1707,9 +1681,6 @@ public void recalculateSliceTiming() { asb_.timingBuilder(getTimingFromExposure()); } // Note: sliceDurationMs is computed automatically when build() is called - //final double sliceDurationMs = getSliceDuration(asb_.timingSettingsBuilder().build()); - //asb_.timingSettingsBuilder().sliceDurationMs(sliceDurationMs); - //System.out.println(asb_.timingSettingsBuilder()); } /**