add support for multi-SEM stacks with scan numbers > 999 and <= 99999

Author: trautmane

render-app/src/main/java/org/janelia/alignment/multisem/MultiSemUtilities.java

@@ -89,11 +89,11 @@ public static String getMfovSfovForTileId(final String tileId) throws IllegalArg
      * @return 01 for w60_magc0399_scan005_m0013_r46_s01
      */
     public static String getSFOVIndexForTileId(final String tileId) throws IllegalArgumentException {
-        final int scanIndex = tileId.indexOf("scan");
+        final int scanIndex = tileId.indexOf("_sc"); // tileIds can contain _scan005_ or _sc01234_
         if ((scanIndex < 0) || (tileId.length() < (scanIndex + 21))) {
             throw new IllegalArgumentException("SFOV index cannot be derived from tileId " + tileId);
         }
-        return tileId.substring(scanIndex + 19);
+        return tileId.substring(scanIndex + 20);
     }
 
     /**

render-app/src/test/java/org/janelia/alignment/multisem/MultiSemUtilitiesTest.java

@@ -21,6 +21,16 @@ public void testTileIdParsers() {
                             "m0013_s01", MultiSemUtilities.getMfovSfovForTileId(tileId));
         Assert.assertEquals("invalid SFOVIndexForTileId",
                             "01", MultiSemUtilities.getSFOVIndexForTileId(tileId));
+
+        final String manyScanTileId = "w66_magc0000_sc09876_m0005_r65_s16";
+        Assert.assertEquals("invalid MagcMfov",
+                            "0000_m0005", MultiSemUtilities.getMagcMfovForTileId(manyScanTileId));
+        Assert.assertEquals("invalid MagcMfovSfov",
+                            "0000_m0005_s16", MultiSemUtilities.getMagcMfovSfovForTileId(manyScanTileId));
+        Assert.assertEquals("invalid MfovSfov",
+                            "m0005_s16", MultiSemUtilities.getMfovSfovForTileId(manyScanTileId));
+        Assert.assertEquals("invalid SFOVIndexForTileId",
+                            "16", MultiSemUtilities.getSFOVIndexForTileId(manyScanTileId));
     }
 
 }