Merge pull request #53 from lemaslab/xinsong

recover test
lemaslab · Jun 7, 2020 · 6237eca · 6237eca
2 parents 9c0a6f8 + 411e954
commit 6237eca
Show file tree

Hide file tree

Showing 10 changed files with 1,367 additions and 31 deletions.
diff --git a/.travis/RUMP-test_aftermzmine.sh b/.travis/RUMP-test_aftermzmine.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Test processes MZmine output files with sample data
-./nextflow run_aftermzmine.nf --input_dir_pos .travis/data/POS/ --input_dir_neg .travis/data/NEG --POS_design_path .travis/pos_design.csv --NEG_design_path .travis/neg_design.csv --cutoff 1 --pos_mzmine_peak_output .travis/pos_data.csv --neg_mzmine_peak_output .travis/neg_data.csv -with-docker xinsongdu/lemaslab_rump:v1.0.0
+./nextflow run_aftermzmine.nf --input_dir_pos .travis/data/POS/ --input_dir_neg .travis/data/NEG --POS_design_path .travis/pos_design.csv --NEG_design_path .travis/neg_design.csv --unknown_search 0 --cutoff 1 --pos_mzmine_peak_output .travis/pos_data.csv --neg_mzmine_peak_output .travis/neg_data.csv -with-docker xinsongdu/lemaslab_rump:v1.0.0
diff --git a/.travis/RUMP-test_all.sh b/.travis/RUMP-test_all.sh
@@ -4,5 +4,5 @@
 wget https://github.com/mzmine/mzmine2/releases/download/v2.53/MZmine-2.53-Linux.zip && unzip MZmine-2.53-Linux.zip && rm MZmine-2.53-Linux.zip
 
 # Test all processes with sample data
-./nextflow main.nf --input_dir_pos .travis/data/POS/ --input_dir_neg .travis/data/NEG --POS_design_path .travis/pos_design.csv --NEG_design_path .travis/neg_design.csv --cutoff 1 -with-docker xinsongdu/lemaslab_rump:v1.0.0
+./nextflow main.nf --input_dir_pos .travis/data/POS/ --input_dir_neg .travis/data/NEG --POS_design_path .travis/pos_design.csv --NEG_design_path .travis/neg_design.csv --unknown_search 0 --cutoff 1 -with-docker xinsongdu/lemaslab_rump:v1.0.0
 
diff --git a/.travis/pos_data.csv b/.travis/pos_data.csv
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![travis](https://travis-ci.com/lemaslab/RUMP.svg?branch=master)](https://travis-ci.com/lemaslab/RUMP)
 [![license](http://img.shields.io/badge/license-GNU-blue.svg)](https://github.com/lemaslab/RUMP/blob/master/LICENSE)
 
-# RUMP (Reparing)
+# RUMP
 
 ![alt text](https://github.com/lemaslab/RUMP/blob/master/figs/Metabolomics_Pipeline_V4.png)
 

diff --git a/main.nf b/main.nf
@@ -134,7 +134,7 @@ if (params.help) {
     System.out.println("    --POS_design_path                       location for positive design file, default is 'data/pos_design.csv'")
     System.out.println("    --NEG_design_path                       location for negative design file, default is 'data/neg_design.csv'")
     System.out.println("    --cutoff                                cutoff p-value for mummichog pathway analysis, default is 0.05")
-    System.out.println("    --unknown_search                        whether do unknown search for unidentified metabolites or not, default is '0', please set it to '1' when needed")
+    System.out.println("    --unknown_search                        whether do unknown search for unidentified metabolites or not, default is '1', please set it to '0' when you want to disable it")
     System.out.println("    --version                               whether to show version information or not, default is null")
     System.out.println("    --help                                  whether to show help information or not, default is null")
     System.out.println("Please refer to nextflow.config for more options.")

diff --git a/negative_library.csv b/negative_library.csv
diff --git a/nextflow.config b/nextflow.config
@@ -68,7 +68,7 @@ params
     bs = "1"
 
     // Whether do unknown search or not
-    unknown_search = "0"
+    unknown_search = "1"
 
     // Use singularity?
     container = "Docker"
@@ -87,8 +87,8 @@ params
     mzmine_dir = "MZmine-2.53-Linux/"
 
     // Change the following file location (customized library for matching metabolites) to the location on your machine
-    pos_library = "Positive_Garrett_MetaboliteStd_Library_RP_edited01152019JG.csv"
-    neg_library = "Negative_Garrett_MetaboliteStd_Library_RP_edited01152019JG.csv"
+    pos_library = "positive_library.csv"
+    neg_library = "negative_library.csv"
 
     pos_config = "pos_config.xml"
     neg_config = "neg_config.xml"

diff --git a/positive_library.csv b/positive_library.csv
diff --git a/rump/add_stats.py b/rump/add_stats.py
@@ -201,7 +201,7 @@ def add_label(row, group1_name, group2_name):
 
 def add_stats(data_file="data_pos_ph.csv", design_file="design", \
               output_file="pos_withstats.csv", \
-              library="Positive_Garrett_MetaboliteStd_Library_RP_edited01152019JG.csv"):
+              library="positive_library.csv"):
     """Add basic statistics to peak table produced by MZmine.
 
     # Arguments:

diff --git a/run_aftermzmine.nf b/run_aftermzmine.nf
@@ -124,7 +124,7 @@ if (params.help) {
     System.out.println("    --pos_mzmine_peak_output                location for positive peak table generated by MZmine-2.53, default is 'pos_data.csv'")
     System.out.println("    --neg_mzmine_peak_output                location for negative peak table generated by MZmine-2.53, default is 'neg_data.csv'")
     System.out.println("    --cutoff                                cutoff p-value for mummichog pathway analysis, default is 0.05")
-    System.out.println("    --unknown_search                        whether do unknown search for unidentified metabolites or not, default is '0', please set it to '1' when needed")
+    System.out.println("    --unknown_search                        whether do unknown search for unidentified metabolites or not, default is '0', please set it to '0' when you want to disable it")
     System.out.println("    --version                               whether to show version information or not, default is null")
     System.out.println("    --help                                  whether to show help information or not, default is null")
     System.out.println("Please refer to nextflow.config for more options.")