From ad0342acf5216c4bd23da8a0d071cb5ecb8e5fd7 Mon Sep 17 00:00:00 2001
From: Melissa Linkert <melissa@glencoesoftware.com>
Date: Thu, 18 Jun 2015 15:14:27 -0500
Subject: [PATCH] Metamorph: fix Z and T settings when the .nd file is
 inconsistent

Back (forward?) ported from a6fb748 and 2e27ca2.

See QA 11128.
---
 .../formats-gpl/src/loci/formats/in/MetamorphReader.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/components/formats-gpl/src/loci/formats/in/MetamorphReader.java b/components/formats-gpl/src/loci/formats/in/MetamorphReader.java
index a238232a133..50a81d2ad24 100644
--- a/components/formats-gpl/src/loci/formats/in/MetamorphReader.java
+++ b/components/formats-gpl/src/loci/formats/in/MetamorphReader.java
@@ -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);
@@ -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;