Skip to content

forgot to remove code that used the stack processor #328

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
merged 1 commit into from
Nov 11, 2025
Merged

forgot to remove code that used the stack processor #328

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
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ public String[] getAvailableGroups() {
ArrayList<String> strGroups = new ArrayList<>();
// strGroups.add("None");
for (String group : groups) {
// System.out.println("grp: " + group);
// StrVector st = model_.studio().core().getAvailableConfigGroups();
// for (String s : st)
// System.out.println(s);
// a channel group must have multiple presets to be detected
if (model_.studio().core().getAvailableConfigs(group).size() > 1) {
strGroups.add(group);
}
Expand Down
36 changes: 15 additions & 21 deletions ...n/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDISPIM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,27 +245,21 @@ boolean run() {




if (projectionMode) {
// DiSPIM always uses 45 degrees
double theta = Math.PI / 4;
double zStep = acqSettings_.volumeSettings().sliceStepSize();
int numZSlices = acqSettings_.volumeSettings().slicesPerView();
int cameraWidth = (int) core_.getImageWidth();
int cameraHeight = (int) core_.getImageHeight();
double pixelSizeXYUm = core_.getPixelSizeUm();

int numUniqueProcessorsNeeded = 2; // Always keep enough around for 2 views
if (acqSettings_.isUsingChannels()) {
numUniqueProcessorsNeeded *= acqSettings_.channels().length;
}

AcqEngJStackProcessors proc =
new AcqEngJStackProcessors(ObliqueStackProcessor.YX_PROJECTION, theta,
pixelSizeXYUm,
zStep, numZSlices, cameraWidth, cameraHeight, numUniqueProcessorsNeeded);
currentAcquisition_.addImageProcessor(proc);
}
// TODO: how much of this do we need? use the projector plugin...
// if (projectionMode) {
// // DiSPIM always uses 45 degrees
// double theta = Math.PI / 4;
// double zStep = acqSettings_.volumeSettings().sliceStepSize();
// int numZSlices = acqSettings_.volumeSettings().slicesPerView();
// int cameraWidth = (int) core_.getImageWidth();
// int cameraHeight = (int) core_.getImageHeight();
// double pixelSizeXYUm = core_.getPixelSizeUm();
//
// int numUniqueProcessorsNeeded = 2; // Always keep enough around for 2 views
// if (acqSettings_.isUsingChannels()) {
// numUniqueProcessorsNeeded *= acqSettings_.channels().length;
// }
// }

long acqButtonStart = System.currentTimeMillis();

Expand Down
36 changes: 15 additions & 21 deletions ...in/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,27 +283,21 @@ boolean run() {




if (projectionMode) {
// DiSPIM always uses 45 degrees
double theta = Math.PI / 4;
double zStep = acqSettings_.volumeSettings().sliceStepSize();
int numZSlices = acqSettings_.volumeSettings().slicesPerView();
int cameraWidth = (int) core_.getImageWidth();
int cameraHeight = (int) core_.getImageHeight();
double pixelSizeXYUm = core_.getPixelSizeUm();

int numUniqueProcessorsNeeded = 2; // Always keep enough around for 2 views
if (acqSettings_.isUsingChannels()) {
numUniqueProcessorsNeeded *= acqSettings_.channels().length;
}

AcqEngJStackProcessors proc =
new AcqEngJStackProcessors(ObliqueStackProcessor.YX_PROJECTION, theta,
pixelSizeXYUm,
zStep, numZSlices, cameraWidth, cameraHeight, numUniqueProcessorsNeeded);
currentAcquisition_.addImageProcessor(proc);
}
// TODO: how much of this do we need? use the projector plugin...
// if (projectionMode) {
// // DiSPIM always uses 45 degrees
// double theta = Math.PI / 4;
// double zStep = acqSettings_.volumeSettings().sliceStepSize();
// int numZSlices = acqSettings_.volumeSettings().slicesPerView();
// int cameraWidth = (int) core_.getImageWidth();
// int cameraHeight = (int) core_.getImageHeight();
// double pixelSizeXYUm = core_.getPixelSizeUm();
//
// int numUniqueProcessorsNeeded = 2; // Always keep enough around for 2 views
// if (acqSettings_.isUsingChannels()) {
// numUniqueProcessorsNeeded *= acqSettings_.channels().length;
// }
// }

long acqButtonStart = System.currentTimeMillis();

Expand Down
Loading