Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
177edba
[PWGCF] Remove unused file (#16099)
vkucera May 7, 2026
fea2671
[PWGCF] add RCT flags and pt-depended DCAz (#16080)
vojmach May 7, 2026
50205a1
[PWGEM] Fix includes (#16090)
vkucera May 7, 2026
6b2f79c
[PWGCF] Fix MC processing, remove tmp histograms from registry (#16106)
EmilGorm May 7, 2026
81f08b3
[PWGCF] FemtoUniverse V0 Task -- fixed an incorrect comment (#16127)
Eloviyo May 7, 2026
1465de1
[PWGHF] Fix a bug for kaon pid in charm femto track task (#16147)
zhangbiao-phy May 7, 2026
4bd56ba
[PWGHF] Decouple SP and EsE process functions (#16143)
Marcellocosti May 7, 2026
c435a9e
[PWGJE] occupancy qa changes (#16141)
joachimckh May 7, 2026
293ff20
[ALICE3] Fix includes (#16086)
vkucera May 7, 2026
7e07d1f
[PWGEM/Dilepton] update taggingHFE for LS eh pairs (#16154)
dsekihat May 7, 2026
6835d13
[Common] Decouple EsE and EP Q vector correction (#16148)
stefanopolitano May 7, 2026
502ba1b
[PWGEM/Dilepton] update taggingHFE to include D* (#16155)
dsekihat May 7, 2026
4180003
[PWGEM/Dilepton] update skimmerPrimaryEelctronQC.cxx for flexible cut…
dsekihat May 7, 2026
dedd2fd
[PWGEM/Dilepton] fix after #16155 (#16156)
dsekihat May 7, 2026
ac21189
[PWGLF] Added particles K0s, K*+- and Xi1530 for simulations (#16153)
sawankumawat May 8, 2026
ef51a58
[Infrastructure] Add staging build option to clean-test workflow (#16…
ktf May 8, 2026
1724310
[PWGHF] Fix EsE resolution computation (#16159)
Marcellocosti May 8, 2026
a82310a
[PWGJE] fix mistake name of histogram (#16162)
hanseopark May 8, 2026
f523055
[PWGLF] Fix in hStrangeCorrelation.cxx (#16163)
lhusova May 8, 2026
10800d6
[Infrastructure,Scripts] Add FDD in the header patterns (#16150)
vkucera May 8, 2026
a83abd3
[PWGEM/Dilepton] use proper timestamp (#16165)
dsekihat May 8, 2026
be9bf56
[PWGHF] Separate UPC Lc analysis into a dedicated task file (#15786)
Rrantu May 8, 2026
f9be714
[PWGEM/Dilepton] update taggingHFE for proton (#16167)
dsekihat May 8, 2026
fa1a116
[PWGDQ] small fixes for dalitz selection (#16169)
glegras May 8, 2026
fdc4a23
[PWGCF] Check secondaries vs. pt in MCReco and add possibility for 3D…
cnkoster May 8, 2026
741179f
[PWGCF] removed obsolete variables and adjusted binning for 3d zdc an…
hernasab May 8, 2026
f56d7de
[PWGCF] Added RCTevent selection, and track counter configurable (#16…
Thorkj May 8, 2026
8dabadf
[PWGJE,PWGEM-36] Add new Clusterizer options (#16170)
mhemmer-cern May 8, 2026
83563df
Test
vkucera May 8, 2026
c185ca8
test
vkucera May 8, 2026
16eb7a7
test
vkucera May 8, 2026
4a8aa37
test
vkucera May 8, 2026
6b1abd3
test
vkucera May 8, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ IncludeCategories:
Priority: 3
CaseSensitive: true
# O2
- Regex: ^(<|")(Algorithm|CCDB|Common[A-Z]|DataFormats|DCAFitter|Detectors|EMCAL|Field|Framework|FT0|FV0|GlobalTracking|GPU|ITS|MathUtils|MFT|MCH|MID|PHOS|PID|ReconstructionDataFormats|SimulationDataFormat|TOF|TPC|ZDC).*/.*\.h
- Regex: ^(<|")(Algorithm|CCDB|Common[A-Z]|DataFormats|DCAFitter|Detectors|EMCAL|FDD|Field|Framework|FT0|FV0|GlobalTracking|GPU|ITS|MathUtils|MCH|MFT|MID|PHOS|PID|ReconstructionDataFormats|SimulationDataFormat|TOF|TPC|ZDC).*/.*\.h
Priority: 4
CaseSensitive: true
# ROOT
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/clean-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ name: Clean PR checks
type: boolean
default: true

'check_build/O2Physics/staging':
description: build/O2Physics/staging
type: boolean
default: true

permissions: {}

jobs:
Expand Down
1 change: 0 additions & 1 deletion ALICE3/Core/Decayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@

#include <TDecayChannel.h> // IWYU pragma: keep
#include <TGenPhaseSpace.h>
#include <TLorentzVector.h>

Check failure on line 30 in ALICE3/Core/Decayer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
#include <TRandom3.h>

#include <array>
#include <cmath>
#include <cstddef>
#include <vector>
Expand Down Expand Up @@ -115,7 +114,7 @@
return {};
}

TLorentzVector tlv(px, py, particle.pz(), e);

Check failure on line 117 in ALICE3/Core/Decayer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
TGenPhaseSpace decay;
decay.SetDecay(tlv, dauMasses.size(), dauMasses.data());
decay.Generate();
Expand All @@ -123,7 +122,7 @@
std::vector<o2::upgrade::OTFParticle> decayProducts;
for (size_t i = 0; i < dauMasses.size(); ++i) {
o2::upgrade::OTFParticle particle;
TLorentzVector dau = *decay.GetDecay(i);

Check failure on line 125 in ALICE3/Core/Decayer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
particle.setPDG(pdgCodesDaughters[i]);
particle.setVxVyVz(vx, vy, vz);
particle.setPxPyPzE(dau.Px(), dau.Py(), dau.Pz(), dau.E());
Expand Down
1 change: 1 addition & 0 deletions ALICE3/Core/TrackUtilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@

#include <ReconstructionDataFormats/Track.h>

#include <TLorentzVector.h>

Check failure on line 23 in ALICE3/Core/TrackUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.

#include <cmath>
#include <vector>

namespace o2::upgrade
Expand Down Expand Up @@ -88,8 +89,8 @@
/// \param particle the particle to convert (TLorentzVector)
/// \param productionVertex where the particle was produced
/// \param o2track the address of the resulting TrackParCov
void convertTLorentzVectorToO2Track(const int charge,

Check failure on line 92 in ALICE3/Core/TrackUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
const TLorentzVector particle,

Check failure on line 93 in ALICE3/Core/TrackUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
const std::vector<double> productionVertex,
o2::track::TrackParCov& o2track);

Expand All @@ -100,8 +101,8 @@
/// \param o2track the address of the resulting TrackParCov
/// \param pdg the pdg service
template <typename PdgService>
void convertTLorentzVectorToO2Track(int pdgCode,

Check failure on line 104 in ALICE3/Core/TrackUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
TLorentzVector particle,

Check failure on line 105 in ALICE3/Core/TrackUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
std::vector<double> productionVertex,
o2::track::TrackParCov& o2track,
const PdgService& pdg)
Expand All @@ -111,7 +112,7 @@
if (pdgInfo != nullptr) {
charge = pdgInfo->Charge() / 3;
}
convertTLorentzVectorToO2Track(charge, particle, productionVertex, o2track);

Check failure on line 115 in ALICE3/Core/TrackUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
}

/// Function to convert a OTFParticle into a perfect Track
Expand All @@ -123,7 +124,7 @@
o2::track::TrackParCov& o2track,
const PdgService& pdg)
{
static TLorentzVector tlv;

Check failure on line 127 in ALICE3/Core/TrackUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
tlv.SetPxPyPzE(particle.px(), particle.py(), particle.pz(), particle.e());
convertTLorentzVectorToO2Track(particle.pdgCode(), tlv, {particle.vx(), particle.vy(), particle.vz()}, o2track, pdg);
}
Expand Down
1 change: 0 additions & 1 deletion ALICE3/TableProducer/OTF/onTheFlyDecayer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/OutputObjHeader.h>
#include <Framework/runDataProcessing.h>
#include <ReconstructionDataFormats/Track.h>

#include <TH1.h>
#include <TPDGCode.h>
Expand Down
1 change: 0 additions & 1 deletion ALICE3/Tasks/alice3TrackingPerformance.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include <map>
#include <memory>
#include <string>
#include <utility>
#include <vector>

using namespace o2;
Expand Down
2 changes: 1 addition & 1 deletion Common/Core/PID/ParamBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

namespace o2::pid
{
/// Variable to use for the pid input/output i.e. float, double et cetera
/// Variable to use for the pid input/output i.e. float, double et cetera//
using pidvar_t = float;

/// \brief Class to handle the parameters of a given detector response
Expand Down
4 changes: 2 additions & 2 deletions Common/Core/RecoDecay.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

#include <CommonConstants/MathConstants.h>

#include <TMCProcess.h> // for VMC Particle Production Process
#include <TPDGCode.h> // for PDG codes

#include <algorithm> // std::find
#include <array> // std::array
#include <cmath> // std::abs, std::sqrt
#include "TMCProcess.h" // for VMC Particle Production Process
#include <cstddef> // std::size_t
#include <cstdint> // intX_t
#include <tuple> // std::apply
Expand All @@ -38,7 +38,7 @@
/// - useful arithmetic operations and basic vector algebra
/// - calculation of kinematic quantities
/// - calculation of topological properties of secondary vertices
/// - Monte Carlo matching of decays at track and particle level
/// - Monte Carlo matching of decays at track and particle level////

struct RecoDecay {
// mapping of charm-hadron origin type
Expand Down
24 changes: 13 additions & 11 deletions Common/TableProducer/qVectorsTable.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -309,19 +309,21 @@ struct qVectorsTable {
corrsQvecSp.push_back(modeCorrQvecSp);
}

corrsQvecEse.clear();
for (std::size_t i = 0; i < cfgnMods->size(); i++) {
int ind = cfgnMods->at(i);
fullPath = cfgQvecCalibPath;
fullPath += "/eseq";
fullPath += std::to_string(ind);
auto modeCorrQvecEse = getForTsOrRun<TH3F>(fullPath, timestamp, runnumber);
if (!modeCorrQvecEse) {
if (cfgProduceRedQVecs) {
corrsQvecEse.clear();
for (std::size_t i = 0; i < cfgnMods->size(); i++) {
int ind = cfgnMods->at(i);
fullPath = cfgQvecCalibPath;
fullPath += "/eseq2";
modeCorrQvecEse = getForTsOrRun<TH3F>(fullPath, timestamp, runnumber);
fullPath += "/eseq";
fullPath += std::to_string(ind);
auto modeCorrQvecEse = getForTsOrRun<TH3F>(fullPath, timestamp, runnumber);
if (!modeCorrQvecEse) {
fullPath = cfgQvecCalibPath;
fullPath += "/eseq2";
modeCorrQvecEse = getForTsOrRun<TH3F>(fullPath, timestamp, runnumber);
}
corrsQvecEse.push_back(modeCorrQvecEse);
}
corrsQvecEse.push_back(modeCorrQvecEse);
}

if (cfgShiftCorr) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ struct FemtoUniversePairTaskTrackV0Extended {

// track cleaning & checking for duplicate pairs
if (!pairCleanerV0.isCleanPair(p1, p2, parts)) {
// mark for rejection the cascade that shares a daughter with another cascade and has an invariant mass further from default value
// mark for rejection the v0 that shares a daughter with another v0 and has an invariant mass further from default value. Set confV0DuplCosPA as TRUE to do the same check with cosPA instead.
if (!ConfV0Selection.confV0DuplCosPA) {
if (std::abs(p1.mLambda() - v0InvMass[ConfV0Selection.confV0Type1]) < std::abs(p2.mLambda() - v0InvMass[ConfV0Selection.confV0Type2])) {
v0Duplicates.insert(p2.globalIndex());
Expand Down
106 changes: 0 additions & 106 deletions PWGCF/FemtoWorld/Core/FemtoWorldUtils.h

This file was deleted.

Loading
Loading