BioTek: refine field and channel name regexes

This allows a negative field index and more punctuation characters in the channel name.
glencoesoftware · Jul 28, 2022 · 9be8c76 · 9be8c76
1 parent 34b6842
commit 9be8c76
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/glencoesoftware/bioformats2raw/BioTekReader.java b/src/main/java/com/glencoesoftware/bioformats2raw/BioTekReader.java
@@ -60,8 +60,8 @@ public class BioTekReader extends FormatReader {
   private static final Logger LOGGER =
     LoggerFactory.getLogger(BioTekReader.class);
   private static final String BIOTEK_MAGIC = "BTIImageMetaData";
-  private static final String WELL_REGEX = "([A-Z]{1,2})(\\d{1,2})_(\\d+)";
-  private static final String ALPHANUM = "([A-Za-z0-9 ]+)";
+  private static final String WELL_REGEX = "([A-Z]{1,2})(\\d{1,2})_(-?\\d+)";
+  private static final String ALPHANUM = "([A-Za-z0-9 ,\\[\\]]+)";
   private static final String SUFFIX = ".tif[f]?";
   private static final String TIFF_REGEX_A =
     WELL_REGEX + "_(\\d+)_(\\d+)_" + ALPHANUM + "_(\\d+)" + SUFFIX;