Sovle Conflicts#2
Merged
Merged
Conversation
* Dplus-Hadron Table added * fixed * fixed * Correlator Task * Correlation task for Dplus-Hadron * Dplus-hadron correlator added * Dplus-hadron correlation task * Fixed for compilation: Phi->phi * Fixed for compilation Y()--> y()
* remove obsolete configurables * remove obsolete fill statements
…ouble precision in input (#1068) * Automatically deal with models that need float and double precision in input
* Update version of Resonance Package
. use and fill UDTablesto work with UDTables . introduced process function processMc in DGCandProducer.cxx
Co-authored-by: lserksny <laura.serksnyte@cern.ch>
* Fix missing TOF plots * Align TOF and TPC QA
…. Add comments. Fix authors alphabetical order. (#1083) * Fix y cut. Add antiproton histograms. * Fix format issues. * Small histogram fixes * Fix format issue * Fix building problem * Fix format (again) * Add antiparticle histograms in nuclei analysis * Nuclei task - Extend NSigma range for double Gauss fit. Add comments. Fix formatting.
* Adding pT candidate in the tables Co-authored-by: Alexandre Bigot <abigot@sbgat402.in2p3.fr>
* fix TPC PID response handler tool * fix duplicate command switch
…een cell and cluster (#1079) * [EMCAL-734] adapted cluster definition * [EMCAL-689] added EMC cluster track matching and link of clusters to cells * [EMCAL-689] fixed trailing whitespace * [EMCAL-689] fixed tcomiler warnings
* fix GRP checks, capture all ccdb exceptions correctly (no forcing fatal, please)
* add process functions for dilepton flow analyses * small changes * add event mixing process, fix histo title, process_switch * fix enable option process * change the place of R computation and fill histos * fixes and suggestions from Ionut * remove column not needed
* Add CF tutorial * MegaLinter fixes * Try to fix whitespace * Remove trailing whitespace from README Co-authored-by: Luca Barioglio <luca.barioglio@cern.ch> Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
Instead of just printing "PR not clean", give the user a link so they can more easily find the PR with fixes.
These security warnings are overly broad and don't really apply to scripts designed to run locally anyway.
wang-yuanzhe
pushed a commit
that referenced
this pull request
Sep 2, 2022
* Updating configuration file * Fix clang format * Removing unnecessary dependencies * Removing unnecessary dependencies * MegaLinter fixes (#2) Co-authored-by: Lucamicheletti93 <luca.mike93@gmail.com> Co-authored-by: ALICE Builder <alibuild@users.noreply.github.com>
wang-yuanzhe
pushed a commit
that referenced
this pull request
Apr 19, 2023
* PWG-LF: fix nSigma selection in nuclei task * Fixing MegaLinter errors * Fixing MegaLinter errors #2
wang-yuanzhe
pushed a commit
that referenced
this pull request
May 4, 2023
) * fixed error filling secd histos and added pt configurable for ITS tracks * fixed error filling secd histos and added pt configurable for ITS tracks * fixed formatting * fix formatting #2 * Please consider the following formatting changes * Update qaMatchEff.cxx * format fix #3 * format fix #4 :( * no tabs, copyright ok. * fixed formatting, no tabs, copyright ok * holders in new line in copyright * added bidim for pt check, checked formatting * re-checked formatting * re-re-re-run clang-format formatting --------- Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
wang-yuanzhe
pushed a commit
that referenced
this pull request
Jul 21, 2023
…analysis task (AliceO2Group#3137) * Squashed commit of the following: commit 933a08181af352ff1424bcba9cd51f844000bcd4 Author: Ionut-Cristian Arsene <iarsene@cern.ch> Date: Thu Jun 29 11:45:44 2023 +0200 clang fixes commit e8a93bf04cd9f974f57d9eb47ff365664c02e64d Author: Ionut-Cristian Arsene <iarsene@cern.ch> Date: Thu Jun 29 11:41:35 2023 +0200 Fix of the variadic template in MCSignal, implementing fixes in all tasks using MCSignal::CheckSignal() commit f36e641 Merge: 3eed175 87e1d52 Author: Ionut Cristian Arsene <Ionut.Cristian.Arsene@cern.ch> Date: Mon Jun 26 12:33:30 2023 +0200 Merge pull request #2 from aalkin/mc-signal-test fix iterator handling for decay chain traversal commit 87e1d52 Author: Anton Alkin <anton.alkin@cern.ch> Date: Mon Jun 26 11:26:52 2023 +0200 format commit 08f44c2 Author: Anton Alkin <anton.alkin@cern.ch> Date: Mon Jun 26 11:25:04 2023 +0200 fix iterator handling for decay chain traversal commit 3eed175 Author: Ionut-Cristian Arsene <iarsene@cern.ch> Date: Sun Jun 25 13:32:42 2023 +0200 Remove the stack from MCSignal::CheckSignal * fix check sources parameter * Adding mixed event for the dilepton-hadron task * Add process function for event mixing in the Dilepton-hadron analysis task * fix merging issues * fix clang --------- Co-authored-by: Ionut-Cristian Arsene <iarsene@cern.ch>
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.