Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HF: Add hf-tree-creator-lc-to-k0s-p #418

Merged
merged 9 commits into from
Oct 20, 2023

Conversation

DanielSamitz
Copy link
Contributor

Added the hf-tree-creator-lc-to-k0s-p to config_task.sh and dpl-config_run3.json. It was already included in workflows.yml.

@DanielSamitz
Copy link
Contributor Author

In dpl-config_run3.json I set "processMc": "true" and "processData": "false" because that is the default. I noticed that here the other tree creators have both process switches set to "true"? Does this make sense in this context?

@vkucera
Copy link
Collaborator

vkucera commented Sep 1, 2023

Thanks @DanielSamitz . The process data/MC switches are overwritten depending on the data set so that should be fine.
The table names in workflows.yml seem incorrect. Please fix them and test that they are written out when SAVETREES=1.

@vkucera
Copy link
Collaborator

vkucera commented Sep 3, 2023

Also please add DOO2_TREE_LCK0SP in the condition for SUFFIX_SKIM.
Also some JSON modification might be needed to activate the process functions in the skim creator.

@DanielSamitz
Copy link
Contributor Author

Hi @vkucera , a question about the AdjustJSON. I have to switch processCascades to true and processNoCascades to false for the skim creator. What should be the condition for this?
Should it be
[[ $DOO2_CAND_CASC -eq 1 || $DOO2_SEL_LCK0SP -eq 1 || $DOO2_TASK_LCK0SP -eq 1 || $DOO2_TREE_LCK0SP ]] (The same condition as for SUFFIX_SKIM)?

@vkucera
Copy link
Collaborator

vkucera commented Sep 9, 2023

Hi @vkucera , a question about the AdjustJSON. I have to switch processCascades to true and processNoCascades to false for the skim creator. What should be the condition for this? Should it be [[ $DOO2_CAND_CASC -eq 1 || $DOO2_SEL_LCK0SP -eq 1 || $DOO2_TASK_LCK0SP -eq 1 || $DOO2_TREE_LCK0SP ]] (The same condition as for SUFFIX_SKIM)?

Yes, that should be fine. You should test it in any case.

@DanielSamitz
Copy link
Contributor Author

Hi @vkucera , sorry for the long delay. I included the changes in SUFFIX_SKIM and AdjustJson, and changed the names of the tables in workflows.yml. I tested that the tree-creator-lc-to-k0s-p workflow works and the trees are written correctly.

Please note that in AdjustJson I also needed to include a swapping for processData true<-->false, depending on whether INPUT_IS_MC is selected or not. This affects of course also other tree creators, but I think they need this as well. Because that switch was not set properly when changing between MC/Data.

In the dpl-config.json I needed to change some options (useWeightedFinalPCA to false in track-index-skim-creator-cascades and candidate-creator-cascades and tpcRefitBach and tpcRefitV0Daugh to false in track-index-skim-creator-cascades) to make the workflow run without errors or empty histograms. This is now not consistent with the defaults of the configurables in the code, but is what we are currently always using to make it run.

@DanielSamitz
Copy link
Contributor Author

I included now also the changes related to the most recent update for the tree-creator here AliceO2Group/O2Physics#3615

codeHF/config_tasks.sh Outdated Show resolved Hide resolved
codeHF/config_tasks.sh Outdated Show resolved Hide resolved
@vkucera vkucera changed the title HF: added hf-tree-creator-lc-to-k0s-p HF: Add hf-tree-creator-lc-to-k0s-p Oct 18, 2023
Copy link
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.

Thanks @DanielSamitz

@vkucera vkucera merged commit 1b46122 into AliceO2Group:master Oct 20, 2023
3 checks passed
@DanielSamitz DanielSamitz deleted the tree_creator branch October 20, 2023 16:28
vkucera added a commit to vkucera/Run3Analysisvalidation that referenced this pull request Apr 8, 2024
* MegaLinter run on pull_request_target

* Try the merge commit

* Checkout the right merge commit

* Fix MegaLinter issues

* Tmp

* Update config for PR fixes on push

* Test markdown fixes

* Change permissions

* Write all

* Write

* Write all

* Fix permissions and improve PR config

* Report formatter errors

* Exit with error when fixes needed

