Skip to content

generalize LightSheetEventAdapter to accept AcquisitionSettings #454

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 1 commit into from
Jul 23, 2026
Merged

generalize LightSheetEventAdapter to accept AcquisitionSettings #454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions ...in/java/org/micromanager/lightsheetmanager/model/acquisitions/LightSheetEventAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {

Expand Down Expand Up @@ -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) {

Expand Down Expand Up @@ -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) {

Expand All @@ -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) {

Expand All @@ -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) {

Expand All @@ -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) {

Expand Down
Loading