Skip to content
Snippets Groups Projects
Commit b26eb6b3 authored by Pierre Paleo's avatar Pierre Paleo
Browse files

Merge branch 'fix_data_duplication_reading' into '2024.2'

[stitching][config]: fix reading of 'avoid data duplication'

See merge request !534
parents 08d671ba 89bcbebe
No related branches found
No related tags found
1 merge request!534[stitching][config]: fix reading of 'avoid data duplication'
Pipeline #213807 passed
...@@ -1038,8 +1038,9 @@ class PreProcessedSingleAxisStitchingConfiguration(SingleAxisStitchingConfigurat ...@@ -1038,8 +1038,9 @@ class PreProcessedSingleAxisStitchingConfiguration(SingleAxisStitchingConfigurat
config[STITCHING_SECTION].get(ALIGNMENT_AXIS_2_FIELD, AlignmentAxis2.CENTER) config[STITCHING_SECTION].get(ALIGNMENT_AXIS_2_FIELD, AlignmentAxis2.CENTER)
), ),
pad_mode=config[STITCHING_SECTION].get(PAD_MODE_FIELD, "constant"), pad_mode=config[STITCHING_SECTION].get(PAD_MODE_FIELD, "constant"),
duplicate_data=not config[STITCHING_SECTION].get(AVOID_DATA_DUPLICATION_FIELD, False), duplicate_data=not _scalar_or_tuple_to_bool_or_tuple_of_bool(
normalization_by_sample=NormalizationBySample.from_dict(config.get(NORMALIZATION_BY_SAMPLE_SECTION, {})), config[STITCHING_SECTION].get(AVOID_DATA_DUPLICATION_FIELD, False)
),
) )
...@@ -1196,7 +1197,9 @@ class PostProcessedSingleAxisStitchingConfiguration(SingleAxisStitchingConfigura ...@@ -1196,7 +1197,9 @@ class PostProcessedSingleAxisStitchingConfiguration(SingleAxisStitchingConfigura
config[STITCHING_SECTION].get(ALIGNMENT_AXIS_2_FIELD, AlignmentAxis2.CENTER) config[STITCHING_SECTION].get(ALIGNMENT_AXIS_2_FIELD, AlignmentAxis2.CENTER)
), ),
pad_mode=config[STITCHING_SECTION].get(PAD_MODE_FIELD, "constant"), pad_mode=config[STITCHING_SECTION].get(PAD_MODE_FIELD, "constant"),
duplicate_data=not config[STITCHING_SECTION].get(AVOID_DATA_DUPLICATION_FIELD, False), duplicate_data=not _scalar_or_tuple_to_bool_or_tuple_of_bool(
config[STITCHING_SECTION].get(AVOID_DATA_DUPLICATION_FIELD, False)
),
normalization_by_sample=NormalizationBySample.from_dict(config.get(NORMALIZATION_BY_SAMPLE_SECTION, {})), normalization_by_sample=NormalizationBySample.from_dict(config.get(NORMALIZATION_BY_SAMPLE_SECTION, {})),
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment