Skip to content

Commit

Permalink
Merge pull request broadinstitute#449 from broadinstitute/gg_GL-1736_…
Browse files Browse the repository at this point in the history
…DoNotWriteFingerprintsToMercuryForControlSamples

GL-1736. Don't write control fingerprints to the Mercury Fingerprint Store
  • Loading branch information
gbggrant authored Sep 28, 2021
2 parents 304e55a + 87953fc commit b9e56a3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion pipelines/broad/arrays/single_sample/Arrays.changelog.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# 2.4.3
2021-09-24
2021-09-27

* Enabled pipeline to lookup the cluster_file using an alternate method (using the arrays_metadata_path and cluster_filename)
* Modified pipeline to NOT write fingerprints for control samples to the Mercury Fingerprint Store.

# 2.4.2
2021-09-22
Expand Down
7 changes: 4 additions & 3 deletions pipelines/broad/arrays/single_sample/Arrays.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ workflow Arrays {
}
}

String bpm_filename = if (defined(bead_pool_manifest_file)) then select_first([bead_pool_manifest_file]) else select_first([bead_pool_manifest_filename, ""])
String chip_type = basename(bpm_filename, ".bpm")
String bpm_filename = if (defined(bead_pool_manifest_file)) then basename(select_first([bead_pool_manifest_file])) else select_first([bead_pool_manifest_filename, ""])
String chip_type = sub(bpm_filename, ".bpm", "")
File bpm_file = if (defined(bead_pool_manifest_file)) then select_first([bead_pool_manifest_file]) else select_first([arrays_metadata_path, ""]) + chip_type + "/" + select_first([bead_pool_manifest_filename, ""])

if (!defined(cluster_filename) && !defined(cluster_file)) {
Expand Down Expand Up @@ -378,7 +378,8 @@ workflow Arrays {
preemptible_tries = preemptible_tries
}

if (write_fingerprint_to_mercury) {
# Only write fingerprints to the Mercury Fingerprint Store if writing is enabled AND the sample is NOT a control
if (write_fingerprint_to_mercury && (!defined(control_sample_name))) {
call InternalTasks.UploadFingerprintToMercury {
input:
fingerprint_json_file = VcfToMercuryFingerprintJson.output_json_file,
Expand Down

0 comments on commit b9e56a3

Please sign in to comment.