@@ -865,7 +865,7 @@ if (multiplex_flag == 'Y'):
865865 png_bc = expand (join (out_dir ,'{mp}' , '01_qc_post' ,'{mp}_barcode.png' ),mp = samp_dict .keys ())
866866 params :
867867 rname = "08_qc_troubleshoot" ,
868- R = join (source_dir ,'workflow' ,'scripts' ,'05_qc_report .Rmd' ),
868+ R = join (source_dir ,'workflow' ,'scripts' ,'03_qc_report .Rmd' ),
869869 envmodules :
870870 config ['R' ]
871871 output :
@@ -887,7 +887,7 @@ else:
887887 log_list = expand (join (out_dir ,'log' ,'STAR' ,'{sp}.log' ),sp = sp_list ),
888888 params :
889889 rname = "08_qc_troubleshoot" ,
890- R = join (source_dir ,'workflow' ,'scripts' ,'05_qc_report .Rmd' ),
890+ R = join (source_dir ,'workflow' ,'scripts' ,'03_qc_report .Rmd' ),
891891 envmodules :
892892 config ['R' ]
893893 output :
@@ -979,7 +979,7 @@ rule create_beds_safs:
979979 params :
980980 rname = '10_create_beds_safs' ,
981981 base = '{sp}.dedup' ,
982- pyscript = join (source_dir ,'workflow' ,'scripts' ,'13_bam_to_unique_bam .py' ),
982+ pyscript = join (source_dir ,'workflow' ,'scripts' ,'09_bam_to_unique_bam .py' ),
983983 memG = getmemG_80perc ("create_beds_safs" )
984984 envmodules :
985985 config ['samtools' ],
@@ -1164,7 +1164,7 @@ rule project_annotations:
11641164 """
11651165 params :
11661166 rname = '13_project_annotations' ,
1167- script = join (source_dir ,'workflow' ,'scripts' ,'08_annotation .R' ),
1167+ script = join (source_dir ,'workflow' ,'scripts' ,'04_annotation .R' ),
11681168 ref_sp = species_ref ,
11691169 rrna_flag = refseq_rrna ,
11701170 a_path = alias_path ,
@@ -1213,10 +1213,10 @@ if DE_method=="MANORM" or DE_method=="DIFFBIND":
12131213 anno = rules .project_annotations .output .anno
12141214 params :
12151215 rname = '14_peak_junctions' ,
1216- script = join (source_dir ,'workflow' ,'scripts' ,'09_Anno_junctions .R' ),
1217- functions = join (source_dir ,'workflow' ,'scripts' ,'09_peak_annotation_functions .R' ),
1218- bashscript = join (source_dir ,'workflow' ,'scripts' ,'09_get_site2peak_lookup .sh' ),
1219- pyscript = join (source_dir ,'workflow' ,'scripts' ,'09_jcounts2peakconnections .py' ),
1216+ script = join (source_dir ,'workflow' ,'scripts' ,'05_Anno_junctions .R' ),
1217+ functions = join (source_dir ,'workflow' ,'scripts' ,'05_peak_annotation_functions .R' ),
1218+ bashscript = join (source_dir ,'workflow' ,'scripts' ,'05_get_site2peak_lookup .sh' ),
1219+ pyscript = join (source_dir ,'workflow' ,'scripts' ,'05_jcounts2peakconnections .py' ),
12201220 p_type = peak_id ,
12211221 junc = sp_junc ,
12221222 anchor = anno_anchor ,
@@ -1284,10 +1284,10 @@ else:
12841284 anno = rules .project_annotations .output .anno
12851285 params :
12861286 rname = '14_peak_annotations' ,
1287- script = join (source_dir ,'workflow' ,'scripts' ,'09_Anno_junctions .R' ),
1288- functions = join (source_dir ,'workflow' ,'scripts' ,'09_peak_annotation_functions .R' ),
1289- bashscript = join (source_dir ,'workflow' ,'scripts' ,'09_get_site2peak_lookup .sh' ),
1290- pyscript = join (source_dir ,'workflow' ,'scripts' ,'09_jcounts2peakconnections .py' ),
1287+ script = join (source_dir ,'workflow' ,'scripts' ,'05_Anno_junctions .R' ),
1288+ functions = join (source_dir ,'workflow' ,'scripts' ,'05_peak_annotation_functions .R' ),
1289+ bashscript = join (source_dir ,'workflow' ,'scripts' ,'05_get_site2peak_lookup .sh' ),
1290+ pyscript = join (source_dir ,'workflow' ,'scripts' ,'05_jcounts2peakconnections .py' ),
12911291 p_type = peak_id ,
12921292 junc = sp_junc ,
12931293 anchor = anno_anchor ,
@@ -1350,8 +1350,8 @@ rule peak_Transcripts:
13501350 anno = rules .project_annotations .output .anno
13511351 params :
13521352 rname = '15_peak_Transcripts' ,
1353- script = join (source_dir ,'workflow' ,'scripts' ,'09_Anno_Transcript .R' ),
1354- functions = join (source_dir ,'workflow' ,'scripts' ,'09_peak_annotation_functions .R' ),
1353+ script = join (source_dir ,'workflow' ,'scripts' ,'05_Anno_Transcript .R' ),
1354+ functions = join (source_dir ,'workflow' ,'scripts' ,'05_peak_annotation_functions .R' ),
13551355 p_type = peak_id ,
13561356 anchor = anno_anchor ,
13571357 r_depth = min_count ,
@@ -1408,8 +1408,8 @@ rule peak_ExonIntron:
14081408 anno = rules .project_annotations .output .anno
14091409 params :
14101410 rname = '16_peak_ExonIntron' ,
1411- script = join (source_dir ,'workflow' ,'scripts' ,'09_Anno_ExonIntron .R' ),
1412- functions = join (source_dir ,'workflow' ,'scripts' ,'09_peak_annotation_functions .R' ),
1411+ script = join (source_dir ,'workflow' ,'scripts' ,'05_Anno_ExonIntron .R' ),
1412+ functions = join (source_dir ,'workflow' ,'scripts' ,'05_peak_annotation_functions .R' ),
14131413 p_type = peak_id ,
14141414 anchor = anno_anchor ,
14151415 r_depth = min_count ,
@@ -1489,8 +1489,8 @@ rule peak_RMSK:
14891489 anno = rules .project_annotations .output .anno
14901490 params :
14911491 rname = '17_peak_RMSK' ,
1492- script = join (source_dir ,'workflow' ,'scripts' ,'09_Anno_RMSK .R' ),
1493- functions = join (source_dir ,'workflow' ,'scripts' ,'09_peak_annotation_functions .R' ),
1492+ script = join (source_dir ,'workflow' ,'scripts' ,'05_Anno_RMSK .R' ),
1493+ functions = join (source_dir ,'workflow' ,'scripts' ,'05_peak_annotation_functions .R' ),
14941494 p_type = peak_id ,
14951495 anchor = anno_anchor ,
14961496 r_depth = min_count ,
@@ -1552,8 +1552,8 @@ rule peak_process:
15521552 RMSKOut_OS = join (out_dir ,'04_annotation' , '02_peaks' , '{sp}_' + peak_id + 'readPeaks_AllRegions_RMSK_OppoStrand.txt' ),
15531553 params :
15541554 rname = '18_peak_process' ,
1555- script = join (source_dir ,'workflow' ,'scripts' ,'09_Anno_Process .R' ),
1556- functions = join (source_dir ,'workflow' ,'scripts' ,'09_peak_annotation_functions .R' ),
1555+ script = join (source_dir ,'workflow' ,'scripts' ,'05_Anno_Process .R' ),
1556+ functions = join (source_dir ,'workflow' ,'scripts' ,'05_peak_annotation_functions .R' ),
15571557 p_type = peak_id ,
15581558 anchor = anno_anchor ,
15591559 r_depth = min_count ,
@@ -1723,7 +1723,7 @@ if (DE_method=="MANORM"):
17231723 get_MANORM_post_processing
17241724 params :
17251725 rname = "20c_MANORM_processing" ,
1726- script = join (source_dir ,'workflow' ,'scripts' ,'11_MAnorm_Process .R' ),
1726+ script = join (source_dir ,'workflow' ,'scripts' ,'07_MAnorm_Process .R' ),
17271727 anno_dir = join (out_dir ,'04_annotation' ),
17281728 de_dir = join (out_dir ,'05_demethod' , '02_analysis' ),
17291729 gid_1 = get_DEMETHOD_gid1 ,
@@ -1818,7 +1818,7 @@ if (DE_method=="MANORM"):
18181818 post_procRev = rules .MANORM_post_processing .output .post_procRev
18191819 params :
18201820 rname = "20d_MANORM_RMD" ,
1821- R = join (source_dir ,'workflow' ,'scripts' ,'12_MAnormAnnotation .Rmd' ),
1821+ R = join (source_dir ,'workflow' ,'scripts' ,'08_MAnormAnnotation .Rmd' ),
18221822 gid_1 = get_DEMETHOD_gid1 ,
18231823 gid_2 = get_DEMETHOD_gid2 ,
18241824 p_id = peak_id ,
@@ -1904,7 +1904,7 @@ elif (DE_method == "DIFFBIND"):
19041904 output:
19051905 - '05_demethod', '02_analysis', group_id, groupid + '_DIFFBIND_' + strand + '.txt'
19061906 example input
1907- Rscript /home/sevillas2/git/iCLIP/workflow/scripts/11_DIFFBIND_PreProcess .R
1907+ Rscript /home/sevillas2/git/iCLIP/workflow/scripts/07_DIFFBIND_PreProcess .R
19081908 --samplename WT
19091909 --background KO
19101910 --sample_overlap 1
@@ -1920,7 +1920,7 @@ elif (DE_method == "DIFFBIND"):
19201920 s_manifest = sample_manifest ,
19211921 params :
19221922 rname = "20b_DIFFBIND_preprocess" ,
1923- script = join (source_dir ,'workflow' ,'scripts' ,'11_DIFFBIND_PreProcess .R' ),
1923+ script = join (source_dir ,'workflow' ,'scripts' ,'07_DIFFBIND_PreProcess .R' ),
19241924 gid_1 = get_DEMETHOD_gid1 ,
19251925 gid_2 = get_DEMETHOD_gid2 ,
19261926 st = '{strand}' ,
@@ -1957,7 +1957,7 @@ elif (DE_method == "DIFFBIND"):
19571957 post = /data/sevillas2/diffbind/05_demethod/02_analysis/WT_vs_KO/WT_vs_KO_DIFFBIND_post_processing.txt
19581958 final = /data/sevillas2/diffbind/05_demethod/02_analysis/WT_vs_KO/WT_vs_KO_DIFFBIND_final_table.txt
19591959 example
1960- Rscript /home/sevillas2/git/iCLIP/workflow/scripts/11_DIFFBIND_Process .R
1960+ Rscript /home/sevillas2/git/iCLIP/workflow/scripts/07_DIFFBIND_Process .R
19611961 --samplename WT
19621962 --background KO
19631963 --peak_type ALL
@@ -1972,7 +1972,7 @@ elif (DE_method == "DIFFBIND"):
19721972 --gencode_path /hg38/Gencode_V32/fromGencode/gencode.v32.annotation.gtf.txt
19731973 --intron_path /hg38/Gencode_V32/fromUCSC/KnownGene/KnownGene_GencodeV32_GRCh38_introns.bed
19741974 --rmsk_path /hg38/repeatmasker/rmsk_GRCh38.txt
1975- --function_script /home/sevillas/git/iCLIP/workflow/scripts/11_DIFFBIND_Process .R
1975+ --function_script /home/sevillas/git/iCLIP/workflow/scripts/07_DIFFBIND_Process .R
19761976 --out_dir /data/sevillas2/diffbind/05_demethod/02_analysis/WT_vs_KO/
19771977 """
19781978 input :
@@ -1981,8 +1981,8 @@ elif (DE_method == "DIFFBIND"):
19811981 table_n = join (out_dir ,'05_demethod' ,'02_analysis' , '{group_id}' ,'{group_id}_' + peak_id + 'readPeaks_' + DE_method + '_table_N.txt' ),
19821982 params :
19831983 rname = "20c_DIFFBIND_process" ,
1984- script = join (source_dir ,'workflow' ,'scripts' ,'11_DIFFBIND_Process .R' ),
1985- script_func = join (source_dir ,'workflow' ,'scripts' ,'09_peak_annotation_functions .R' ),
1984+ script = join (source_dir ,'workflow' ,'scripts' ,'07_DIFFBIND_Process .R' ),
1985+ script_func = join (source_dir ,'workflow' ,'scripts' ,'05_peak_annotation_functions .R' ),
19861986 gid_1 = get_DEMETHOD_gid1 ,
19871987 gid_2 = get_DEMETHOD_gid2 ,
19881988 p_type = peak_id ,
@@ -2027,7 +2027,7 @@ elif (DE_method == "DIFFBIND"):
20272027 s_manifest = sample_manifest ,
20282028 params :
20292029 rname = "20d_DIFFBIND_RMD" ,
2030- R = join (source_dir ,'workflow' ,'scripts' ,'12_DIFFBINDAnnotation .Rmd' ),
2030+ R = join (source_dir ,'workflow' ,'scripts' ,'08_DIFFBINDAnnotation .Rmd' ),
20312031 gid_1 = get_DEMETHOD_gid1 ,
20322032 gid_2 = get_DEMETHOD_gid2 ,
20332033 p_id = peak_id ,
0 commit comments