Skip to content

Commit b4bb50e

Browse files
authored
doc: clarify step 1 chef and dev usage (#321)
1 parent 9705b11 commit b4bb50e

3 files changed

Lines changed: 20 additions & 10 deletions

File tree

doc/chef_guide.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@ Please report _any_ issues to the software maintainers, such as warnings or erro
55

66
## :green_circle: Step 1: Fill Timeline Histograms
77

8-
Use the "qtl" model as part of your usual cooking workflow; see [the Chefs' documentation wiki](https://clasweb.jlab.org/wiki/index.php/CLAS12_Chef_Documentation). Output files will appear in your chosen output directory, within `hist/detectors/`.
8+
This step is integrated in the cooking workflow using the "qtl" model; see [the Chefs' documentation wiki for details](https://clasweb.jlab.org/wiki/index.php/CLAS12_Chef_Documentation). Output files will appear in your chosen output directory, within `hist/detectors/`.
9+
10+
<details>
11+
<summary>If you are not using the cooking workflow...</summary>
12+
13+
> See [the detailed procedure's Step 1](/doc/procedure.md) instead. The cooking workflow's "qtl" model just runs `qtl histogram` with the appropriate arguments.
14+
15+
</details>
916

1017
<details>
1118
<summary>For physics QA timelines...</summary>
@@ -44,5 +51,5 @@ A URL will be printed upon success, and a link will appear in [`clas12mon`](http
4451
4552
---
4653

47-
For more details, such as producing physics QA timelines, see other guides in
54+
For more details, see other guides in
4855
[the table of contents](/README.md) or reach out to the software maintainers.

doc/dev_notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ outfiles
119119

120120
# Notes on SWIF Workflows
121121

122-
For [CLAS12 `swif` workflow](https://github.com/baltzell/clas12-workflow) integration, the `bin/qtl histogram` command (which normally generates `slurm` jobs) has a specific mode `--swifjob`:
122+
For chef cooking workflow integration, the `bin/qtl histogram` command (which normally generates `slurm` jobs) has a specific mode `--swifjob`:
123123
```bash
124124
qtl histogram --swifjob --focus-detectors # generate files for detector timelines
125125
qtl histogram --swifjob --focus-physics # generate files for physics QA timelines
126126
```
127-
Either or both of these commands is _all_ that needs to be executed on a runner node, within [`clas12-workflow`](https://github.com/baltzell/clas12-workflow); calling one of these will automatically run the wrapped code, with the following assumptions and conventions:
127+
Either or both of these commands is _all_ that needs to be executed on a runner node, within the cooking workflow; calling one of these will automatically run the wrapped code, with the following assumptions and conventions:
128128
- input HIPO files are at `./` and only a single run will be processed
129129
- run number is obtained by `RUN::config` from one of the HIPO files; all HIPO files are assumed to belong to the same run
130130
- all output files will be in `./outfiles` (no `$dataset` subdirectory as above)

doc/procedure.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Procedure for Timeline Production
22

3+
> [!NOTE]
4+
> Chefs should follow the [chef's guide](/doc/chef_guide.md), since some of the timeline procedure is integrated in the chef cooking workflow.
5+
36
The main script for running timelines is `qtl`:
47
```bash
58
qtl --help
@@ -17,19 +20,19 @@ Both of these timeline types are produced in the following steps (🟢) .
1720
1821
## 🟢 Step 1: Histogramming
1922

20-
This step reads input HIPO files (_e.g._, DST or `mon` files) and produces histograms and auxiliary files, which are then consumed by Step 2 to produce the timelines. Since many input files are read, it is recommended to use a computing cluster.
21-
22-
This step can either be run during the usual data cooking procedure, using [`clas12-workflow`](https://github.com/baltzell/clas12-workflow) (see its usage guide), or it may be run separately on already-cooked data using:
23+
This step reads input HIPO files (_e.g._, DST or `mon` files) and produces histograms and auxiliary files, which are then consumed by Step 2 to produce the timelines. Run:
2324
```bash
2425
qtl histogram
2526
```
2627
Running it with no arguments will print the usage guide; use the `--help` option for more detailed guidance.
2728

29+
> [!NOTE]
30+
> This step is integrated in the chef's cooking workflow; see the [chef's guide](/doc/chef_guide.md) for more information.
31+
2832
> [!NOTE]
2933
> If you are performing physics QA for QADB, consider using [**prescaled trains**](/qa-physics/prescaler) (and `qtl histogram` will need the `--flatdir` argument)
3034
3135
### Example
32-
If using `clas12-workflow`, see it's documentation; otherwise if using `qtl histogram`:
3336
```bash
3437
qtl histogram -d rga_sp19_v5 /volatile/clas12/rg-a/production/pass0/sp19/v5/mon
3538
```
@@ -64,11 +67,11 @@ qtl physics # for physics timelines (will eventually be combined with 'qtl ana
6467
> - use the scripts' `-o` option to set the output locations
6568
6669
### Example
67-
**If** you used `clas12-workflow` for Step 1, the script arguments should be
70+
**If** you used the chef's cooking workflow for Step 1, the script arguments should be
6871
```bash
6972
qtl analysis -i /path/to/output/files -p some/publish/directory/rga_sp19_v5
7073
```
71-
- the output from `clas12-workflow` is `/path/to/output/files`; its subdirectories should be run numbers
74+
- the output from the cooking workflow is `/path/to/output/files`; its subdirectories should be run numbers
7275
- the publishing directory given by `-p` is a subdirectory of the web server; see `qtl analysis` usage guide
7376

7477
**Otherwise**, you may omit the `-i /path/to/output/files` option (unless you customized it from Step 1)

0 commit comments

Comments
 (0)