Skip to content

Commit

Permalink
Metamorph: fix Z and T settings when the .nd file is inconsistent
Browse files Browse the repository at this point in the history
Back (forward?) ported from a6fb748 and 2e27ca2.

See QA 11128.
  • Loading branch information
melissalinkert committed Jun 18, 2015
1 parent 5b0e96c commit ad0342a
Showing 1 changed file with 9 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,12 @@ else if (key.equals("DoZSeries")) {
currentValue.append(line.substring(comma + 1).trim());
}

if (!globalDoZ) {
for (int i=0; i<hasZ.size(); i++) {
hasZ.set(i, false);
}
}

// figure out how many files we need

if (z != null) zc = Integer.parseInt(z);
Expand All @@ -512,6 +518,9 @@ else if (!doTimelapse) {
if (cc == 1 && bizarreMultichannelAcquisition) {
cc = 2;
}
if (tc == 0) {
tc = 1;
}

int numFiles = cc * tc;
if (nstages > 0) numFiles *= nstages;
Expand Down

0 comments on commit ad0342a

Please sign in to comment.