diff --git a/CMakeLists.txt b/CMakeLists.txt index a18b055..bb5ef3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,7 +168,7 @@ include( "${CMAKE_CURRENT_LIST_DIR}/tools/cmake/DownloadDependency.cmake" ) # These are replaced by tools/cmake/update_dependencies.sh to the hashes that are currently checked out. # Thus, do not replace the hashes manually! SET( CLI11_COMMIT_HASH "5cb3efabce007c3a0230e4cc2e27da491c646b6c" ) #CLI11_COMMIT_HASH# -SET( genesis_COMMIT_HASH "5197621925aecee869d2681d64582adea8a0348d" ) #genesis_COMMIT_HASH# +SET( genesis_COMMIT_HASH "059e5b50a33c2826edd931435c11661c7a5b0985" ) #genesis_COMMIT_HASH# # Call the github download function, which takes four arguments: # - LIBPATH : Path to the libracy dir where dependencies are stored. diff --git a/libs/genesis b/libs/genesis index 5197621..059e5b5 160000 --- a/libs/genesis +++ b/libs/genesis @@ -1 +1 @@ -Subproject commit 5197621925aecee869d2681d64582adea8a0348d +Subproject commit 059e5b50a33c2826edd931435c11661c7a5b0985 diff --git a/src/options/variant_filter_mask.cpp b/src/options/variant_filter_mask.cpp index f36090c..e522207 100644 --- a/src/options/variant_filter_mask.cpp +++ b/src/options/variant_filter_mask.cpp @@ -416,7 +416,7 @@ void VariantFilterMaskOptions::prepare_sample_masks_() const // Add the masks from bed files. if( *filter_mask_sample_bed_list_.option ) { // We need a dict to invert - auto ref_dict = ref_genome_opts_->get_reference_dict(); + auto const ref_dict = ref_genome_opts_->get_reference_dict(); if( filter_mask_sample_bed_inv_.value && !ref_dict ) { throw CLI::ValidationError( filter_mask_sample_bed_inv_.option->get_name(), @@ -433,7 +433,10 @@ void VariantFilterMaskOptions::prepare_sample_masks_() const LOG_MSG2 << " - " << sample_file_pair.first << ": " << sample_file_pair.second; assert( sample_masks_( sample_file_pair.first ).count() == 0 ); sample_masks_[ sample_file_pair.first ] = std::make_shared( - BedReader().read_as_genome_locus_set( from_file( sample_file_pair.second )) + BedReader().read_as_genome_locus_set( + from_file( sample_file_pair.second ), + ref_dict + ) ); if( filter_mask_sample_bed_inv_.value ) { sample_masks_[ sample_file_pair.first ]->invert( *ref_dict ); @@ -481,11 +484,14 @@ void VariantFilterMaskOptions::prepare_total_mask_() const // Add the mask from a bed file. if( *filter_mask_total_bed_.option ) { LOG_MSG2 << "Reading mask BED file " << filter_mask_total_bed_.value; + auto const ref_dict = ref_genome_opts_->get_reference_dict(); total_mask_ = std::make_shared( - BedReader().read_as_genome_locus_set( from_file( filter_mask_total_bed_.value )) + BedReader().read_as_genome_locus_set( + from_file( filter_mask_total_bed_.value ), + ref_dict + ) ); if( filter_mask_total_bed_inv_.value ) { - auto ref_dict = ref_genome_opts_->get_reference_dict(); if( !ref_dict ) { throw CLI::ValidationError( filter_mask_total_bed_inv_.option->get_name(),