Skip to content

Commit dd746ff

Browse files
authored
Merge pull request #324 from bls337/main
fix number of triggers for multiple simultaneous cameras
2 parents b4beb5f + 9767219 commit dd746ff

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class LightSheetManagerPlugin implements MenuPlugin, SciJavaPlugin {
1212
public static final String copyright = "Applied Scientific Instrumentation (ASI), 2022-2025";
1313
public static final String description = "A plugin to control various types of light sheet microscopes.";
1414
public static final String menuName = "Light Sheet Manager";
15-
public static final String version = "0.4.9";
15+
public static final String version = "0.5.0";
1616

1717
private Studio studio_;
1818
private LightSheetManager model_;

src/main/java/org/micromanager/lightsheetmanager/model/PLogicSCAPE.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,9 @@ public boolean prepareControllerForAcquisitionSide(
475475
numSlicesHW += 1;
476476
}
477477

478-
// increase number of trigger pulses for multiple simultaneous
479-
480-
// cameras
481-
numSlicesHW *= model_.devices().getDeviceAdapter().getNumSimultaneousCameras();
478+
// HACK(Brandon): used this to get a single camera to work with 2 simultaneous cameras
479+
// increase number of trigger pulses for multiple simultaneous cameras
480+
// numSlicesHW *= model_.devices().getDeviceAdapter().getNumSimultaneousCameras();
482481

483482
// FIXME: more light sheet setup
484483
//final double slope1 = settings.sliceCalibration(1).sliceSlope();

0 commit comments

Comments
 (0)