Skip to content

Commit

Permalink
only need one side for SCAPE
Browse files Browse the repository at this point in the history
  • Loading branch information
Brandon committed Mar 15, 2024
1 parent e3027a7 commit a2352f1
Showing 1 changed file with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public static class Builder extends DefaultAcquisitionSettings.Builder<Builder>
private DefaultSliceSettings.Builder ssb_ = new DefaultSliceSettings.Builder();
private DefaultSliceSettingsLS.Builder ssbLS_ = new DefaultSliceSettingsLS.Builder();
private DefaultScanSettings.Builder scsb_ = new DefaultScanSettings.Builder();
private DefaultSheetCalibration.Builder[] shcb_ = new DefaultSheetCalibration.Builder[2];
private DefaultSliceCalibration.Builder[] slcb_ = new DefaultSliceCalibration.Builder[2];
private DefaultSheetCalibration.Builder[] shcb_ = new DefaultSheetCalibration.Builder[1];
private DefaultSliceCalibration.Builder[] slcb_ = new DefaultSliceCalibration.Builder[1];
private AcquisitionMode acquisitionMode_ = AcquisitionMode.NONE;
private MultiChannelMode channelMode_ = MultiChannelMode.NONE;
private CameraMode cameraMode_ = CameraMode.EDGE;
Expand All @@ -39,7 +39,7 @@ public static class Builder extends DefaultAcquisitionSettings.Builder<Builder>
private double liveScanPeriod_ = 20.0;

public Builder() {
for (int i = 0; i < 2; i++) {
for (int i = 0; i < 1; i++) {
shcb_[i] = new DefaultSheetCalibration.Builder();
slcb_[i] = new DefaultSliceCalibration.Builder();
}
Expand All @@ -52,7 +52,7 @@ public Builder(final DefaultAcquisitionSettingsSCAPE acqSettings) {
ssb_ = acqSettings.sliceSettings_.copyBuilder();
ssbLS_ = acqSettings.sliceSettingsLS_.copyBuilder();
scsb_ = acqSettings.scanSettings_.copyBuilder();
for (int i = 0; i < 2; i++) {
for (int i = 0; i < 1; i++) {
slcb_[i] = acqSettings.sliceCalibrations_[i].copyBuilder();
shcb_[i] = acqSettings.sheetCalibrations_[i].copyBuilder();
}
Expand Down Expand Up @@ -361,9 +361,9 @@ private DefaultAcquisitionSettingsSCAPE(Builder builder) {
sliceSettings_ = builder.ssb_.build();
sliceSettingsLS_ = builder.ssbLS_.build();
scanSettings_ = builder.scsb_.build();
sheetCalibrations_ = new DefaultSheetCalibration[2];
sliceCalibrations_ = new DefaultSliceCalibration[2]; // TODO: populate with numViews instead of magic number
for (int i = 0; i < 2; i++) {
sheetCalibrations_ = new DefaultSheetCalibration[1];
sliceCalibrations_ = new DefaultSliceCalibration[1]; // TODO: use this object directly
for (int i = 0; i < 1; i ++) {
sheetCalibrations_[i] = builder.shcb_[i].build();
sliceCalibrations_[i] = builder.slcb_[i].build();
}
Expand Down

0 comments on commit a2352f1

Please sign in to comment.