Merge pull request micro-manager#1887 from nicost/acqOnMove

Adds TestAcquisition to the MDA and makes this an option in the SnapOnMove plugin.
nicost · Feb 10, 2024 · 5464ca2 · 5464ca2
2 parents 7624b63 + d5bfa06
commit 5464ca2
Show file tree

Hide file tree

Showing 6 changed files with 1,982 additions and 107 deletions.
diff --git a/...dio/src/main/java/org/micromanager/acquisition/internal/acqengjcompat/AcqEngJAdapter.java b/...dio/src/main/java/org/micromanager/acquisition/internal/acqengjcompat/AcqEngJAdapter.java
@@ -786,7 +786,7 @@ public AcquisitionEvent run(AcquisitionEvent event) {
             }
             try {
                if (when == AcquisitionAPI.BEFORE_HARDWARE_HOOK) {
-                  if (event.isZSequenced() || event.getZIndex() == 0) {
+                  if (event.getZIndex() == 0) {
                      if (!event.isZSequenced() && sequenceSettings.useChannels()
                              && (sequenceSettings.acqOrderMode()
                                        == AcqOrderMode.TIME_POS_SLICE_CHANNEL
@@ -799,7 +799,7 @@ public AcquisitionEvent run(AcquisitionEvent event) {
                      zStagePositionBefore_ = core_.getPosition();
                   }
                } else if (when == AcquisitionAPI.AFTER_EXPOSURE_HOOK) {
-                  if (event.isZSequenced() && event.getZIndex() != null
+                  if (event.getZIndex() != null
                         && event.getZIndex() == sequenceSettings.slices().size() - 1) {
                      if (!event.isZSequenced() && sequenceSettings.useChannels()
                              && (sequenceSettings.acqOrderMode()