Skip to content
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.

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

only need one side for SCAPE #257

Merged
merged 1 commit into from
Mar 15, 2024
Merged
Changes from all commits
Commits
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
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
Loading