Apply obf constant value if non-circulant

elevans · hinerm · commit 431da40dad72 · 2024-04-09T14:57:25.000-05:00
If non-circulant mode is desired, apply the
OutOfBoundsConstantValueFactory.
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/deconvolve/PadAndRichardsonLucy.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/deconvolve/PadAndRichardsonLucy.java
@@ -36,6 +36,7 @@
 import net.imglib2.Dimensions;
 import net.imglib2.FinalDimensions;
 import net.imglib2.RandomAccessibleInterval;
+import net.imglib2.outofbounds.OutOfBoundsConstantValueFactory;
 import net.imglib2.outofbounds.OutOfBoundsMirrorFactory;
 import net.imglib2.outofbounds.OutOfBoundsFactory;
 import net.imglib2.type.NativeType;
@@ -216,16 +217,30 @@ public RandomAccessibleInterval<O> apply(RandomAccessibleInterval<I> input,
 		@Nullable Boolean accelerate, @Nullable long[] borderSize,
 		@Nullable OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput)
 	{
-		if (obfInput == null) obfInput = new OutOfBoundsMirrorFactory<>(
-			OutOfBoundsMirrorFactory.Boundary.SINGLE);
-
+		// default to circulant
 		if (nonCirculant == null) {
-			this.nonCirculant = false;
+			nonCirculant = false;
+			this.nonCirculant = nonCirculant;
 		}
 		else {
 			this.nonCirculant = nonCirculant;
 		}
 
+		// out of bounds factory will be different depending on if circulant or
+		// non-circulant is used
+		if (obfInput == null) {
+
+			if (!nonCirculant) {
+				obfInput = new OutOfBoundsMirrorFactory<>(
+					OutOfBoundsMirrorFactory.Boundary.SINGLE);
+			}
+			else if (nonCirculant) {
+				obfInput = new OutOfBoundsConstantValueFactory<>(Util
+					.getTypeFromInterval(input).createVariable());
+			}
+		}
+
+		// default to no acceleration
 		if (accelerate == null) {
 			accelerate = false;
 		}
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/deconvolve/PadAndRichardsonLucyTV.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/deconvolve/PadAndRichardsonLucyTV.java
@@ -38,6 +38,7 @@
 import net.imglib2.FinalDimensions;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.outofbounds.OutOfBoundsMirrorFactory;
+import net.imglib2.outofbounds.OutOfBoundsConstantValueFactory;
 import net.imglib2.outofbounds.OutOfBoundsFactory;
 import net.imglib2.type.NativeType;
 import net.imglib2.type.numeric.ComplexType;
@@ -206,10 +207,29 @@ public RandomAccessibleInterval<O> apply(RandomAccessibleInterval<I> input,
 		Float regularizationFactor, @Nullable long[] borderSize,
 		@Nullable OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput)
 	{
-		if (obfInput == null) obfInput = new OutOfBoundsMirrorFactory<>(
-			OutOfBoundsMirrorFactory.Boundary.SINGLE);
+		// default to circulant
+		if (nonCirculant == null) {
+			nonCirculant = false;
+			this.nonCirculant = nonCirculant;
+		}
+		else {
+			this.nonCirculant = nonCirculant;
+		}
+
+		// out of bounds factory will be different depending on if circulant or
+		// non-circulant is used
+		if (obfInput == null) {
+
+			if (!nonCirculant) {
+				obfInput = new OutOfBoundsMirrorFactory<>(
+					OutOfBoundsMirrorFactory.Boundary.SINGLE);
+			}
+			else if (nonCirculant) {
+				obfInput = new OutOfBoundsConstantValueFactory<>(Util
+					.getTypeFromInterval(input).createVariable());
+			}
+		}
 
-		this.nonCirculant = nonCirculant;
 		this.maxIterations = maxIterations;
 		this.regularizationFactor = regularizationFactor;
 
