stitchingModelSupplier must always be there

saalfeldlab · Aug 15, 2023 · 9b3e41b · 9b3e41b
1 parent b8eee7d
commit 9b3e41b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ava-client/src/main/java/org/janelia/render/client/newsolver/AffineDistributedSolver.java b/...ava-client/src/main/java/org/janelia/render/client/newsolver/AffineDistributedSolver.java
@@ -135,7 +135,7 @@ protected < M extends Model< M > & Affine2D< M >, S extends Model< S > & Affine2
 
 		final FIBSEMAlignmentParameters< M, S > solveParams = new FIBSEMAlignmentParameters< M, S >(
 				blockModel,
-				stitchFirst ? (Function< Integer,S > & Serializable )(z) -> stitchingModel : null,
+				(Function< Integer,S > & Serializable )(z) -> stitchingModel,
 				stitchFirst ? (Function< Integer, Integer > & Serializable )(z) -> cmdLineSetup.minStitchingInliers : null,
 				cmdLineSetup.maxAllowedErrorStitching,
 				cmdLineSetup. maxIterationsStitching,

diff --git a/.../main/java/org/janelia/render/client/newsolver/solvers/affine/AffineAlignBlockWorker.java b/.../main/java/org/janelia/render/client/newsolver/solvers/affine/AffineAlignBlockWorker.java
@@ -120,7 +120,7 @@ public AffineAlignBlockWorker(
 			this.matchFilter = new RandomMaxAmountFilter( blockData.solveTypeParameters().maxNumMatches() );
 
 		// used locally
-		this.stitchFirst = blockData.solveTypeParameters().minStitchingInliersSupplier() != null && blockData.solveTypeParameters().stitchingModelSupplier() != null;
+		this.stitchFirst = blockData.solveTypeParameters().minStitchingInliersSupplier() != null;
 		this.pairs = new ArrayList<>();
 		this.zToPairs = new HashMap<>();