Skip to content

Commit 7de05cb

Browse files
authored
Merge pull request #300 from vkucera/hf
Update PWG-HF documentation
2 parents 5b51d15 + 2116416 commit 7de05cb

File tree

2 files changed

+23
-18
lines changed

2 files changed

+23
-18
lines changed

docs/advanced-specifics/pwgdq.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ title: PWG-DQ
88
In the past, some hands-on sessions have been organised within the PWG-DQ. A list of the corresponding indico events is down below:
99

1010
**most recent:**
11+
1112
1. O2 DQ hands-on session (7 Dec 21) [indico event](https://indico.cern.ch/event/1098200/) , [ZOOM recordings of the first part of the session](https://indico.cern.ch/event/1098200/sessions/419561/attachments/2362418/4033057/videoPlenarySession.mp4)
1213
2. O2 DQ hands-on session (April 2022) [indico event](https://indico.cern.ch/event/1150382/)
1314
3. O2 Analysis tutorial (Oct 2022) [indico event](https://indico.cern.ch/event/1200252/timetable/?view=standard)
@@ -48,9 +49,9 @@ Mattermost channel: [O2-DQ Analysis Framework Alpha](https://mattermost.web.cern
4849
* DQ Data Model (Reduced tracks, events, muons etc.) is defined in
4950
[`ReducedInfoTables.h`](https://github.com/AliceO2Group/O2Physics/blob/master/PWGDQ/DataModel/ReducedInfoTables.h) class.
5051
* Code for easy running of the DQ tasks and output processing can be found in the
51-
[Run3Analysisvalidation](https://github.com/AliceO2Group/Run3Analysisvalidation) repository.
52+
[Run3AnalysisValidation](https://github.com/AliceO2Group/Run3AnalysisValidation) repository.
5253
* Analysis code for postprocessing of the task output is collected in the
53-
[`FirstAnalysis`](https://github.com/AliceO2Group/Run3Analysisvalidation/tree/master/FirstAnalysis) directory.
54+
[`FirstAnalysis`](https://github.com/AliceO2Group/Run3AnalysisValidation/tree/master/FirstAnalysis) directory.
5455

5556
## Existing Workflows
5657

@@ -63,13 +64,14 @@ Mattermost channel: [O2-DQ Analysis Framework Alpha](https://mattermost.web.cern
6364
* [`dileptonMuMu.cxx`](https://github.com/AliceO2Group/O2Physics/blob/master/PWGDQ/Tasks/dileptonMuMu.cxx) It refers to The dimuon analysis task. It’s a derivative of the tableReader, but with muon only informations. takes tracks flaged as « muon » and creates Pairs calculating mass, rapidity, pT.
6465

6566
## Python Interface
67+
6668
To simplify the handling and usage of the O2-DQ framework a [python interface](https://github.com/ctolon/PythonInterfaceOOP) has been developed and will be maintained for further user support.
6769

6870
Its main features are:
6971

70-
- run tasks with simple commands (all main workflows are included)
71-
- dependencies are selected and set with no need to specify them in the command line
72-
- auto completion for workflows, settings and configurables
72+
* run tasks with simple commands (all main workflows are included)
73+
* dependencies are selected and set with no need to specify them in the command line
74+
* auto completion for workflows, settings and configurables
7375

7476
To get started, a [detailed introduction](https://github.com/ctolon/PythonInterfaceOOP#user-python-based-interface) has been written and an introduction was given in the [hands-on session](https://indico.cern.ch/event/1220887/) (Dec 22).
7577

docs/advanced-specifics/pwghf.md

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Mattermost channel: [hf-o2-analysis](https://mattermost.web.cern.ch/alice/channe
4242
- Selection of tracks based on the particle identification (PID) detectors is performed via the
4343
[`TrackSelectorPID`](https://github.com/AliceO2Group/O2Physics/blob/master/Common/Core/TrackSelectorPID.h) class.
4444
- The validation framework for easy local execution, testing and validation of O2Physics code can be found in the
45-
[Run3Analysisvalidation](https://github.com/AliceO2Group/Run3Analysisvalidation) repository.
45+
[Run3AnalysisValidation](https://github.com/AliceO2Group/Run3AnalysisValidation) repository.
4646

4747
## AliHyperloop
4848

@@ -191,7 +191,7 @@ Directories: [`PWGHF/D2H/Macros`](https://github.com/AliceO2Group/O2Physics/tree
191191
- `warn` for conditions that are likely to affect the expected behaviour of the code,
192192
- `error` for problems that lead to an unwanted behaviour of the code,
193193
- `fatal` for critical problems that make further running of the code impossible or useless.
194-
- Include only needed headers but do not rely on implicitly included headers.
194+
- Include only needed headers but do not rely on implicitly included headers. See [Include What You Use](https://github.com/AliceO2Group/O2Physics/issues/8357).
195195
- Organise `#include`s into groups (separated by a blank line) in the following order:
196196
- C++
197197
- other external headers
@@ -208,13 +208,12 @@ Directories: [`PWGHF/D2H/Macros`](https://github.com/AliceO2Group/O2Physics/tree
208208
See also [Magic numbers](https://rawgit.com/AliceO2Group/CodingGuidelines/master/coding_guidelines.html?showone=Magic_numbers#Magic_numbers).
209209
- Use `Type const&` for table subscriptions in function arguments.
210210
- Declare iterators in range-based `for` loops over tables with `const auto&`.
211-
- Test your code before making a pull request.
211+
- **Test your code before making a pull request.**
212212
- Check that your branch compiles without warnings.
213-
- Propagate your changes into the [Run3Analysisvalidation](https://github.com/AliceO2Group/Run3Analysisvalidation/tree/master/codeHF#add-a-new-workflow) configuration.
213+
- Propagate your changes into the [Run3AnalysisValidation](https://github.com/AliceO2Group/Run3AnalysisValidation/tree/master/codeHF#add-a-new-workflow) configuration.
214214
- Check that your code works and runs without errors and warnings.
215215
- Make sure your code is compatible with the expected input (Run 2/3/5, real/MC data, p–p/Pb–Pb).
216-
- Check that your changes do not alter unexpectedly the control plots produced by the [validation framework](https://github.com/AliceO2Group/Run3Analysisvalidation/tree/master/codeHF#run-the-example).
217-
- Make sure your tasks can be fully configured from Run3Analysisvalidation and AliHyperloop.
216+
- Make sure your tasks can be fully configured from Run3AnalysisValidation and AliHyperloop.
218217

219218
#### `struct` members
220219

@@ -223,23 +222,27 @@ Organising the code in a well defined structure makes it easier to navigate thro
223222
- Group `struct` data members by category and separate the blocks by a single blank line.
224223
- If there is a reason to visually divide a category into smaller blocks, add a corresponding comment at the beginning of each block.
225224
- Sort `struct` member categories in the following order:
226-
- `Produces`, `Spawns`, `Builds`
225+
- `Spawns`
226+
- `Builds`
227+
- `Produces`
227228
- `Configurable`
228-
- scalars (`bool`, `int`, `float`, `double`,...)
229-
- vectors (`std::vector`)
230-
- arrays (`LabeledArray`)
231229
- other members (constants, objects)
230+
- `HfHelper`
231+
- `SliceCache`
232+
- `Service`
232233
- `using` declarations
233234
- `Filter`
234235
- `Preslice`
236+
- `PresliceUnsorted`
235237
- `Partition`
236238
- `ConfigurableAxis`
237239
- `AxisSpec`
238240
- `HistogramRegistry`
239241
- output declarations (`OutputObj`,...)
240-
- `init` function
242+
- `void init`
241243
- helper functions
242-
- `process` function(s)
244+
- `void process`
245+
- other `process` functions
243246
- Put one process function argument per line.
244247
- `PROCESS_SWITCH` follows immediately after the function definition.
245248

@@ -280,4 +283,4 @@ Example:
280283
- Update your branch and test it before creating a PR.
281284
- Give your PR a short meaningful title.
282285
- Give further useful details about your changes in the PR description.
283-
- Add links to all related PRs (e.g. O2Physics, O2, AliPhysics, Run3Analysisvalidation) in the PR description.
286+
- Add links to all related PRs (e.g. O2Physics, O2, AliPhysics, Run3AnalysisValidation) in the PR description.

0 commit comments

Comments
 (0)