From 0177be501f624def2e158caeb13f090ef8940210 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Wed, 6 Nov 2024 22:36:09 +0000 Subject: [PATCH] Per #2966, adjust the logic slightly to revert to existing behavior where we only write the timing information of the input data to the gen_vx_mask output when no threshold was applied. This should reduce the number of diffs flagged by PR #3008 --- src/tools/other/gen_vx_mask/gen_vx_mask.cc | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/tools/other/gen_vx_mask/gen_vx_mask.cc b/src/tools/other/gen_vx_mask/gen_vx_mask.cc index f22d57fea..b74133ea1 100644 --- a/src/tools/other/gen_vx_mask/gen_vx_mask.cc +++ b/src/tools/other/gen_vx_mask/gen_vx_mask.cc @@ -131,14 +131,18 @@ int met_main(int argc, char *argv[]) { // Combine the input data with the current binary mask static DataPlane dp_out; - if(have_input_data && - (mask_type == MaskType::Poly || - mask_type == MaskType::Poly_XY || - mask_type == MaskType::Shape || - mask_type == MaskType::Box || - mask_type == MaskType::Grid || - thresh.get_type() != thresh_na)) { - dp_out = combine(dp_input, dp_mask, set_logic); + if(mask_type == MaskType::Poly || + mask_type == MaskType::Poly_XY || + mask_type == MaskType::Shape || + mask_type == MaskType::Box || + mask_type == MaskType::Grid || + thresh.get_type() != thresh_na) { + + // Combination logic based on presence of input data + SetLogic logic = (have_input_data ? + set_logic : SetLogic::None); + + dp_out = combine(dp_input, dp_mask, logic); } // Otherwise, pass through the distance or raw values else {