Skip to content

Commit 47d0b6e

Browse files
committed
Split a single headless tutorial into headless and batch tutorials.
1 parent 48de937 commit 47d0b6e

File tree

3 files changed

+41
-47
lines changed

3 files changed

+41
-47
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ FragPipe is a comprehensive computational platform for analyzing mass spectromet
1212

1313
#### FragPipe tutorials
1414
* [Using FragPipe](https://fragpipe.nesvilab.org/docs/tutorial_fragpipe.html) (general tutorial covering all FragPipe modules)
15-
* [Running FragPipe Batches](https://fragpipe.nesvilab.org/docs/tutorial_headless.html)
15+
* [Running FragPipe in command line interface](https://fragpipe.nesvilab.org/docs/tutorial_headless.html)
16+
* [Running multiple FragPipe jobs in Batch](https://fragpipe.nesvilab.org/docs/tutorial_batch.html)
1617
* [Pulling and running FragPipe using Docker](https://fragpipe.nesvilab.org/docs/tutorial_docker.html)
1718
* PTM discovery
1819
* [Open search](https://fragpipe.nesvilab.org/docs/tutorial_open.html)

docs/tutorial_batch.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Running FragPipe Batches (Job Queue)
2+
3+
This tutorial describes the ways to run multiple FragPipe jobs in series, using the Batch tab user interface or via the command line.
4+
5+
### FragPipe Jobs and the Batch tab
6+
7+
A "Job" is one complete FragPipe run, analogous to clicking "Run" on the Run tab. Jobs are the basic unit of the Batch mode and can be saved, loaded, and run as a batch on the Batch tab.
8+
9+
A Job consists of the following components:
10+
* **Workflow File (.workflow) (required)**: The workflow file defines which tools are run and contains all the parameters. Either built-in or custom workflows can be used for jobs. Custom workflow files can be saved by clicking the "Save to custom folder" button on the Workflow tab.
11+
* **LC-MS Manifest File (.fp-manifest) (required)**: The fp-manifest file defines which LC-MS files (e.g., raw or mzML files) will be analyzed by the job, their data types, and any experiment and replicate settings. Manifest files can be generated on the Workflow tab by filling in the table and clicking the "Save as Manifest" button.
12+
* **Output Directory (required)**: Where to save the output. If it does not exist, FragPipe will create it automatically at runtime.
13+
* Tools Folder Path: (optional) The path to the folder containing MSFragger, IonQuant, and diaTracer files. If not specified, the path from the Config tab of FragPipe will be used. This only needs to be specified in order to use different tool versions for different jobs.
14+
* Fasta Path: (optional) The path to the fasta database to be used. Workflow files automatically save the fasta path so it is not required to specify a fasta here, but this field can be used to override the fasta in the workflow file.
15+
* RAM: (optional) The amount of memory to use for the job. FragPipe will auto-detect the available memory if not provided.
16+
* Threads: (optional) The number of CPU threads to use for the job. FragPipe will auto-detect the available CPU threads if not provided.
17+
18+
### Saving, loading, and running Jobs
19+
20+
For most users, we recommend creating Jobs using the FragPipe GUI. Set up a FragPipe run as usual for a single analysis (see the general tutorial for details: ([https://fragpipe.nesvilab.org/docs/tutorial_fragpipe.html](https://fragpipe.nesvilab.org/docs/tutorial_fragpipe.html))). Once everything is ready, instead of clicking "Run" on the Run tab, click "Save as Job". This will create a .job file with all the information needed to run the job and save it to the Jobs folder inside FragPipe. It will also automatically load it to the Batch table on the Batch tab. You can name the job using the text box next to the "Save as Job" button if desired.
21+
22+
![](https://raw.githubusercontent.com/Nesvilab/FragPipe/gh-pages/images/run_tab_save_job.png)
23+
<br>
24+
25+
Multiple jobs can be created this way by changing the parameters, raw files, and/or output directory and saving a new job. When all jobs are ready to run, go to the Batch tab and click "Run All" to run all jobs that are loaded in the batch table. The progress bar will display the status of the batch, and the output of each run can be viewed in the console below. The "Stop All" button can be used to stop a batch of jobs mid-run. Note that once a batch of jobs is running, any edits to the batch table are ignored until the batch is finished and a new batch is started (i.e., a batch is "submitted" to run, not read live from the table throughout the run).
26+
27+
![](https://raw.githubusercontent.com/Nesvilab/FragPipe/gh-pages/images/batch_tab_run_jobs.png)
28+
<br>
29+
30+
To save a compiled batch of jobs, use the "Save Job Manifest" button. Job Manifests (i.e., lists of saved jobs) can be loaded using the "Load Job Manifest" button. Individual Job(s) can also be loaded to the table with the "Load Job(s)" button. All loaded jobs will be added to the table. If you want to remove existing jobs prior to loading new ones, use the "Clear Table" button, or use the "Remove Selected Jobs" button to remove only highlighted job(s) from the table.
31+
32+
![](https://raw.githubusercontent.com/Nesvilab/FragPipe/gh-pages/images/batch_tab_manipulate_table.png)
33+
<br>
34+
35+
Previously saved jobs can also be loaded into the rest of the FragPipe GUI on the Workflow tab. This can be used to see what the settings were in a previous job, or to run a job as a standard (single) FragPipe run using the Run tab.
36+
37+
![](https://raw.githubusercontent.com/Nesvilab/FragPipe/gh-pages/images/workflow_load_job.png)
38+
<br>

docs/tutorial_headless.md

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,7 @@
1-
# Running FragPipe Batches (Job Queue)
2-
3-
This tutorial describes the ways to run multiple FragPipe jobs in series, using the Batch tab user interface or via the command line.
4-
5-
### FragPipe Jobs and the Batch tab
6-
7-
A "Job" is one complete FragPipe run, analogous to clicking "Run" on the Run tab. Jobs are the basic unit of the Batch mode and can be saved, loaded, and run as a batch on the Batch tab.
8-
9-
A Job consists of the following components:
10-
* **Workflow File (.workflow) (required)**: The workflow file defines which tools are run and contains all the parameters. Either built-in or custom workflows can be used for jobs. Custom workflow files can be saved by clicking the "Save to custom folder" button on the Workflow tab.
11-
* **LC-MS Manifest File (.fp-manifest) (required)**: The fp-manifest file defines which LC-MS files (e.g., raw or mzML files) will be analyzed by the job, their data types, and any experiment and replicate settings. Manifest files can be generated on the Workflow tab by filling in the table and clicking the "Save as Manifest" button.
12-
* **Output Directory (required)**: Where to save the output. If it does not exist, FragPipe will create it automatically at runtime.
13-
* Tools Folder Path: (optional) The path to the folder containing MSFragger, IonQuant, and diaTracer files. If not specified, the path from the Config tab of FragPipe will be used. This only needs to be specified in order to use different tool versions for different jobs.
14-
* Fasta Path: (optional) The path to the fasta database to be used. Workflow files automatically save the fasta path so it is not required to specify a fasta here, but this field can be used to override the fasta in the workflow file.
15-
* RAM: (optional) The amount of memory to use for the job. FragPipe will auto-detect the available memory if not provided.
16-
* Threads: (optional) The number of CPU threads to use for the job. FragPipe will auto-detect the available CPU threads if not provided.
17-
18-
### Saving, loading, and running Jobs
19-
20-
For most users, we recommend creating Jobs using the FragPipe GUI. Set up a FragPipe run as usual for a single analysis (see the general tutorial for details: ([https://fragpipe.nesvilab.org/docs/tutorial_fragpipe.html](https://fragpipe.nesvilab.org/docs/tutorial_fragpipe.html))). Once everything is ready, instead of clicking "Run" on the Run tab, click "Save as Job". This will create a .job file with all the information needed to run the job and save it to the Jobs folder inside FragPipe. It will also automatically load it to the Batch table on the Batch tab. You can name the job using the text box next to the "Save as Job" button if desired.
21-
22-
![](https://raw.githubusercontent.com/Nesvilab/FragPipe/gh-pages/images/run_tab_save_job.png)
23-
<br>
24-
25-
Multiple jobs can be created this way by changing the parameters, raw files, and/or output directory and saving a new job. When all jobs are ready to run, go to the Batch tab and click "Run All" to run all jobs that are loaded in the batch table. The progress bar will display the status of the batch, and the output of each run can be viewed in the console below. The "Stop All" button can be used to stop a batch of jobs mid-run. Note that once a batch of jobs is running, any edits to the batch table are ignored until the batch is finished and a new batch is started (i.e., a batch is "submitted" to run, not read live from the table throughout the run).
26-
27-
![](https://raw.githubusercontent.com/Nesvilab/FragPipe/gh-pages/images/batch_tab_run_jobs.png)
28-
<br>
29-
30-
To save a compiled batch of jobs, use the "Save Job Manifest" button. Job Manifests (i.e., lists of saved jobs) can be loaded using the "Load Job Manifest" button. Individual Job(s) can also be loaded to the table with the "Load Job(s)" button. All loaded jobs will be added to the table. If you want to remove existing jobs prior to loading new ones, use the "Clear Table" button, or use the "Remove Selected Jobs" button to remove only highlighted job(s) from the table.
31-
32-
![](https://raw.githubusercontent.com/Nesvilab/FragPipe/gh-pages/images/batch_tab_manipulate_table.png)
33-
<br>
34-
35-
Previously saved jobs can also be loaded into the rest of the FragPipe GUI on the Workflow tab. This can be used to see what the settings were in a previous job, or to run a job as a standard (single) FragPipe run using the Run tab.
36-
37-
![](https://raw.githubusercontent.com/Nesvilab/FragPipe/gh-pages/images/workflow_load_job.png)
38-
<br>
39-
40-
# Running FragPipe via command line interface (headless mode)
1+
# Running FragPipe in command line interface (headless mode)
412

423
__For most desktop users, we recommend running FragPipe in GUI mode ([https://fragpipe.nesvilab.org/docs/tutorial_fragpipe.html](https://fragpipe.nesvilab.org/docs/tutorial_fragpipe.html)). Users can also use FragPipe on remote server with X forwarding ([https://fragpipe.nesvilab.org/docs/tutorial_setup_x_forwarding.html](https://fragpipe.nesvilab.org/docs/tutorial_setup_x_forwarding.html)).__
434

44-
The content of the Batch table on the Batch tab can be saved to a script file (.bat in Windows or .sh in Linux) to be run separately (without the GUI). Click the "Write Jobs to Batch Script" button on the Batch tab to generate the file, then execute the file via command line.
45-
46-
Example script files can be found here (replace paths with the correct local paths on your machine):
47-
[Windows](https://raw.githubusercontent.com/Nesvilab/FragPipe/gh-pages/images/example-fragpipe-batch.bat)
48-
[Linux](https://raw.githubusercontent.com/Nesvilab/FragPipe/gh-pages/images/example-fragpipe-batch.sh)
49-
505
To run FragPipe in command line interface, using `fragpipe` (Linux) or `fragpipe.bat` (Windows) in `fragpipe/bin` directory with the following commands:
516

527
```shell

0 commit comments

Comments
 (0)