Skip to content

Solve Conflict#1

Merged
wang-yuanzhe merged 48 commits into
wang-yuanzhe:masterfrom
AliceO2Group:master
Jul 22, 2022
Merged

Solve Conflict#1
wang-yuanzhe merged 48 commits into
wang-yuanzhe:masterfrom
AliceO2Group:master

Conversation

@wang-yuanzhe

Copy link
Copy Markdown
Owner

No description provided.

pbuehler and others added 30 commits July 9, 2022 09:30
* Some reworks

* clang-format
* DPG: First version of ITS-TPC matching efficiency code
* Fix y cut. Add antiproton histograms.

* Fix format issues.
* mask and layer histos; DCAZ cut
…945)

The default with MCSignal is that the prongs are checked starting from the current particle then going back in time to mother, grand-mother, ... 
With this PR, it is also possible now to check forward in time, so from the current particle one can check daughters, grand-daughters, etc.
…mpt/nonprompt charm hadrons (#966)

* Add function to check origin of charm hadrons

* Use check origin method to tag prompt/nonprompt charm hadrons

* Change name of method and move enum from HFSecondaryVertex to RecoDecay

* Pass bool by value

* Move enum inside RecoDecay class

* Fix comment and remove unnecessary include

* Resotre include in HFSecondaryVertex.h
Co-authored-by: Mattia Faggin <mfaggin@cern.ch>
* skeleton for O2 analysis with multiparticle correlations

* Please consider the following formatting changes

* added copyright notice

* removed 2 trailing spaces, for formatting check to go through

* change of subdirectory structure

Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
* changed the pt axis to be a configurable axis
* bug corrected and new way to access the collisions
* Dielectron efficiency task

* Clear up

* Fixes

* Further Fixe
* DPG: add qa of tracks not matched to collisions.

* Fix comment.

Co-authored-by: Mattia Faggin <mfaggin@cern.ch>
)

Co-authored-by: lserksny <laura.serksnyte@cern.ch>
Co-authored-by: Mattia Faggin <mfaggin@cern.ch>
* Fix Ds selection in femto trigger
* Fix multicharm 3-prong selection
mario-krueger and others added 18 commits July 19, 2022 11:45
…dd collision Z selection (#1013)

* lambdakzerofinder - add process switch for run2 vs run3
  * V0 analysis - add process_switch checks in init()
* lambdakzeroanalysisMC - fix feeddown, add col Z cut

Co-authored-by: alandou <aimeric.landou@cern.ch>
Co-authored-by: lserksny <laura.serksnyte@cern.ch>
* PWGDQ/Tasks/v0selector: add process switch

* PWGDQ/Tasks: update v0selector to get magnetic field from CCDB
Co-authored-by: Mattia Faggin <mfaggin@cern.ch>
* Z vtx cut as a configurable
* changed the boundaries of Zvtx Axis
* Some more cuts, signal definition and number of ITS clusters for skimmed data for Run 3

* Fix
…tion in UD (#1021)

* [WIP] UD skimming developments

* [WIP] Add UD tables for skimming

* [WIP] UD skimming developments: do not dereference table pointers

* [WIP] UD skimming developments: rework MC information processing in skimmer, rework dimuon analysis

* [WIP] UD skimming developments: clang format

* [WIP] UD skimming developments: add skimming of barrel tracks and semiforward candidates

* [WIP] UD skimming developments: minor improvements of tables and analysis

* [WIP] UD skimming developments: add more code comments

* [WIP] UD skimming developments: switch to index columns for candidate IDs and add global BCs to tracks

* [WIP] UD skimming developments: rename tables, switch to propagated tracks

* [WIP] UD skimming developments: merge DGCandidates with UDTables and adapt DG tasks

* [WIP] UD skimming developments: rename skimmer and creator tasks

* UD skimming developments: fix typos, clang format

* UD skimming developments: fix typos, naming, rework UPC candidate analyzer
* PWGHF: Add more checks on collision association probability
Co-authored-by: Vít Kučera <vit.kucera@cern.ch>
* Fix y cut. Add antiproton histograms.
* Eta histos wider limits (now -2,2)

* Eta histos wider limits (now -2,2) and smaller pt bins up to 0.5 Gev/c

* Got read of unused configurables
Sold to "Ox Security", so repo ownership has changed.
@wang-yuanzhe wang-yuanzhe reopened this Jul 22, 2022
@wang-yuanzhe wang-yuanzhe merged commit 196d0e9 into wang-yuanzhe:master Jul 22, 2022
wang-yuanzhe pushed a commit that referenced this pull request Sep 2, 2022
* Fix axis setters

* Refactor code

* Add viridis as default colormap palette

* Minor fixes

* MegaLinter fixes (#1)

Co-authored-by: ALICE Builder <alibuild@users.noreply.github.com>
wang-yuanzhe pushed a commit that referenced this pull request Nov 7, 2023
…#3568)

* support for CCDB, official LOGS, and few minor thingies

* fix for formatter, #1

* fix for formatter, #2

* fix for formatter, #3

* fix for formatter, #4

* fix for MegaLinter, #1

* fix for MegaLinter, #2

* the final fix for formatting

* implemented Victors comments
wang-yuanzhe pushed a commit that referenced this pull request Nov 7, 2023
)

* Implement efficiency computation macro for D2H

* Add new line at the end of config file

* Fix bug in TH2 projection, add safety for asymmetric error setting when converting TEfficiency to TH1, and add pt binning option

* Add missing loop on all pt bins after rebinning

* Remove scaling after rebinning (not nedded), re-organise helper methods, try solving MegaLinter errors

* Add safety for canvas file extension and try to solve mypy errors

* New attempt to solve mypy errors

* Try to fix type of save_canvas() last argument + import-error on modules

* Add copyright + attempt to solve mypy error

* Attempt to solve pyright error #1

* Second attempt to solve pyright error

* Apply linters automatic fixes

* Apply Vit's comments

* Remove empty line between ROOT and style_formatter imports

* Fix typo found by Fabio

---------

Co-authored-by: Alexandre Bigot <abigot@sbgat402.in2p3.fr>
wang-yuanzhe pushed a commit that referenced this pull request Nov 7, 2023
AliceO2Group#3658)

* preliminary support for Monte Carlo analysis + support for PROCESS_SWITCH + switch to templates in few function to trim down code bloat

* fix for formatter #1

* implementing Victor comments

* fix for formatter #2
wang-yuanzhe pushed a commit that referenced this pull request Nov 7, 2023
* templating the rest

* reply to Victor comments

* fix for formatter #1

* removed commented code
wang-yuanzhe pushed a commit that referenced this pull request Feb 16, 2024
AliceO2Group#4691)

* support for analysis over converted Run 1 and Run 2 data + support for differential q-vectors

* MegaLinter #1

* MegaLinter 2

* MegaLinter 3

* MegaLinter ´4
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.