Skip to content

Commit ee3f949

Browse files
committed
address PR comments
1 parent acbbefd commit ee3f949

File tree

5 files changed

+28
-90
lines changed

5 files changed

+28
-90
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ For a general overview of our (O2) software, organization and processes, please
4141
* [Naming convention](doc/ModulesDevelopment.md#naming-convention)
4242
* [Committing code](doc/ModulesDevelopment.md#committing-code)
4343
* [Data sources](doc/ModulesDevelopment.md#data-sources)
44-
* [Readout](doc/ModulesDevelopment.md#readout)
45-
* [DPL workflow](doc/ModulesDevelopment.md#dpl-workflow)
4644
* [Run number and other run attributes (period, pass type, provenance)](doc/ModulesDevelopment.md#run-number-and-other-run-attributes-period-pass-type-provenance)
4745
* [A more advanced example](doc/ModulesDevelopment.md#a-more-advanced-example)
4846
* [Framework](doc/Framework.md)
@@ -99,7 +97,6 @@ For a general overview of our (O2) software, organization and processes, please
9997
* [Get all the task output to the infologger](doc/FLPsuite.md#get-all-the-task-output-to-the-infologger)
10098
* [Using a different config file with the general QC](doc/FLPsuite.md#using-a-different-config-file-with-the-general-qc)
10199
* [Enable the repo cleaner](doc/FLPsuite.md#enable-the-repo-cleaner)
102-
* [Definition of new arguments](doc/FLPsuite.md#definition-of-new-arguments)
103100
* [Reference data](doc/FLPsuite.md#reference-data)
104101
* [Miscellaneous](doc/Miscellaneous.md)
105102
* [Asynchronous Data and Monte Carlo QC operations](doc/Miscellaneous.md#asynchronous-data-and-monte-carlo-qc-operations)

doc/DevelopersTips.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,3 +562,27 @@ Just run aliBuild with following parameters from the folder with prepared alidis
562562
```
563563
aliBuild build QualityControl --defaults o2 --docker --architecture slc8_x86-64
564564
```
565+
566+
## Instructions to move an object in the QCDB
567+
568+
The script `o2-qc-repo-move-objects` lets the user move an object, and thus all the versions attached to it. E.g.:
569+
570+
```
571+
python3 o2-qc-repo-move-objects --url http://ccdb-test.cern.ch:8080 --path qc/TST/MO/Bob --new-path qc/TST/MO/Bob2 --log-level 10
572+
```
573+
574+
## Definition of new arguments
575+
576+
One can also tell the DPL driver to accept new arguments. This is done using the `customize` method at the top of your workflow definition (usually called "runXXX" in the QC).
577+
578+
For example, to add two parameters of different types do :
579+
580+
```
581+
void customize(std::vector<ConfigParamSpec>& workflowOptions)
582+
{
583+
workflowOptions.push_back(
584+
ConfigParamSpec{ "config-path", VariantType::String, "", { "Path to the config file. Overwrite the default paths. Do not use with no-data-sampling." } });
585+
workflowOptions.push_back(
586+
ConfigParamSpec{ "no-data-sampling", VariantType::Bool, false, { "Skips data sampling, connects directly the task to the producer." } });
587+
}
588+
```

doc/FLPsuite.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ FLP Suite
1010
* [Get all the task output to the infologger](#get-all-the-task-output-to-the-infologger)
1111
* [Using a different config file with the general QC](#using-a-different-config-file-with-the-general-qc)
1212
* [Enable the repo cleaner](#enable-the-repo-cleaner)
13-
* [Definition of new arguments](#definition-of-new-arguments)
1413
* [Reference data](#reference-data)
1514
<!--te-->
1615

@@ -114,22 +113,6 @@ By defaults there is a _disabled_ cron job :
114113
3. update the cron job to use the modified config file
115114
4. uncomment the cron job
116115

117-
## Definition of new arguments
118-
119-
One can also tell the DPL driver to accept new arguments. This is done using the `customize` method at the top of your workflow definition (usually called "runXXX" in the QC).
120-
121-
For example, to add two parameters of different types do :
122-
123-
```
124-
void customize(std::vector<ConfigParamSpec>& workflowOptions)
125-
{
126-
workflowOptions.push_back(
127-
ConfigParamSpec{ "config-path", VariantType::String, "", { "Path to the config file. Overwrite the default paths. Do not use with no-data-sampling." } });
128-
workflowOptions.push_back(
129-
ConfigParamSpec{ "no-data-sampling", VariantType::Bool, false, { "Skips data sampling, connects directly the task to the producer." } });
130-
}
131-
```
132-
133116
## Reference data
134117

135118
A reference object is an object from a previous run. It is usually used as a point of comparison.

doc/ModulesDevelopment.md

Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
* [Naming convention](#naming-convention)
2626
* [Committing code](#committing-code)
2727
* [Data sources](#data-sources)
28-
* [Readout](#readout)
29-
* [DPL workflow](#dpl-workflow)
3028
* [Run number and other run attributes (period, pass type, provenance)](#run-number-and-other-run-attributes-period-pass-type-provenance)
3129
* [A more advanced example](#a-more-advanced-example)
3230
<!--te-->
@@ -450,65 +448,7 @@ General ALICE Git guidelines can be accessed [here](https://alisw.github.io/git-
450448
451449
## Data sources
452450
453-
In the final system, the qc gets real data from the DPL devices or the readout processes. During development a number of possibilities are available for the detector teams to develop their QC. We list them below.
454-
455-
### Readout
456-
457-
When connecting the QC directly to the readout using the `o2-qc-run-readout` proxy, remember to add this consumer to the config file of the readout and to enable it:
458-
```json
459-
[consumer-fmq-qc]
460-
consumerType=FairMQChannel
461-
enableRawFormat=1
462-
fmq-name=readout-qc
463-
fmq-address=ipc:///tmp/readout-pipe-1
464-
fmq-type=pub
465-
fmq-transport=zeromq
466-
unmanagedMemorySize=2G
467-
memoryPoolNumberOfPages=500
468-
memoryPoolPageSize=1M
469-
enabled=1
470-
```
471-
472-
__Random data__
473-
474-
Add one or several dummy equipments:
475-
```
476-
[equipment-dummy-1]
477-
name=dummy-1
478-
equipmentType=dummy
479-
enabled=1
480-
eventMaxSize=200
481-
eventMinSize=100
482-
memoryPoolNumberOfPages=100
483-
memoryPoolPageSize=128k
484-
fillData=1
485-
```
486-
487-
__Live detector data__
488-
489-
If a part or the whole detector is ready and connected to 1 or several CRUs in the FLP, configure the readout to get data from there. The exact configuration items should be discussed with the readout experts.
490-
491-
This is the most realistic test one can do but it is also not very practical as you have to control the data taking and be on the machine equipped with a CRU. See the next section to alleviate this situation.
492-
493-
__Detector data file__
494-
495-
To record a data file with readout while getting data from a CRU, add the following piece to the readout configuration file:
496-
```
497-
[consumer-rec]
498-
enabled=1
499-
consumerType=fileRecorder
500-
fileName=/tmp/dataRecorder_flp1.raw
501-
```
502-
503-
To read it back with readout, for instance on another machine, add:
504-
```
505-
[equipment-player-1]
506-
equipmentType=player
507-
memoryPoolPageSize=1M
508-
memoryPoolNumberOfPages=1000
509-
filePath=/path/to/dataRecorder_flp1.raw
510-
autoChunk=1
511-
```
451+
In the final system, the qc gets real data from the DPL devices or the readout processes. During development a number of possibilities are available for the detector teams to develop their QC. We list them below.
512452
513453
### DPL workflow
514454

doc/QCDB.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@ The detector name and the taskname are set in the config file :
3333

3434
```json
3535
"tasks": {
36-
"QcTask": { <---------- task name
36+
"QcTask": { <---------- task ID
3737
"active": "true",
38+
"taskName": "QcTask", <--------- task name
3839
"className": "o2::quality_control_modules::skeleton::SkeletonTask",
3940
"moduleName": "QcSkeleton",
4041
"detectorName": "TST", <---------- detector name
4142
```
4243

44+
If the task name is not specified then we use the task ID.
4345
The quality is stored as a CCDB metadata of the object.
4446

4547
## Custom metadata for QC objects in the QCDB
@@ -61,14 +63,6 @@ It is also possible to add or update metadata of a MonitorObject directly:
6163
mo->addOrUpdateMetadata(key, value);
6264
```
6365

64-
## Instructions to move an object in the QCDB
65-
66-
The script `o2-qc-repo-move-objects` lets the user move an object, and thus all the versions attached to it. E.g.:
67-
68-
```
69-
python3 o2-qc-repo-move-objects --url http://ccdb-test.cern.ch:8080 --path qc/TST/MO/Bob --new-path qc/TST/MO/Bob2 --log-level 10
70-
```
71-
7266
## Accessing objects in CCDB
7367

7468
The recommended way (excluding postprocessing) to access the run conditions in the _CCDB_ is to use a `Lifetime::Condition` DPL input, which can be requested as in the query below:

0 commit comments

Comments
 (0)