Skip to content

fix timing settings for galvo scan, fix ASIScanner setAmplitudeY #344

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.

Sign up for GitHub

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

Merged
bls337 merged 1 commit into from
Dec 13, 2025
Merged

fix timing settings for galvo scan, fix ASIScanner setAmplitudeY #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/main/java/org/micromanager/lightsheetmanager/model/PLogicSCAPE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,8 @@ public boolean prepareControllerForAcquisitionSide(
final boolean oppositeDirections = false;

scanner_.setSPIMAlternateDirections(oppositeDirections);
scanner_.setSPIMScanDuration(settings.timingSettings().scanDuration());
scanner_.setSPIMScanDuration(
settings.timingSettings().sliceDuration() - settings.timingSettings().delayBeforeScan());
scanner_.sa().setAmplitudeY(sliceAmplitude);
scanner_.sa().setOffsetY(sliceCenter);
scanner_.setSPIMNumSlices(numSlicesHW);
Expand All @@ -537,7 +538,7 @@ public boolean prepareControllerForAcquisitionSide(
// if we artificially shifted centers due to extra trigger and only moving piezo
// then move galvo center back to where it would have been
if (settings.cameraMode() == CameraMode.OVERLAP) {
piezoCenter -= piezoAmplitude / (2 * (numSlicesHW - 1));
piezoCenter -= settings.volumeSettings().sliceStepSize() / 2;
}
piezoAmplitude = 0.0;
}
Expand Down Expand Up @@ -597,8 +598,9 @@ public boolean prepareControllerForAcquisitionSide(
// // width should be increased by ratio (1 + settle_fraction)
// sheetWidth += (sheetWidth * settleTime/readoutTime);
}
scanner_.sa().setAmplitudeX(sheetWidth);
scanner_.sa().setOffsetX(sheetOffset);
// SCOPE should not modify the x-axis of the galvo
// scanner_.sa().setAmplitudeX(sheetWidth);
// scanner_.sa().setOffsetX(sheetOffset);
}
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/model/devices/vendor/SingleAxis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public double getAmplitudeX() {
}

public void setAmplitudeY(final double degrees) {
setPropertyFloat(Properties.AMPLITUDE_X, degrees);
setPropertyFloat(Properties.AMPLITUDE_Y, degrees);
}

public double getAmplitudeY() {
Expand Down
Loading