From 23740ceb3b798e86f1bbeb9bd121788170943766 Mon Sep 17 00:00:00 2001 From: Stephan Preibisch Date: Thu, 14 Mar 2024 15:11:48 -0400 Subject: [PATCH] fix two bugs in interestpoint detection --- .../fiji/plugin/interestpointdetection/DifferenceOfGUI.java | 2 +- .../process/interestpointdetection/methods/dog/DoGImgLib2.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/preibisch/mvrecon/fiji/plugin/interestpointdetection/DifferenceOfGUI.java b/src/main/java/net/preibisch/mvrecon/fiji/plugin/interestpointdetection/DifferenceOfGUI.java index a4f99a9f..630a50b0 100644 --- a/src/main/java/net/preibisch/mvrecon/fiji/plugin/interestpointdetection/DifferenceOfGUI.java +++ b/src/main/java/net/preibisch/mvrecon/fiji/plugin/interestpointdetection/DifferenceOfGUI.java @@ -76,7 +76,7 @@ public abstract class DifferenceOfGUI extends InterestPointDetectionGUI public static String[] localizationChoice = { "None", "3-dimensional quadratic fit", "Gaussian mask localization fit" }; public static String[] brightnessChoice = { "Very weak & small (beads)", "Weak & small (beads)", "Comparable to Sample & small (beads)", "Strong & small (beads)", "Advanced ...", "Interactive ..." }; - public static int defaultDownsampleXYIndex = 4; + public static int defaultDownsampleXYIndex = 7; public static int defaultDownsampleZIndex = 0; public static int defaultLocalization = 1; diff --git a/src/main/java/net/preibisch/mvrecon/process/interestpointdetection/methods/dog/DoGImgLib2.java b/src/main/java/net/preibisch/mvrecon/process/interestpointdetection/methods/dog/DoGImgLib2.java index f8200ebb..e1114fce 100644 --- a/src/main/java/net/preibisch/mvrecon/process/interestpointdetection/methods/dog/DoGImgLib2.java +++ b/src/main/java/net/preibisch/mvrecon/process/interestpointdetection/methods/dog/DoGImgLib2.java @@ -276,7 +276,7 @@ public void convert( final FloatType inputA, final FloatType inputB, final Float if ( !silent ) IOFunctions.println("(" + new Date(System.currentTimeMillis()) + "): Detecting peaks." ); - final ArrayList< SimplePeak > peaks = findPeaks( dogCached, Views.interval( maskFloat, interval ), minInitialPeakValue, service ); + final ArrayList< SimplePeak > peaks = findPeaks( dogCached, maskFloat == null ? null : Views.interval( maskFloat, interval ), minInitialPeakValue, service ); if ( !silent ) IOFunctions.println("(" + new Date(System.currentTimeMillis()) + "): Found " + peaks.size() + " initial peaks (before refinement)." );