diff --git a/bin/filter_mrc/settings.cpp b/bin/filter_mrc/settings.cpp index 3584ed5..9d39bc6 100644 --- a/bin/filter_mrc/settings.cpp +++ b/bin/filter_mrc/settings.cpp @@ -3220,8 +3220,10 @@ Settings::ParseArgs(vector& vArgs) } if ((out_file_name.size() == 0) && ((! - ((filter_type == NONE) || + ((out_normals_fname != "") || + (filter_type == NONE) || (filter_type == BLOB) || + (filter_type == FIND_EXTREMA) || (filter_type == SPHERE_NONMAX_SUPPRESSION) || (filter_type == SPHERE_NONMAX_SUPERVISED_MULTI) || (filter_type == BLOB_RADIAL_INTENSITY))) diff --git a/tests/test_watershed.sh b/tests/test_watershed.sh index edbb29d..61ff94a 100755 --- a/tests/test_watershed.sh +++ b/tests/test_watershed.sh @@ -33,7 +33,7 @@ test_watershed() { assertTrue "Failure: -find-minima failed to make an image. File \"${IN_FNAME_BASE}_gauss_${SIGMA}_minima.rec\" not created" "[ -s ${IN_FNAME_BASE}_gauss_${SIGMA}_minima.txt ]" # Count the number of dark minima in the image N_MINIMA=`wc ${IN_FNAME_BASE}_gauss_${SIGMA}_minima.txt | awk '{print $1}'` - N_MINIMA_IMAGE=`../bin/print_mrc_stats/print_mrc_stats ${IN_FNAME_BASE}_gauss_${SIGMA}_minima.rec | grep "minimum brightness" | awk '{print -$3}'` + N_MINIMA_IMAGE=`../bin/print_mrc_stats/print_mrc_stats ${IN_FNAME_BASE}_gauss_${SIGMA}_minima.rec | grep "maximum brightness" | awk '{print $3}'` assertTrue "Failure: The number of minima reported by -find-minima is not consistent with the image that was created." "[ $N_MINIMA -eq $N_MINIMA_IMAGE ]" # Test watershed segmentation