Skip to content

Add event-selection task in runtest#192

Merged
vkucera merged 24 commits intoAliceO2Group:masterfrom
fgrosa:master
Jun 15, 2021
Merged

Add event-selection task in runtest#192
vkucera merged 24 commits intoAliceO2Group:masterfrom
fgrosa:master

Conversation

@fgrosa
Copy link
Copy Markdown
Contributor

@fgrosa fgrosa commented Apr 27, 2021

Automatically enable event selection and timestamp tasks if track-index creator enabled. Necessary for the modifications in this O2 PR AliceO2Group/AliceO2#6016

@vkucera
Copy link
Copy Markdown
Collaborator

vkucera commented May 4, 2021

Please solve conflicts and adapt to the new workflow database.

@fgrosa
Copy link
Copy Markdown
Contributor Author

fgrosa commented May 5, 2021

Please solve conflicts and adapt to the new workflow database.

done in 9b5e0d8

@vkucera
Copy link
Copy Markdown
Collaborator

vkucera commented May 5, 2021

I fixed some details.
Doesn't dpl-config_run5_oniaX.json also need changes?

@vkucera
Copy link
Copy Markdown
Collaborator

vkucera commented May 5, 2021

Also please keep the order of configurables the same in all jsons.

@fgrosa
Copy link
Copy Markdown
Contributor Author

fgrosa commented May 5, 2021

I fixed some details.
Doesn't dpl-config_run5_oniaX.json also need changes?

Thanks! I did not realise that a json was added, I updated it now in 5e9210b. I changed the position of "ptmintrack_2prong": "1.0", to uniform it with the other two json

@fgrosa
Copy link
Copy Markdown
Contributor Author

fgrosa commented May 26, 2021

@vkucera @ginnocen this PR is needed for the changes in AliceO2Group/AliceO2#6016

@vkucera
Copy link
Copy Markdown
Collaborator

vkucera commented May 26, 2021

Hi @fgrosa , I am not sure the "Make explicit the activation of the event selection" commit is the right way to enable this.
I would prefer to keep the make_command_o2.py script quite general and keep the specific options in the database.
Adding workflow-specific switches in the script will eventually lead to a similar mess as was in config_tasks.sh that I tried to clean up by making this script.

@fgrosa
Copy link
Copy Markdown
Contributor Author

fgrosa commented May 26, 2021

Hi @fgrosa , I am not sure the "Make explicit the activation of the event selection" commit is the right way to enable this.
I would prefer to keep the make_command_o2.py script quite general and keep the specific options in the database.
Adding workflow-specific switches in the script will eventually lead to a similar mess as was in config_tasks.sh that I tried to clean up by making this script.

Hi @vkucera the idea behind this implementation was that by enabling DOO2_EVSEL in the config_task.sh one has it also automatically activated in the HFTrackIndexSkim.cxx task and hence should not care about consistency between enabled tasks and arguments in the database, but if you prefer that I add an argument to the json instead there is no problem

@fgrosa fgrosa requested a review from ginnocen as a code owner June 14, 2021 11:52
@fgrosa fgrosa requested a review from vkucera as a code owner June 14, 2021 11:52
@fgrosa
Copy link
Copy Markdown
Contributor Author

fgrosa commented Jun 14, 2021

Hi @vkucera, I found a solution that does not required to modify the make_command_o2.py, could you check if it looks fine for you?

@vkucera
Copy link
Copy Markdown
Collaborator

vkucera commented Jun 14, 2021 •
edited
Loading

Hi @vkucera, I found a solution that does not required to modify the make_command_o2.py, could you check if it looks fine for you?

Thanks @fgrosa . This is indeed what I suggested. However, it doesn't work if o2-analysis-hf-track-index-skims-creator is not the only dependency.
You have to change the dependency fields containing o2-analysis-hf-track-index-skims-creator to be all in the form of a list with one workflow per line:

  dependencies:
    - o2-analysis-hf-track-index-skims-creator

Then it should work for any workflow.

@fgrosa
Copy link
Copy Markdown
Contributor Author

fgrosa commented Jun 14, 2021

Hi @vkucera, I found a solution that does not required to modify the make_command_o2.py, could you check if it looks fine for you?

Thanks @fgrosa . This is indeed what I suggested. However, it doesn't work if o2-analysis-hf-track-index-skims-creator is not the only dependency.
You have to change the dependency fields containing o2-analysis-hf-track-index-skims-creator to be all in the form of a list with one workflow per line:

  dependencies:
    - o2-analysis-hf-track-index-skims-creator

Then it should work for any workflow.

