From 79457d3e026c26bf0ee04305b4ddf368d2257086 Mon Sep 17 00:00:00 2001 From: Stephan Preibisch Date: Wed, 10 Apr 2024 09:11:14 -0400 Subject: [PATCH] expose blocksize for Lazy compute of CLLCN --- .../hotknife/SparkGenerateFaceScaleSpace.java | 12 +++++++++++- .../saalfeldlab/hotknife/SparkNormalizeN5.java | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/janelia/saalfeldlab/hotknife/SparkGenerateFaceScaleSpace.java b/src/main/java/org/janelia/saalfeldlab/hotknife/SparkGenerateFaceScaleSpace.java index 8a71da91..8112386a 100644 --- a/src/main/java/org/janelia/saalfeldlab/hotknife/SparkGenerateFaceScaleSpace.java +++ b/src/main/java/org/janelia/saalfeldlab/hotknife/SparkGenerateFaceScaleSpace.java @@ -306,6 +306,16 @@ protected static RandomAccessibleInterval filter( final boolean invert, final boolean normalizeContrast, final int scaleIndex ) + { + return filter(sourceRaw, invert, normalizeContrast, scaleIndex, new int[] {1024, 1024, 1} ); + } + + protected static RandomAccessibleInterval filter( + RandomAccessibleInterval sourceRaw, + final boolean invert, + final boolean normalizeContrast, + final int scaleIndex, + final int[] blocksize ) { if ( invert ) sourceRaw = Converters.convertRAI(sourceRaw, (in,out) -> out.set( 255 - in.get() ), new UnsignedByteType() ); @@ -328,7 +338,7 @@ protected static RandomAccessibleInterval filter( return Lazy.process( sourceRaw, - new int[] {1024, 1024, 1}, + blocksize, new UnsignedByteType(), AccessFlags.setOf(AccessFlags.VOLATILE), cllcn); diff --git a/src/main/java/org/janelia/saalfeldlab/hotknife/SparkNormalizeN5.java b/src/main/java/org/janelia/saalfeldlab/hotknife/SparkNormalizeN5.java index 41239f27..8961d386 100644 --- a/src/main/java/org/janelia/saalfeldlab/hotknife/SparkNormalizeN5.java +++ b/src/main/java/org/janelia/saalfeldlab/hotknife/SparkNormalizeN5.java @@ -111,7 +111,7 @@ private static void saveFullScaleBlock(final String n5PathInput, final RandomAccessibleInterval filteredSource; if (normalizeMethod == NormalizationMethod.LOCAL_CONTRAST) { - filteredSource = SparkGenerateFaceScaleSpace.filter(sourceRaw, invert, true, 0); + filteredSource = SparkGenerateFaceScaleSpace.filter(sourceRaw, invert, true, 0, blockSize ); } else if (normalizeMethod == NormalizationMethod.LAYER_INTENSITY) { filteredSource = applyShifts(sourceRaw, shifts, invert); } else {