Skip to content

Commit

Permalink
tumor -> tumour
Browse files Browse the repository at this point in the history
  • Loading branch information
baminou committed Mar 14, 2018
1 parent 4d75cc2 commit 31d4618
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 63 deletions.
14 changes: 7 additions & 7 deletions workflow/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ workflow:
type: string
specimen_type:
type: string
tumor_bams:
tumour_bams:
type: array
items:
type: object
Expand Down Expand Up @@ -146,7 +146,7 @@ workflow:
tool: download_files
input:
normal_bam: normal_bam
tumor_bams: tumor_bams
tumour_bams: tumour_bams
vcf_files: associated_vcfs
depends_on: null

Expand All @@ -155,7 +155,7 @@ workflow:
input:
input_directory: directory@download_files
normal_bam: normal_bam
tumor_bams: tumor_bams
tumour_bams: tumour_bams
vcf_files: associated_vcfs
sv_padding: sv_padding
snv_padding: snv_padding
Expand All @@ -169,7 +169,7 @@ workflow:
input:
input_directory: directory@download_files
normal_bam: normal_bam
tumor_bams: tumor_bams
tumour_bams: tumour_bams
experiment: experiment
indel_padding: indel_padding
snv_padding: snv_padding
Expand Down Expand Up @@ -209,7 +209,7 @@ tools:
input:
normal_bam:
type: object
tumor_bams:
tumour_bams:
type: array
vcf_files:
type: array
Expand All @@ -224,7 +224,7 @@ tools:
type: string
normal_bam:
type: object
tumor_bams:
tumour_bams:
type: array
vcf_files:
type: array
Expand All @@ -245,7 +245,7 @@ tools:
type: string
normal_bam:
type: object
tumor_bams:
tumour_bams:
type: array
experiment:
type: object
Expand Down
2 changes: 1 addition & 1 deletion workflow/tools/download.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def download_file(object_id, out_dir, file_name):
file_name = task_dict.get('input').get('normal_bam').get('file_name')
download_file(object_id, cwd, file_name)

# Download tumor bam files
# Download tumour bam files
for i in range(0,len(task_dict.get('input').get('tumour_bams'))):
object_id = task_dict.get('input').get('tumour_bams')[i].get('object_id')
file_name = task_dict.get('input').get('tumour_bams')[i].get('file_name')
Expand Down
8 changes: 4 additions & 4 deletions workflow/tools/generate_song_payloads.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

input_directory = task_dict.get('input').get('input_directory')
normal_bam = task_dict.get('input').get('normal_bam')
tumor_bams = task_dict.get('input').get('tumour_bams')
tumour_bams = task_dict.get('input').get('tumour_bams')
experiment = task_dict.get('input').get('experiment')
indel_padding = task_dict.get('input').get('indel_padding')
snv_padding = task_dict.get('input').get('snv_padding')
Expand Down Expand Up @@ -73,9 +73,9 @@ def create_payload_json(bam, experiment, input_directory, output_file, associate
create_payload_json(normal_bam, experiment, input_directory, os.path.join(input_directory, 'normal_minibam.json'), associated_vcfs)
payloads.append('normal_minibam.json')

for i in range(0,len(tumor_bams)):
create_payload_json(tumor_bams[i], experiment, input_directory, os.path.join(input_directory, 'tumor_minibam_'+str(i)+'.json'), associated_vcfs)
payloads.append( 'tumor_minibam_'+str(i)+'.json')
for i in range(0,len(tumour_bams)):
create_payload_json(tumour_bams[i], experiment, input_directory, os.path.join(input_directory, 'tumour_minibam_'+str(i)+'.json'), associated_vcfs)
payloads.append( 'tumour_minibam_'+str(i)+'.json')

save_output_json({
'payloads': payloads
Expand Down
51 changes: 0 additions & 51 deletions workflow/tools/test.py

This file was deleted.

0 comments on commit 31d4618

Please sign in to comment.