Done! 👍 I also implemented the feature that allows us to run cascades together with other HF workflows as discussed offline, let me know if it is ok for you

vkucera
vkucera requested changes Jun 14, 2021
View reviewed changes
vkucera
vkucera requested changes Jun 14, 2021
View reviewed changes
Copy link
Copy Markdown
Collaborator

@vkucera vkucera left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's almost there. :-)

@vkucera vkucera merged commit 7aa4ff4 into AliceO2Group:master Jun 15, 2021
vkucera added a commit that referenced this pull request Jun 23, 2021
@vkucera @benedikt-voelkel
@fgrosa @fcatalan92
Sync with master (#268)
a8baacd 
* Adjust plot sizes (#233)

Co-authored-by: Benedikt Volkel <benedikt.volkel@cern.ch>

* Update README (#234)

Co-authored-by: Benedikt Volkel <benedikt.volkel@cern.ch>

* Fix QA simple workflow (#236)

* Add new features in make_command_o2 (#242)

* Support real-data-only options/tables and workflow aliases

* Print one workflow per line in script_o2

* Add tables of selectors

* Detect duplicate workflows

* Add Λc → K0S p (#243)

* Add Lc -> K0S p workflows.

* Add LcK0sp tables

* Add Λc → K0S p, part 2 (#244)

* Fix typo (#246)

* Add code owners (#252)

* Add event-selection task in runtest (#192)

* Add event-selection tasks and adapt json files

* Add entry for histo of event selection

* fix conflicts

* Update config_tasks.sh

* Fix defaults

* Fix comments

* Update onia json

* Use camel case

* Update name of directory in O2 AnalysisResults

* Remove unused entry

* Fix conflict

* Revert removal of entry

* Make explicit the activation of the event selection

* Trim trailing whitespace

* fix workflow names

* fix names

* Add event seletion to workflows

* Fix directory name

* Remove wrong file

* Modify list of dependencies in case of hf-track-index-skims-creator

* Add possibility to run together 2/3-prongs and cascades

* Implement Vit's suggestions

* Implement Vit's suggestions (part 2)

* Remove unneeded workflows

Co-authored-by: Vít Kučera <vit.kucera@cern.ch>

* Fix workflow database

* Polish config_tasks.sh

* Fix O2 command format and workflow duplication detection

* Make "activate" key in workflow database optional

* Make O2 exit with 1 for any error

* Run postprocessing in ROOT environment

* Fix postprocessing environment detection

* Plot prompt/non-prompt efficiency

* Add efficiency validation plots (#260)

* Add efficiency validation plots

* Adjust labels

* Small updates for D+ analysis (#258)

* Small update of Dplus comparison files

* Update config file

* Remove trailing whitespaces

* Propagate changes to other .json files

Co-authored-by: Vít Kučera <vit.kucera@cern.ch>

* Add efficiency validation options

* Fix analysis README

* Fix Python

* Remove table of content from README (generated automatically)

* Update linter instructions

* Add instructions for analysis code contributors

* Update documentation

* Simplify batch scripts

* Catch more O2 errors

* Update reference plots

* Update clean.sh

* Propagate MC switch in the AliPhysics task (#264)

* Rename Style class (#266)

Co-authored-by: Benedikt Volkel <benedikt.volkel@cern.ch>

* Fix workflow configuration

* Catch more O2 errors (#267)

Co-authored-by: benedikt-voelkel <benedikt.voelkel@gmx.de>
Co-authored-by: Benedikt Volkel <benedikt.volkel@cern.ch>
Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>
Co-authored-by: Fabio Catalano <fabio.catalano@cern.ch>
vkucera added a commit that referenced this pull request Aug 16, 2021
@vkucera @rspijkers
@DelloStritto @ginnocen @benedikt-voelkel @fgrosa @fcatalan92
Merge Run5 (#272)
f625ae6 
* add X cand creator

* Add first version of X selector

add TOF pid for X selector to json files

add pT dependent selection cuts to json files

* propagate X options to all json files

* remove unused variables from json for LcpKpi (#227)

Co-authored-by: Luigi <ldellost@aliceml.cern.ch>

* Fix formatting

* Fix empty spaces

* add X(3872) to yaml database (#231)

path to results still needed

also fixed a typo in the Xi_cc histo list

* Fix workflow for X

* Update onia file

* lower pt min of electrons

* Commit new cuts and improved plotting

* Fix pylint

* new datasets

* [Mega-Linter] Apply linters fixes

* Add input slot for MuonID sample

* Add ALICE 2/3 switch in Jpsi selector (#239)

* Fix path to Onia MID production

* Add ALICE 2/3 switch in Jpsi selector

* Remove ee from Jpsi selector strings

* Update path onia

* Add settings for muon analysis (#245)

Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>

* Fix eta and update input files (#247)

Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>

* Add plotting macro for contamination (#248)

Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>

* Add macro for contamination study (#249)

* [Mega-Linter] Apply linters fixes

* Run5 dev (#250)

* Add qa-rejection (#251)

* Add is_e_not_pi_plots (#253)

* Use a single variable for input file path (#254)

* Use full production for case 8 (#255)

* use working input

* Sync with master (#268)

* Adjust plot sizes (#233)

Co-authored-by: Benedikt Volkel <benedikt.volkel@cern.ch>

* Update README (#234)

Co-authored-by: Benedikt Volkel <benedikt.volkel@cern.ch>

* Fix QA simple workflow (#236)

* Add new features in make_command_o2 (#242)

* Support real-data-only options/tables and workflow aliases

* Print one workflow per line in script_o2

* Add tables of selectors

* Detect duplicate workflows

* Add Λc → K0S p (#243)

* Add Lc -> K0S p workflows.

* Add LcK0sp tables

* Add Λc → K0S p, part 2 (#244)

* Fix typo (#246)

* Add code owners (#252)

* Add event-selection task in runtest (#192)

* Add event-selection tasks and adapt json files

* Add entry for histo of event selection

* fix conflicts

* Update config_tasks.sh

* Fix defaults

* Fix comments

* Update onia json

* Use camel case

* Update name of directory in O2 AnalysisResults

* Remove unused entry

* Fix conflict

* Revert removal of entry

* Make explicit the activation of the event selection

* Trim trailing whitespace

* fix workflow names

* fix names

* Add event seletion to workflows

* Fix directory name

* Remove wrong file

* Modify list of dependencies in case of hf-track-index-skims-creator

* Add possibility to run together 2/3-prongs and cascades

* Implement Vit's suggestions

* Implement Vit's suggestions (part 2)

* Remove unneeded workflows

Co-authored-by: Vít Kučera <vit.kucera@cern.ch>

* Fix workflow database

* Polish config_tasks.sh

* Fix O2 command format and workflow duplication detection

* Make "activate" key in workflow database optional

* Make O2 exit with 1 for any error

* Run postprocessing in ROOT environment

* Fix postprocessing environment detection

* Plot prompt/non-prompt efficiency

* Add efficiency validation plots (#260)

* Add efficiency validation plots

* Adjust labels

* Small updates for D+ analysis (#258)

* Small update of Dplus comparison files

* Update config file

* Remove trailing whitespaces

* Propagate changes to other .json files

Co-authored-by: Vít Kučera <vit.kucera@cern.ch>

* Add efficiency validation options

* Fix analysis README

* Fix Python

* Remove table of content from README (generated automatically)

* Update linter instructions

* Add instructions for analysis code contributors

* Update documentation

* Simplify batch scripts

* Catch more O2 errors

* Update reference plots

* Update clean.sh

* Propagate MC switch in the AliPhysics task (#264)

* Rename Style class (#266)

Co-authored-by: Benedikt Volkel <benedikt.volkel@cern.ch>

* Fix workflow configuration

* Catch more O2 errors (#267)

Co-authored-by: benedikt-voelkel <benedikt.voelkel@gmx.de>
Co-authored-by: Benedikt Volkel <benedikt.volkel@cern.ch>
Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>
Co-authored-by: Fabio Catalano <fabio.catalano@cern.ch>

* Add ALICE3 switch (#269)

* Fixes

* Add Jpsi -> mumu preselection cuts in JSON

* Fix missing columns in JSON

Co-authored-by: rspijkers <rik.spijkers@gmail.com>
Co-authored-by: DelloStritto <47105254+DelloStritto@users.noreply.github.com>
Co-authored-by: Luigi <ldellost@aliceml.cern.ch>
Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>
Co-authored-by: Rik Spijkers <78484875+rspijkers@users.noreply.github.com>
Co-authored-by: ginnocen <ginnocen@users.noreply.github.com>
Co-authored-by: Gian Michele Innocenti <gminnocen@gmail.com>
Co-authored-by: benedikt-voelkel <benedikt.voelkel@gmx.de>
Co-authored-by: Benedikt Volkel <benedikt.volkel@cern.ch>
Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>
Co-authored-by: Fabio Catalano <fabio.catalano@cern.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vkucera vkucera vkucera approved these changes

@ginnocen ginnocen Awaiting requested review from ginnocen

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@fgrosa @vkucera