Skip to content

Commit

Permalink
Updated the input dataypes for pairtools parse + minor changes (galax…
Browse files Browse the repository at this point in the history 
…yproject#6020)

* Updated the input dataypes for pairtools parse + minor changes

* Version Bump

* Minor change

Co-authored-by: Björn Grüning <[email protected]>

---------

Co-authored-by: Björn Grüning <[email protected]>
  • Loading branch information
@SaimMomin12 @bgruening
SaimMomin12 and bgruening authored May 21, 2024
1 parent b74312f commit 13aa776
Show file tree
Hide file tree
Showing 11 changed files with 8,167 additions and 10,482 deletions.
2 changes: 1 addition & 1 deletion tools/pairtools/macros.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<macros>
<token name="@TOOL_VERSION@">1.1.0</token>
<token name="@SUFFIX_VERSION@">0</token>
<token name="@SUFFIX_VERSION@">1</token>
<xml name="edam_ontology">
<edam_datas>
<edam_data>topic_1381</edam_data>
Expand Down
4 changes: 2 additions & 2 deletions tools/pairtools/parse.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
--nproc-out \${GALAXY_SLOTS:-4}
]]></command>
<inputs>
<param name="sam_path" type="data" format="sam,bam" label="Input SAM/BAM file" help="Input SAM or BAM file with paired-end sequence alignments of Hi-C molecules."/>
<param name="sam_path" type="data" format="sam,qname_input_sorted.bam,qname_sorted.bam" label="Input SAM/BAM file" help="Input SAM or BAM (unsorted/name-sorted) file with paired-end sequence alignments of Hi-C molecules."/>
<param name="chroms_path" argument="-c" type="data" format="tabular" label="Input a chromosome order file" help="Chromosome order used to flip interchromosomal mates. Any scaffolds not listed will be ordered lexicographically."/>
<param name="assembly_name" type="text" value="" label="Input a name of genome assembly" help="Name of genome assembly (e.g. hg19, mm10) to store in the pairs header"></param>
<param argument="--min-mapq" type="integer" value="40" min="0" label="Minimal MAPQ" help="Minimal MAPQ score to consider a read as uniquely mapped."/>
Expand Down Expand Up @@ -131,7 +131,7 @@
Detects ligation events in the aligned sequences of DNA molecules formed in Hi-C experiments and reports them in the .pairs/.pairsam format.
sam_path : an input .sam/.bam file with paired-end sequence alignments of Hi-C molecules.
sam_path : an input .sam/.bam (unsorted/name-sorted) file with paired-end sequence alignments of Hi-C molecules.
]]></help>
<expand macro="citations"/>
Expand Down
8 changes: 4 additions & 4 deletions tools/pairtools/test-data/output_dedup_sorted.pairsam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,23 @@
#samheader: @PG ID:pairtools_parse-1.2 PN:pairtools_parse CL:/scratch/ddepanis/Software/anaconda3/envs/MAP_env/bin/pairtools parse -o output_parsed_pairs_bam.pairs --output-stats output_parsed_pairs.stats --min-mapq 40 --walks-policy 5unique --max-inter-align-gap 30 --chroms-path test.reduced.chrom.sizes test.bam PP:bwa VN:1.0.2
#samheader: @PG ID:pairtools_sort-1.3 PN:pairtools_sort CL:/scratch/ddepanis/Software/anaconda3/envs/MAP_env/bin/pairtools sort -o output_sorted_pairs.pairsam output_parsed_pairs_bam.pairs PP:pairtools_parse-1.2 VN:1.0.2
#samheader: @PG ID:pairtools_dedup-1.4 PN:pairtools_dedup CL:/usr/local/bin/pairtools dedup /tmp/tmpp1v7bap4/files/3/7/9/dataset_379f0c04-3329-4201-9b3c-3c3a66e7eec4.dat -o /tmp/tmpp1v7bap4/job_working_directory/000/6/outputs/dataset_6f9ee270-56fb-4c2e-92f4-509340f9eb58.dat --mark-dups --output-stats /tmp/tmpp1v7bap4/job_working_directory/000/6/outputs/dataset_653a5918-ae05-4cfe-8fc9-4ecc516aeaf1.dat --nproc-in 1 --nproc-out 1 PP:pairtools_sort-1.3 VN:1.1.0
#samheader: @PG ID:pairtools_sort-1.5 PN:pairtools_sort CL:/usr/local/bin/pairtools sort /tmp/tmptyq9evah/files/c/7/1/dataset_c7168a6f-71cc-4fb2-a696-c540bb977254.dat -o /tmp/tmptyq9evah/job_working_directory/000/4/outputs/dataset_d8a3cf41-0319-4df0-bc9f-d88012565c7e.dat --nproc-in 1 --nproc-out 1 PP:pairtools_dedup-1.4 VN:1.1.0
#samheader: @PG ID:pairtools_sort-1.5 PN:pairtools_sort CL:/usr/local/bin/pairtools sort /tmp/tmpcoq066hp/files/6/5/3/dataset_65373f5c-e37e-4bba-ad0c-bd994c7eb46d.dat -o /tmp/tmpcoq066hp/job_working_directory/000/4/outputs/dataset_61b2dd7e-1796-45d8-9570-dba69c253aed.dat --nproc-in 1 --nproc-out 1 PP:pairtools_dedup-1.4 VN:1.1.0
#samheader: @PG ID:bwa-2CCE5976 PN:bwa VN:0.7.15-r1140 CL:bwa mem -t 8 -v 3 -SP sacCer3.fa.gz MATalpha_R1.lane1.01.1.fastq.gz MATalpha_R1.lane1.01.2.fastq.gz
#samheader: @PG ID:pairtools_parse-2.2 PN:pairtools_parse CL:/scratch/ddepanis/Software/anaconda3/envs/MAP_env/bin/pairtools parse -o output_parsed_pairs_bam.pairs --output-stats output_parsed_pairs.stats --min-mapq 40 --walks-policy 5unique --max-inter-align-gap 30 --chroms-path test.reduced.chrom.sizes test.bam PP:bwa-2CCE5976 VN:1.0.2
#samheader: @PG ID:pairtools_sort-2.3 PN:pairtools_sort CL:/scratch/ddepanis/Software/anaconda3/envs/MAP_env/bin/pairtools sort -o output_sorted_pairs.pairsam output_parsed_pairs_bam.pairs PP:pairtools_parse-2.2 VN:1.0.2
#samheader: @PG ID:pairtools_dedup-2.4 PN:pairtools_dedup CL:/usr/local/bin/pairtools dedup /tmp/tmpp1v7bap4/files/3/7/9/dataset_379f0c04-3329-4201-9b3c-3c3a66e7eec4.dat -o /tmp/tmpp1v7bap4/job_working_directory/000/6/outputs/dataset_6f9ee270-56fb-4c2e-92f4-509340f9eb58.dat --mark-dups --output-stats /tmp/tmpp1v7bap4/job_working_directory/000/6/outputs/dataset_653a5918-ae05-4cfe-8fc9-4ecc516aeaf1.dat --nproc-in 1 --nproc-out 1 PP:pairtools_sort-2.3 VN:1.1.0
#samheader: @PG ID:pairtools_sort-2.5 PN:pairtools_sort CL:/usr/local/bin/pairtools sort /tmp/tmptyq9evah/files/c/7/1/dataset_c7168a6f-71cc-4fb2-a696-c540bb977254.dat -o /tmp/tmptyq9evah/job_working_directory/000/4/outputs/dataset_d8a3cf41-0319-4df0-bc9f-d88012565c7e.dat --nproc-in 1 --nproc-out 1 PP:pairtools_dedup-2.4 VN:1.1.0
#samheader: @PG ID:pairtools_sort-2.5 PN:pairtools_sort CL:/usr/local/bin/pairtools sort /tmp/tmpcoq066hp/files/6/5/3/dataset_65373f5c-e37e-4bba-ad0c-bd994c7eb46d.dat -o /tmp/tmpcoq066hp/job_working_directory/000/4/outputs/dataset_61b2dd7e-1796-45d8-9570-dba69c253aed.dat --nproc-in 1 --nproc-out 1 PP:pairtools_dedup-2.4 VN:1.1.0
#samheader: @PG ID:bwa-3CAFD9D9 PN:bwa VN:0.7.15-r1140 CL:bwa mem -t 8 -v 3 -SP sacCer3.fa.gz MATalpha_R1.lane2.00.1.fastq.gz MATalpha_R1.lane2.00.2.fastq.gz
#samheader: @PG ID:pairtools_parse-3.2 PN:pairtools_parse CL:/scratch/ddepanis/Software/anaconda3/envs/MAP_env/bin/pairtools parse -o output_parsed_pairs_bam.pairs --output-stats output_parsed_pairs.stats --min-mapq 40 --walks-policy 5unique --max-inter-align-gap 30 --chroms-path test.reduced.chrom.sizes test.bam PP:bwa-3CAFD9D9 VN:1.0.2
#samheader: @PG ID:pairtools_sort-3.3 PN:pairtools_sort CL:/scratch/ddepanis/Software/anaconda3/envs/MAP_env/bin/pairtools sort -o output_sorted_pairs.pairsam output_parsed_pairs_bam.pairs PP:pairtools_parse-3.2 VN:1.0.2
#samheader: @PG ID:pairtools_dedup-3.4 PN:pairtools_dedup CL:/usr/local/bin/pairtools dedup /tmp/tmpp1v7bap4/files/3/7/9/dataset_379f0c04-3329-4201-9b3c-3c3a66e7eec4.dat -o /tmp/tmpp1v7bap4/job_working_directory/000/6/outputs/dataset_6f9ee270-56fb-4c2e-92f4-509340f9eb58.dat --mark-dups --output-stats /tmp/tmpp1v7bap4/job_working_directory/000/6/outputs/dataset_653a5918-ae05-4cfe-8fc9-4ecc516aeaf1.dat --nproc-in 1 --nproc-out 1 PP:pairtools_sort-3.3 VN:1.1.0
#samheader: @PG ID:pairtools_sort-3.5 PN:pairtools_sort CL:/usr/local/bin/pairtools sort /tmp/tmptyq9evah/files/c/7/1/dataset_c7168a6f-71cc-4fb2-a696-c540bb977254.dat -o /tmp/tmptyq9evah/job_working_directory/000/4/outputs/dataset_d8a3cf41-0319-4df0-bc9f-d88012565c7e.dat --nproc-in 1 --nproc-out 1 PP:pairtools_dedup-3.4 VN:1.1.0
#samheader: @PG ID:pairtools_sort-3.5 PN:pairtools_sort CL:/usr/local/bin/pairtools sort /tmp/tmpcoq066hp/files/6/5/3/dataset_65373f5c-e37e-4bba-ad0c-bd994c7eb46d.dat -o /tmp/tmpcoq066hp/job_working_directory/000/4/outputs/dataset_61b2dd7e-1796-45d8-9570-dba69c253aed.dat --nproc-in 1 --nproc-out 1 PP:pairtools_dedup-3.4 VN:1.1.0
#samheader: @PG ID:bwa-4548A671 PN:bwa VN:0.7.15-r1140 CL:bwa mem -t 8 -v 3 -SP sacCer3.fa.gz MATalpha_R1.lane2.01.1.fastq.gz MATalpha_R1.lane2.01.2.fastq.gz
#samheader: @PG ID:samtools PN:samtools PP:bwa-4548A671 VN:1.19.2 CL:samtools view -s 0.1 -b -@ 4 -o subset.bam test.bam
#samheader: @PG ID:pairtools_parse-4.3 PN:pairtools_parse CL:/scratch/ddepanis/Software/anaconda3/envs/MAP_env/bin/pairtools parse -o output_parsed_pairs_bam.pairs --output-stats output_parsed_pairs.stats --min-mapq 40 --walks-policy 5unique --max-inter-align-gap 30 --chroms-path test.reduced.chrom.sizes test.bam PP:samtools VN:1.0.2
#samheader: @PG ID:pairtools_sort-4.4 PN:pairtools_sort CL:/scratch/ddepanis/Software/anaconda3/envs/MAP_env/bin/pairtools sort -o output_sorted_pairs.pairsam output_parsed_pairs_bam.pairs PP:pairtools_parse-4.3 VN:1.0.2
#samheader: @PG ID:pairtools_dedup-4.5 PN:pairtools_dedup CL:/usr/local/bin/pairtools dedup /tmp/tmpp1v7bap4/files/3/7/9/dataset_379f0c04-3329-4201-9b3c-3c3a66e7eec4.dat -o /tmp/tmpp1v7bap4/job_working_directory/000/6/outputs/dataset_6f9ee270-56fb-4c2e-92f4-509340f9eb58.dat --mark-dups --output-stats /tmp/tmpp1v7bap4/job_working_directory/000/6/outputs/dataset_653a5918-ae05-4cfe-8fc9-4ecc516aeaf1.dat --nproc-in 1 --nproc-out 1 PP:pairtools_sort-4.4 VN:1.1.0
#samheader: @PG ID:pairtools_sort-4.6 PN:pairtools_sort CL:/usr/local/bin/pairtools sort /tmp/tmptyq9evah/files/c/7/1/dataset_c7168a6f-71cc-4fb2-a696-c540bb977254.dat -o /tmp/tmptyq9evah/job_working_directory/000/4/outputs/dataset_d8a3cf41-0319-4df0-bc9f-d88012565c7e.dat --nproc-in 1 --nproc-out 1 PP:pairtools_dedup-4.5 VN:1.1.0
#samheader: @PG ID:pairtools_sort-4.6 PN:pairtools_sort CL:/usr/local/bin/pairtools sort /tmp/tmpcoq066hp/files/6/5/3/dataset_65373f5c-e37e-4bba-ad0c-bd994c7eb46d.dat -o /tmp/tmpcoq066hp/job_working_directory/000/4/outputs/dataset_61b2dd7e-1796-45d8-9570-dba69c253aed.dat --nproc-in 1 --nproc-out 1 PP:pairtools_dedup-4.5 VN:1.1.0
#columns: readID chrom1 pos1 chrom2 pos2 strand1 strand2 pair_type sam1 sam2
HWI-ST560:29:B0A7LABXX:2:1101:15566:24141 chrI 3199 chrI 3399 + - UU HWI-ST560:29:B0A7LABXX:2:1101:15566:2414197chrI31996015S35M=3350201CTTAGACAATAAGCTAGCTTTCAAGATATAAGATACGAAATAGGGGTTGA111442422223232232<FHIIIIBCCFHEHFHHIHCGIJIDHHJ?@FHNM:i:0MD:Z:35AS:i:35XS:i:0Yt:Z:UU HWI-ST560:29:B0A7LABXX:2:1101:15566:24141145chrI33506050M=3199-201TAGAATCTCCCATGTCAACGGGTTTCCATACCTCCCCAGCATCATACATCGHHGFAGFJJJIHHFGD?HIGCGHGHHHFAFC<IHFACHDAFDEDADB==NM:i:0MD:Z:50AS:i:50XS:i:0Yt:Z:UU
HWI-ST560:29:B0A7LABXX:2:1101:18861:21891 chrI 35431 chrI 35703 + - UU HWI-ST560:29:B0A7LABXX:2:1101:18861:2189197chrI354316050M=35654273GACCACGTGGTCGTTGATGCTGCCAGCAGTTGTGCAGACCTGCATTGCTG114442222322<2@FEAFHFH<CFHFFH?GH:CDHGGIGEFDG<BBH9?NM:i:1MD:Z:35G14AS:i:45XS:i:0Yt:Z:UU HWI-ST560:29:B0A7LABXX:2:1101:18861:21891145chrI356546050M=35431-273ATGTGGCTGCTTTAATTGAGCCTCTTTCTGTCACCTGGCATGCTGTTAAG>EGDD?BFIIIIGBHCJIJIHFIHFHGHGGC<2GHGHFD<HFFDDDDB@BNM:i:1MD:Z:14G35AS:i:45XS:i:0Yt:Z:UU
Expand Down
Loading

0 comments on commit 13aa776

Please sign in to comment.