Skip to content

Commit e5c4fe6

Browse files
committed
Edited README and accession parameter
1 parent cfdd9a7 commit e5c4fe6

File tree

5 files changed

+31
-13
lines changed

5 files changed

+31
-13
lines changed

Metagenomics/Illumina/Workflow_Documentation/NF_MGIllumina-A/README.md

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ nextflow run main.nf --help
118118
#### 4a. Approach 1: Run slurm jobs in singularity containers with OSD accession as input
119119
120120
```bash
121-
nextflow run main.nf -resume -profile slurm,singularity --GLDS_accession OSD-574
121+
nextflow run main.nf -resume -profile slurm,singularity --accession OSD-574
122122
```
123123
124124
<br>
@@ -149,7 +149,7 @@ nextflow run main.nf -resume -profile conda --csv_file SE_file.csv --conda.qc <p
149149
150150
*Required only if you would like to pull and process data directly from OSDR*
151151
152-
* `--GLDS_accession` – A Genelab / OSD accession number e.g. OSD-574.
152+
* `--accession` – A Genelab / OSD accession number e.g. OSD-574.
153153
154154
*Required only if --GLDS_accession is not passed as an argument*
155155
@@ -204,4 +204,21 @@ To generate a README file, a protocols file, a md5sums table and a file associat
204204
nextflow -C post_processing.config run post_processng.nf -resume -profile slurm,singularity
205205
```
206206
207-
The outputs of the run will be in a directory called `Post_Processing` by default.
207+
The outputs of the run will be in a directory called `Post_Processing` by default and they are as follows:
208+
209+
- Post_processing/FastQC_Outputs/filtered_multiqc_GLmetagenomics_report.zip (Filtered sequence multiqc report with paths purged)
210+
211+
- Post_processing/FastQC_Outputs/raw_multiqc_GLmetagenomics_report.zip (Raw sequence multiqc report with paths purged)
212+
213+
- Post_processing/<GLDS_accession>_-associated-file-names.tsv (File association table for curation)
214+
215+
- Post_processing/<GLDS_accession>_metagenomics-validation.log (Automatic verification and validation log file)
216+
217+
- Post_processing/processed_md5sum_GLmetagenomics.tsv (md5sums for the files to be released on OSDR)
218+
219+
- Post_processing/processing_info_GLmetagenomics.zip (Zip file containing all files used to run the workflow and required logs with paths purged)
220+
221+
- Post_processing/protocol.txt (File describing the methods used by the workflow)
222+
223+
- Post_processing/README_GLmetagenomics.txt (README file listing and describing the outputs of the workflow)
224+

Metagenomics/Illumina/Workflow_Documentation/NF_MGIllumina-A/workflow_code/main.nf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if (params.help) {
2323
println(" > nextflow run main.nf -resume -profile slurm,conda --csv_file SE_file.csv")
2424
println()
2525
println("Example 3: Run jobs locally in conda environments, supply a GLDS accession, and specify the path to an existing conda environment.")
26-
println(" > nextflow run main.nf -resume -profile conda --GLDS_accession OSD-574 --conda.qc <path/to/existing/conda/environment>")
26+
println(" > nextflow run main.nf -resume -profile conda --accession OSD-574 --conda.qc <path/to/existing/conda/environment>")
2727
println()
2828
println("Required arguments:")
2929
println("""-profile [STRING] Specifies the profile to be used to run the workflow. Options are [slurm, singularity, docker, and conda].
@@ -86,7 +86,7 @@ if (params.help) {
8686
println(" --read_based_dir [PATH] Read-based analysis outputs directory. Default: ../Read-based_Processing/.")
8787
println()
8888
println("Genelab specific arguements:")
89-
println(" --GLDS_accession [STRING] A Genelab accession number if the --csv_file parameter is not set. If this parameter is set, it will ignore the --csv_file parameter.")
89+
println(" --accession [STRING] A Genelab accession number if the --csv_file parameter is not set. If this parameter is set, it will ignore the --csv_file parameter.")
9090
println(" --RawFilePattern [STRING] If we do not want to download all files (which we often won't), we can specify a pattern here to subset the total files.")
9191
println(" For example, if we know we want to download just the fastq.gz files, we can say 'fastq.gz'. We can also provide multiple patterns")
9292
println(" as a comma-separated list. For example, If we want to download the fastq.gz files that also have 'NxtaFlex', 'metagenomics', and 'raw' in")
@@ -145,7 +145,7 @@ log.info """
145145
You have set the following parameters:
146146
Profile: ${workflow.profile}
147147
Input csv file : ${params.csv_file}
148-
GLDS Accession : ${params.GLDS_accession}
148+
GLDS or OSD Accession : ${params.accession}
149149
GLDS Raw File Pattern: ${params.RawFilePattern}
150150
Workflow : ${params.workflow}
151151
Nextflow Directory publishing mode: ${params.publishDir_mode}
@@ -317,9 +317,9 @@ workflow {
317317
// Software Version Capturing - runsheet
318318
software_versions_ch = Channel.empty()
319319
// Parse file input
320-
if(params.GLDS_accession){
320+
if(params.accession){
321321

322-
GET_RUNSHEET(params.GLDS_accession)
322+
GET_RUNSHEET(params.accession)
323323
GET_RUNSHEET.out.input_file
324324
.splitCsv(header:true)
325325
.set{file_ch}

Metagenomics/Illumina/Workflow_Documentation/NF_MGIllumina-A/workflow_code/nextflow.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ params {
113113
checkm = null // "/path/to/envs/checkm"
114114
}
115115

116-
GLDS_accession = false // GLDS or OSD acession number for the data to be processed
116+
accession = false // GLDS or OSD acession number for the data to be processed
117117
// Pattern of files on OSDR for the GLDS_accession you want to process.
118118
RawFilePattern = null // "_metaG", "_HRremoved"
119119
errorStrategy = "terminate"

Metagenomics/Illumina/Workflow_Documentation/NF_MGIllumina-A/workflow_code/slurm_submit.slurm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ echo $HOSTNAME
2626

2727
## Activate the conda environemnt containing the tools you need to run your job ##
2828
## You can see a list of all available environments by running the command: conda env list ##
29-
## If you need a conda envrionment installed request it using JIRA ##
3029

3130
source activate /path/to/envs/nextflow ## Replace conda_env_name with the name of the conda environment with nextflow installed ##
3231

@@ -40,8 +39,10 @@ echo ""
4039

4140
## The command(s) that you want to run in this slurm job ##
4241
export NXF_SINGULARITY_CACHEDIR=singularity/
43-
#nextflow run main.nf -profile slurm,singularity -resume --csv_file PE_file.csv ## Replace command with the command(s) you want to run ##
44-
nextflow run main.nf -profile slurm,singularity --GLDS_accession OSD-574 -resume
42+
export TOWER_ACCESS_TOKEN=<ACCESS_TOKEN>
43+
export TOWER_WORKSPACE_ID=<WORKSPACE_ID>
44+
#nextflow run main.nf -profile slurm,singularity -resume --csv_file PE_file.csv -with-tower ## Replace command with the command(s) you want to run ##
45+
nextflow run main.nf -profile slurm,singularity --accession OSD-574 -resume -with-tower
4546

4647

4748
## Add a time-stamp at the end of the job then calculate how long the job took to run in seconds, minutes, and hours ##

Metagenomics/Illumina/Workflow_Documentation/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
|Pipeline Version|Current Workflow Version (for respective pipeline version)|Nextflow Version|
88
|:---------------|:---------------------------------------------------------|:---------------|
99
|*[GL-DPPD-7107-A.md](../Pipeline_GL-DPPD-7107_Versions/GL-DPPD-7107-A.md)|[NF_MGIllumina-A_1.0.0](NF_MGIllumina-A)|23.10.1|
10-
|[GL-DPPD-7107.md](../Pipeline_GL-DPPD-7107_Versions/GL-DPPD-7107.md)|[SW_MGIllumina_2.0.4](SW_MGIllumina)|N/A (Snakemake vXXXX)|
10+
|[GL-DPPD-7107.md](../Pipeline_GL-DPPD-7107_Versions/GL-DPPD-7107.md)|[SW_MGIllumina_2.0.4](SW_MGIllumina)|N/A (Snakemake v7.26.0)|
1111

1212

1313
*Current GeneLab Pipeline/Workflow Implementation

0 commit comments

Comments
 (0)