* Update Megalinter (AliceO2Group#420)

* Update code owners (AliceO2Group#421)

* Add configuration for HF jets (AliceO2Group#422)

* Add first version of HF jet finding and matching

* Fix bugs and improve task logic

* adding jets to Run 3 Validation

adding hf-jets

pre-rebase commit

adding HF-jet comparisons

intermdeiate

Adding Jets to the HF framework

* adding tree output for HF substructure task

* Fix configuration for jets

* Rename jet variables

* Move jets to a separate group

* Simplify jet options

* Fix jet finders

* Fix jet matching

* Fix jet substructure

* Fix jet substructure output

* Organise jet workflows

* Add matching tables

* Only warn for duplicate workflows

* Set process function switches for jet substructure

* Move jet json block

* Add configuration for jet substructure output

* Add jet finder QA

* Fix workflow suffixes

* Move correlation json block

* Fix workflow suffixes

* Restore default settings

* [MegaLinter] Apply linters automatic fixes (#11)

Co-authored-by: vkucera <vkucera@users.noreply.github.com>

---------

Co-authored-by: Jochen Klein <jochen.klein@cern.ch>
Co-authored-by: Nima Zardoshti <nzardosh@alicecerno2.cern.ch>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: vkucera <vkucera@users.noreply.github.com>

* Add KFParticle to D0 creator (AliceO2Group#423)

* HF: Add hf-tree-creator-lc-to-k0s-p (AliceO2Group#418)

* Add tracks-extra-converter, update D0 selector config (AliceO2Group#426)

* New MCs in config_input (AliceO2Group#429)

* Add JE validation (AliceO2Group#424)

* Update skimming configuration (AliceO2Group#432)

* Update configurables and workflow (AliceO2Group#430)

* Update and sync HF and JE configuration (AliceO2Group#433)

* Refactor validation code (AliceO2Group#431)

* Refactor utilities

* Add copyright. Add tuple header. Fix path.

* Add header guards

* Move compare.py

* Factor out plotting part of validation

* Fix plotting factorisation

* Factor out MakePlots into a header file.

* Fix casting

* Break line

* Rename headers

* Fix header guards

* Improve logging

* Improve legends in validation plots

* Fix JE validation plots and factor out code

* Remove link to utils_plot.h

* Improve y-range calculation and plotting, add protections

* Improve AliPhysics task macros

* Add documentation comments in AliPhysics macros

* Adjust validation legend (AliceO2Group#434)

* codeJE: Add event histo and disable sel7 event selection (AliceO2Group#435)

* Add configurables for proton PID in skimming (AliceO2Group#437)

* renamed VtxZ histogram (AliceO2Group#436)

* Removing HFPlot dependency from the hf_ptspectrum macro (AliceO2Group#438)

* codeJE - update workflow (AliceO2Group#440)

* Bump black from 19.10b0 to 24.3.0 in /codeQA/o2qaplots (AliceO2Group#442)

Bumps [black](https://github.com/psf/black) from 19.10b0 to 24.3.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits/24.3.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Improve C++ linting (AliceO2Group#443)

* Remove clang-format badge (AliceO2Group#444)

* [MegaLinter] Apply linters automatic fixes (#10)

Co-authored-by: vkucera <vkucera@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jochen Klein <jochen.klein@cern.ch>
Co-authored-by: Nima Zardoshti <nzardosh@alicecerno2.cern.ch>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: vkucera <vkucera@users.noreply.github.com>
Co-authored-by: Lu, Pengzhong <55934557+lupengzhong@users.noreply.github.com>
Co-authored-by: Daniel Samitz <69901155+DanielSamitz@users.noreply.github.com>
Co-authored-by: Maja Karwowska (Kabus) <8majak8@gmail.com>
Co-authored-by: Archita-Dash <91664849+Archita-Dash@users.noreply.github.com>
Co-authored-by: Maja Karwowska (Kabus) <mkabus@cern.ch>
Co-authored-by: Johanna Lömker <jloemker@yahoo.de>
Co-authored-by: Fabrizio <fabrizio.grosa@cern.ch>
Co-authored-by: ldellost <47105254+DelloStritto@users.noreply.github.com>
Co-authored-by: aimeric-landou <46970521+aimeric-landou@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants