From 214fbb6d41a01cf5e96c3a44c1d111272b94186c Mon Sep 17 00:00:00 2001
From: Brandon <brandon@asiimaging.com>
Date: Thu, 23 Jul 2026 11:13:08 -0700
Subject: [PATCH] generalize LightSheetEventAdapter to accept
 AcquisitionSettings

---
 .../model/acquisitions/LightSheetEventAdapter.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/LightSheetEventAdapter.java b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/LightSheetEventAdapter.java
index 0f233ccf..3887421d 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/LightSheetEventAdapter.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/LightSheetEventAdapter.java
@@ -7,7 +7,6 @@
 import org.micromanager.acqj.main.AcquisitionEvent;
 import org.micromanager.acqj.util.AcquisitionEventIterator;
 import org.micromanager.lightsheetmanager.api.AcquisitionSettings;
-import org.micromanager.lightsheetmanager.api.internal.ScapeAcquisitionSettings;
 import org.micromanager.lightsheetmanager.model.channels.ChannelSpec;
 
 import java.util.ArrayList;
@@ -39,7 +38,7 @@ private LightSheetEventAdapter() {
     }
 
     public static Iterator<AcquisitionEvent> createTimelapseMultiChannelVolumeAcqEvents(
-            AcquisitionEvent baseEvent, ScapeAcquisitionSettings settings,
+            AcquisitionEvent baseEvent, AcquisitionSettings settings,
             String[] cameraDeviceNames,
             Function<AcquisitionEvent, AcquisitionEvent> eventMonitor) {
 
@@ -70,7 +69,7 @@ public static Iterator<AcquisitionEvent> createTimelapseMultiChannelVolumeAcqEve
     }
 
     public static Iterator<AcquisitionEvent> createTimelapseVolumeAcqEvents(
-            AcquisitionEvent baseEvent, ScapeAcquisitionSettings settings,
+            AcquisitionEvent baseEvent, AcquisitionSettings settings,
             String[] cameraDeviceNames,
             Function<AcquisitionEvent, AcquisitionEvent> eventMonitor) {
 
@@ -99,7 +98,7 @@ public static Iterator<AcquisitionEvent> createTimelapseVolumeAcqEvents(
      *                    false: do an entire volume in one channel, then the next one
      */
     public static Iterator<AcquisitionEvent> createMultiChannelVolumeAcqEvents(
-            AcquisitionEvent baseEvent, ScapeAcquisitionSettings settings,
+            AcquisitionEvent baseEvent, AcquisitionSettings settings,
             String[] cameraDeviceNames,
             Function<AcquisitionEvent, AcquisitionEvent> eventMonitor, boolean interleaved) {
 
@@ -125,7 +124,7 @@ public static Iterator<AcquisitionEvent> createMultiChannelVolumeAcqEvents(
     }
 
     public static Iterator<AcquisitionEvent> createVolumeAcqEvents(
-            AcquisitionEvent baseEvent, ScapeAcquisitionSettings settings,
+            AcquisitionEvent baseEvent, AcquisitionSettings settings,
             String[] cameraDeviceNames,
             Function<AcquisitionEvent, AcquisitionEvent> eventMonitor) {
 
@@ -141,7 +140,7 @@ public static Iterator<AcquisitionEvent> createVolumeAcqEvents(
     }
 
     public static Iterator<AcquisitionEvent> createChannelAcqEvents(
-            AcquisitionEvent baseEvent, ScapeAcquisitionSettings settings,
+            AcquisitionEvent baseEvent, AcquisitionSettings settings,
             String[] cameraDeviceNames,
             Function<AcquisitionEvent, AcquisitionEvent> eventMonitor) {
 
@@ -161,7 +160,7 @@ public static Iterator<AcquisitionEvent> createChannelAcqEvents(
     }
 
     public static Iterator<AcquisitionEvent> createAcqEvents(
-            AcquisitionEvent baseEvent, ScapeAcquisitionSettings settings,
+            AcquisitionEvent baseEvent, AcquisitionSettings settings,
             String[] cameraDeviceNames,
             Function<AcquisitionEvent, AcquisitionEvent> eventMonitor) {