Remove commented-out code and default SCAPE settings to the SCAPE stage angle

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

@@ -9,6 +9,7 @@
 import org.micromanager.lightsheetmanager.model.DeviceManager;
 import org.micromanager.lightsheetmanager.model.PluginSettings;
 import org.micromanager.lightsheetmanager.model.acquisitions.LightSheetEventAdapter;
+import org.micromanager.lightsheetmanager.model.playlist.AcquisitionTableData;
 import org.micromanager.lightsheetmanager.model.positions.PositionUpdater;
 import org.micromanager.lightsheetmanager.model.UserSettings;
 import org.micromanager.lightsheetmanager.model.acquisitions.AcquisitionEngine;
@@ -36,7 +37,7 @@ public class LightSheetManager implements LightSheetManagerApi, AutoCloseable {
     private final PositionUpdater positionUpdater_;
 
     private AcquisitionEngine acqEngine_;
-    //private final AcquisitionTableData acqTableData_;
+    private final AcquisitionTableData acqTableData_;
 
     public LightSheetManager(final Studio studio) {
         studio_ = Objects.requireNonNull(studio,
@@ -49,6 +50,7 @@ public LightSheetManager(final Studio studio) {
 
         deviceManager_ = new DeviceManager(studio_, this);
         positionUpdater_ = new PositionUpdater(this);
+        acqTableData_ = new AcquisitionTableData();
 
         // set during setup if there is an error
         errorText_ = "";

src/main/java/org/micromanager/lightsheetmanager/api/internal/ScapeAcquisitionSettings.java

@@ -7,6 +7,7 @@
 import org.micromanager.lightsheetmanager.api.StageScanSettings;
 import org.micromanager.lightsheetmanager.api.TimingSettings;
 import org.micromanager.lightsheetmanager.api.data.CameraMode;
+import org.micromanager.lightsheetmanager.api.data.GeometryType;
 
 import java.util.Arrays;
 import java.util.Objects;
@@ -163,7 +164,9 @@ public static class Builder
 
         private TimingSettings.Builder timingBuilder = DefaultTimingSettings.builder();
         private SliceSettings.Builder sliceBuilder = DefaultSliceSettings.builder();
-        private StageScanSettings.Builder stageScanBuilder = DefaultStageScanSettings.builder();
+        // TODO: a diSPIM profile missing its stage angle loads SCAPE's until profiles load per geometry
+        private StageScanSettings.Builder stageScanBuilder = DefaultStageScanSettings.builder()
+                .firstViewAngle(GeometryType.SCAPE.defaultFirstViewAngle());
         private SheetCalibration.Builder sheetCalibBuilder = DefaultSheetCalibration.builder();
         private SliceCalibration.Builder sliceCalibBuilder = DefaultSliceCalibration.builder();
 

src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java

@@ -264,11 +264,6 @@ public AcquisitionEngine(final LightSheetManager model) {
         acqSettings_ = asb_.build();
     }
 
-
-    //public abstract DefaultAcquisitionSettingsDISPIM settings();
-
-    //public abstract <T extends DefaultAcquisitionSettings.Builder<Builder>> T settingsBuilder();
-
     abstract boolean setup();
 
     abstract boolean run();

src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/LightSheetEventAdapter.java

@@ -445,7 +445,6 @@ public boolean hasNext() {
             public AcquisitionEvent next() {
                 AcquisitionEvent sliceEvent = event.copy();
                 sliceEvent.setAxisPosition(AcqEngMetadata.Z_AXIS, zIndex_);
-                // System.out.println("Final Event Axes: " + sliceEvent.getAxesAsJSONString());
                 // The tiger controller handles Z axis, so no need to add the actual Z position
                 zIndex_++;
                 return sliceEvent;

src/main/java/org/micromanager/lightsheetmanager/model/devices/vendor/ASIPLogic.java

@@ -173,7 +173,6 @@ public static class Values {
         public static final String YES = "Yes";
 
         public static final String DO_IT = "Do it";
-        //public static final String NO_PRESET = "no preset";
     }
 
     public enum Preset {

src/main/java/org/micromanager/lightsheetmanager/model/utils/GeometryUtils.java

@@ -8,6 +8,7 @@ private GeometryUtils() {
         throw new AssertionError("Utility class; do not instantiate.");
     }
 
+    // TODO: unused until overview acquisitions are implemented
     /***
      * Compute how far we need to shift each image for deskew relative to Z-step size (orthogonal to image) based on user-specified angle
      * e.g. with diSPIM, angle is 45 degrees so factor is 1.0, for oSPIM the factor is tan(60 degrees) = sqrt(3), etc.