add Orca Fusion BT to Hamamatsu camera class

micro-manager · Oct 24, 2023 · b752d80 · b752d80
1 parent 7ceec5d
commit b752d80
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...in/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java b/...in/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java
@@ -832,6 +832,7 @@ public DefaultTimingSettings.Builder getTimingFromPeriodAndLightExposure(Default
         // special adjustment for Photometrics cameras that possibly has extra clear time which is counted in reset time
         //    but not in the camera exposure time
         // TODO: skipped PVCAM case, update comment
+
         float cameraExposure = NumberUtils.ceilToQuarterMs(cameraResetTime) + laserDuration;
 
         switch (asb.cameraMode()) {

diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/devices/cameras/HamamatsuCamera.java b/src/main/java/org/micromanager/lightsheetmanager/model/devices/cameras/HamamatsuCamera.java
@@ -9,11 +9,12 @@
 /**
  * Support for Hamamatsu cameras.
  * <p>Devices Adapter: HamamatsuHam
- * <p>Camera Support: ORCA-Flash4, ORCA-Fusion
+ * <p>Camera Support: ORCA-Flash4, ORCA-Fusion, ORCA-Fusion BT
  */
 public class HamamatsuCamera extends CameraBase implements LightSheetCamera {
 
     public static class Models {
+        public static final String FUSION_BT = "C15440";
         public static final String FUSION = "C14440";
         public static final String FLASH4 = "C11440";
     }
@@ -105,8 +106,8 @@ public int getBinning() {
 
     @Override
     public Rectangle getResolution() {
-        int x = 0;
-        int y = 0;
+        int x;
+        int y;
         if (isFusion()) {
             x = 2304;
             y = 2304;
@@ -224,7 +225,8 @@ private boolean isSlowReadout() {
     }
 
     public boolean isFusion() {
-        return getProperty(Properties.CAMERA_NAME).startsWith(Models.FUSION);
+        return getProperty(Properties.CAMERA_NAME).startsWith(Models.FUSION)
+                || getProperty(Properties.CAMERA_NAME).startsWith(Models.FUSION_BT);
     }
 
     public boolean isFlash4() {

diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/devices/cameras/PVCamera.java b/src/main/java/org/micromanager/lightsheetmanager/model/devices/cameras/PVCamera.java
@@ -5,7 +5,6 @@
 import org.micromanager.lightsheetmanager.api.data.CameraMode;
 
 import java.awt.Rectangle;
-import java.util.Objects;
 
 /**
  * Support for Teledyne Photometrics cameras.