diff --git a/astrocyte_pkg.yml b/astrocyte_pkg.yml index 1a7cb7a0cf81e44d4f67198cc57b5ad91fdd3820..ff1a7c8f42bf6f7bee074ebaa9d8d205999a610e 100755 --- a/astrocyte_pkg.yml +++ b/astrocyte_pkg.yml @@ -135,9 +135,10 @@ workflow_parameters: type: select default: 'auto' choices: - - ['auto', 'Auto Detect'] - - ['three', '3'] - - ['two', '2'] + - ['auto', "Auto Detect"] + - ['3GEXv3', "3'GEX v3 (3' Gene Expression)"] + - ['3GEXv2', "3'GEX v2 (3' Gene Expression)"] + - ['5GEX', "5'GEX Auto (5' Gene Expression)"] required: true description: | 10x single cell gene expression chemistry version (only used in cellranger version 3.x). diff --git a/cleanup.sh b/cleanup.sh new file mode 100644 index 0000000000000000000000000000000000000000..9569ff54fd71cd94bddde415af03a101820ab514 --- /dev/null +++ b/cleanup.sh @@ -0,0 +1,7 @@ +rm *.out +rm pipeline_trace*.txt* +rm report*.html* +rm timeline*.html* +rm .nextflow*.log* +rm -r .nextflow/ +rm -r work/ diff --git a/workflow/main.nf b/workflow/main.nf index f5cdf7551d5551df8a29570c2c949ca85b7b7a6e..07b742e36bbb8e09c1c26b8f2a43be1607fe98ff 100755 --- a/workflow/main.nf +++ b/workflow/main.nf @@ -31,12 +31,14 @@ if (params.kitVersion == "three" && params.version == '2.1.1') { if (params.astrocyte) { print("Running under astrocyte") params.genomeLocation = '/project/apps_database/cellranger/refdata-cellranger-' - if (params.kitVersion == "one") { + if (params.kitVersion == "3GEXv1") { params.chemistryParam ='SC3Pv1' - } else if (params.kitVersion == "two") { + } else if (params.kitVersion == "3GEXv2") { params.chemistryParam ='SC3Pv2' - } else if (params.kitVersion == "three") { + } else if (params.kitVersion == "3GEXv3") { params.chemistryParam ='SC3Pv3' + } else if (params.kitVersion == "5GEX") { + params.chemistryParam ='fiveprime' } else { params.chemistryParam = 'auto' } @@ -358,4 +360,4 @@ process multiqc { multiqc -c ${multiqcConf} . """ -} \ No newline at end of file +}