Skip to content

Commit a79cf1d

Browse files
committed
Merge upstream/master into codex/sigmac2455-track
Resolve the HFC producer and task conflicts while retaining SigmaC(2455) reconstruction and the upstream D+ / D* generated-particle correlation workflows. Include all 14 process switches and qualify the new Gen output writers through ProducesGroup. Hoist the Gen mixing histogram name outside the generic lambda for Clang compatibility without changing its contents.
2 parents d41793e + 002101a commit a79cf1d

498 files changed

Lines changed: 41453 additions & 12857 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/mega-linter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
id: ml
4040
# You can override MegaLinter flavor used to have faster performances
4141
# More info at https://megalinter.io/flavors/
42-
uses: oxsecurity/megalinter@v10.1.0
42+
uses: oxsecurity/megalinter@v10.2.0
4343
env:
4444
# All available variables are described in documentation:
4545
# https://megalinter.io/configuration/

‎ALICE3/Core/FlatTrackSmearer.cxx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include <TRandom.h>
2323

24+
#include <algorithm>
2425
#include <cmath>
2526
#include <cstddef>
2627
#include <cstdint>
@@ -323,7 +324,10 @@ bool TrackSmearer::smearTrack(O2Track& o2track, const lutEntry_t* lutEntry, cons
323324
for (int j = 0; j < kNumEigenModes; ++j) {
324325
val += lutEntry->eigvec[j][i] * o2track.getParam(j);
325326
}
326-
params[i] = gRandom->Gaus(val, std::sqrt(lutEntry->eigval[i]));
327+
// A LUT covariance close to singular (strongly correlated parameters at low pT) can carry a tiny negative
328+
// eigenvalue from numerical precision. std::sqrt of it gives NaN and the track is dropped later on, which
329+
// shows up as holes in the tracking efficiency. Such a mode has practically zero width: do not smear along it.
330+
params[i] = gRandom->Gaus(val, std::sqrt(std::max(0.f, lutEntry->eigval[i])));
327331
}
328332

329333
// Transform back params vector

‎Common/Core/RecoDecay.h‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ struct RecoDecay {
5959
static constexpr int PdgBosonMax{37}; // largest boson (gauge or H) PDG code; o2-linter: disable=pdg/explicit-code (H+ does not have a named constant.)
6060
static constexpr int PdgDivisorMeson{100}; // order of magnitude of the meson PDG codes
6161
static constexpr int PdgDivisorBaryon{1000}; // order of magnitude of the baryon PDG codes
62+
static constexpr int PdgDiquarkSpin0Code{1}; // last digits of a spin-0 diquark PDG code
63+
static constexpr int PdgDiquarkSpin1Code{3}; // last digits of a spin-1 diquark PDG code
6264

6365
// Auxiliary functions
6466

@@ -1179,6 +1181,31 @@ struct RecoDecay {
11791181
return OriginType::None;
11801182
}
11811183

1184+
/// Check whether the PDG code corresponds to a diquark state (e.g. 4101, 4201, 5101).
1185+
/// Diquarks are constituents used by the generators during the hadronisation and are not
1186+
/// hadrons. A diquark carrying a charm or beauty quark has a PDG code that satisfies the
1187+
/// pdg / 1000 == 4 or 5 condition used to identify charm and beauty baryons in
1188+
/// getParticleOrigin, so such a state would be misidentified as a heavy-flavour baryon there.
1189+
/// This check therefore validates the diquark structure: two quark flavours in
1190+
/// PDG_t::kDown..kTop (any quark pair, not only a heavy-flavour one), the first flavour not
1191+
/// smaller than the second, and a spin-0 or spin-1 code.
1192+
/// \param pdgCode PDG code of the particle
1193+
/// \return true if the PDG code belongs to a diquark state
1194+
static bool isDiquark(const int pdgCode)
1195+
{
1196+
// a diquark PDG code is composed as pdgQuark1 * PdgDivisorBaryon + pdgQuark2 * PdgDivisorMeson
1197+
// + spinCode, with pdgQuark1 >= pdgQuark2 the quark flavours and spinCode either
1198+
// PdgDiquarkSpin0Code or PdgDiquarkSpin1Code
1199+
const int absPdgCode = std::abs(pdgCode);
1200+
const int spinCode = absPdgCode % PdgDivisorMeson;
1201+
if (spinCode != PdgDiquarkSpin0Code && spinCode != PdgDiquarkSpin1Code) {
1202+
return false;
1203+
}
1204+
const int pdgQuark1 = absPdgCode / PdgDivisorBaryon;
1205+
const int pdgQuark2 = (absPdgCode % PdgDivisorBaryon) / PdgDivisorMeson;
1206+
return pdgQuark1 >= PDG_t::kDown && pdgQuark1 <= PDG_t::kTop && pdgQuark2 >= PDG_t::kDown && pdgQuark2 <= PDG_t::kTop && pdgQuark1 >= pdgQuark2;
1207+
}
1208+
11821209
/// based on getCharmHardronOrigin in order to extend general particle
11831210
/// Finding the origin (from charm hadronisation or beauty-hadron decay) of paritcle (b, c and others)
11841211
/// \param particlesMC table with MC particles
@@ -1221,6 +1248,17 @@ struct RecoDecay {
12211248
// Check status code
12221249
// auto motherStatusCode = std::abs(mother.getGenStatusCode());
12231250
auto pdgParticleIMother = std::abs(mother.pdgCode()); // PDG code of the mother
1251+
// in the hadron-level mode, stop the walk when a parton or a diquark is reached: no
1252+
// heavy-flavour hadron can be found above the partonic level, and a diquark is not a
1253+
// hadron although its PDG code (e.g. 4101, 4201, 5101) satisfies pdg / 1000 == 4 or 5
1254+
// and would be misidentified as a charm/beauty baryon below. In the parton-level mode
1255+
// the walk has to continue through diquarks, since a charm or beauty quark can still be
1256+
// found above them.
1257+
if (!searchUpToQuark &&
1258+
(isDiquark(pdgParticleIMother) || pdgParticleIMother <= PdgQuarkMax ||
1259+
(pdgParticleIMother >= PdgBosonMin && pdgParticleIMother <= PdgBosonMax))) {
1260+
break;
1261+
}
12241262
// Check mother's PDG code.
12251263
// printf("getMother: ");
12261264
// for (int i = stage; i < 0; i++) // Indent to make the tree look nice.

‎Common/Core/macros/testCollisionTypeHelper.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ void testCollisionTypeHelper(int runNumber = 544124)
2626
o2::parameters::GRPLHCIFData* grpo = ccdb.getSpecificForRun<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF",
2727
runNumber);
2828
grpo->print();
29-
int collsys = o2::common::core::CollisionSystemType::getCollisionTypeFromGrp(grpo);
29+
[[maybe_unused]] int collsys = o2::common::core::CollisionSystemType::getCollisionTypeFromGrp(grpo);
3030
}

‎Common/DataModel/EventSelection.h‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
#define COMMON_DATAMODEL_EVENTSELECTION_H_
1919

2020
#include <Framework/AnalysisDataModel.h>
21+
#include <Framework/Logger.h>
22+
23+
#include <algorithm>
24+
#include <cstdint>
25+
#include <ranges>
26+
#include <vector>
2127

2228
namespace o2::aod
2329
{
@@ -85,6 +91,111 @@ DECLARE_SOA_TABLE(EvSels, "AOD", "EVSEL", //!
8591
evsel::SumAmpFT0CInTimeRange,
8692
evsel::OccupancyMedianTime);
8793
using EvSel = EvSels::iterator;
94+
95+
// occupancy wrt BCs: same estimators and flags as in EvSels (occupancy from other collisions nearby in time),
96+
// calculated wrt a BC; collisions found in this BC are excluded (their number is stored in numCollsInBC)
97+
// N.B.: not related to the occupancy tables in OccupancyTables.h
98+
namespace bcocc
99+
{
100+
enum BcOccupancyFlags { // bits of occupancyFlags
101+
kNoCollInTimeRangeNarrow = 0, // no other collisions in specified time range (narrower than Strict)
102+
kNoCollInTimeRangeStrict, // no other collisions in specified time range
103+
kNoCollInTimeRangeStandard, // no other collisions in specified time range with per-collision multiplicity above threshold
104+
kNoCollInRofStrict, // no other collisions in this ITS Readout Frame
105+
kNoCollInRofStandard, // no other collisions in this ITS Readout Frame with per-collision multiplicity above threshold (no veto on collisions with close vZ)
106+
kNoHighMultCollInPrevRof, // FT0C amplitude in previous ITS ROF is below threshold
107+
kUpcMode // ITS ROF of this BC is in UPC mode: no collisions in the ROF, or collisions reconstructed in the UPC mode (set for all BCs, also without calculated occupancy)
108+
};
109+
DECLARE_SOA_COLUMN(NumTracksInTimeRange, trackOccupancyInTimeRange, int); //! Occupancy in specified time interval by a number of tracks from nearby collisions (-1 if not available) // o2-linter: disable=name/o2-column
110+
DECLARE_SOA_COLUMN(SumAmpFT0CInTimeRange, ft0cOccupancyInTimeRange, float); //! Occupancy in specified time interval by a sum of FT0C amplitudes from nearby collisions (-1 if not available) // o2-linter: disable=name/o2-column
111+
DECLARE_SOA_COLUMN(OccupancyMedianTime, occupancyMedianTime, float); //! Median time for the occupancy in specified time interval (the delta-time wrt to the BC at which occupancy crosses 1/2 of its full value)
112+
DECLARE_SOA_BITMAP_COLUMN(OccupancyFlags, occupancyFlags, 8); //! Bitmask of occupancy flags (see BcOccupancyFlags), check with occupancyFlags_bit(bit)
113+
DECLARE_SOA_COLUMN(NumCollsInBC, numCollsInBC, int16_t); //! Number of collisions found in this BC (excluded from the occupancy)
114+
DECLARE_SOA_COLUMN(NumCollsInRof, numCollsInRof, int16_t); //! Number of collisions found in the ITS ROF of this BC (within the TF), including the collisions in this BC (-1 if the ROF parameters are not available)
115+
} // namespace bcocc
116+
117+
// bc-joinable occupancy
118+
DECLARE_SOA_TABLE(BcOccs, "AOD", "BCOCC", //!
119+
bcocc::NumTracksInTimeRange,
120+
bcocc::SumAmpFT0CInTimeRange,
121+
bcocc::OccupancyMedianTime,
122+
bcocc::OccupancyFlags,
123+
bcocc::NumCollsInBC,
124+
bcocc::NumCollsInRof);
125+
using BcOcc = BcOccs::iterator;
126+
127+
// occupancy wrt every BC of the TFs present in the DF (not joinable): for each TF (in increasing order) all its BCs, in increasing order of global BC
128+
// same estimators and flags as in BcOccs
129+
DECLARE_SOA_TABLE(BcOccsAll, "AOD", "BCOCCALL", //!
130+
bc::GlobalBC,
131+
bcocc::NumTracksInTimeRange,
132+
bcocc::SumAmpFT0CInTimeRange,
133+
bcocc::OccupancyMedianTime,
134+
bcocc::OccupancyFlags,
135+
bcocc::NumCollsInBC,
136+
bcocc::NumCollsInRof);
137+
using BcOccAll = BcOccsAll::iterator;
138+
139+
namespace bcocc
140+
{
141+
// fast lookup of the aod::BcOccsAll entry for a given global BC
142+
// usage (within the process function, the index keeps a pointer to the table):
143+
// aod::bcocc::BcOccAllIndex bcOccAllIndexed(bcOccsAll);
144+
// auto occ = bcOccAllIndexed[bc.globalBC()]; // iterator of aod::BcOccsAll
145+
// int occByTracks = occ.trackOccupancyInTimeRange();
146+
template <typename TBcOccsAll>
147+
class BcOccAllIndex
148+
{
149+
public:
150+
explicit BcOccAllIndex(TBcOccsAll const& bcOccsAll) : mTable(&bcOccsAll)
151+
{
152+
const int64_t nRows = static_cast<int64_t>(bcOccsAll.size());
153+
// offset globalBC - row: constant along consecutive BCs, changes only where TFs are missing in the DF
154+
auto offsetAt = [&bcOccsAll](int64_t row) { return static_cast<int64_t>(bcOccsAll.iteratorAt(row).globalBC()) - row; };
155+
for (int64_t first = 0, end = 0; first < nRows; first = end) {
156+
// the offset is non-decreasing (global BCs are strictly increasing): the segment ends at the first row with a larger offset
157+
const int64_t offset = offsetAt(first);
158+
// binary search over the rows [first, nRows) for the end of the segment: the first row with a different offset
159+
end = *std::ranges::partition_point(std::views::iota(first, nRows), [&](int64_t row) { return offsetAt(row) == offset; });
160+
mSegments.push_back({offset + first, offset + end, offset});
161+
}
162+
}
163+
164+
// entry of aod::BcOccsAll for this global BC (fatal if the BC is not in the table)
165+
auto operator[](uint64_t globalBC) const
166+
{
167+
const int64_t row = rowOf(globalBC);
168+
if (row < 0) {
169+
LOGP(fatal, "BcOccAllIndex: global BC {} is not in aod::BcOccsAll ({} rows): its TF is not in this DF, or the occupancy is not available for this DF", globalBC, mTable->size());
170+
}
171+
return mTable->iteratorAt(row);
172+
}
173+
174+
// helper function to check if a global BC is contained in the table
175+
bool contains(uint64_t globalBC) const { return rowOf(globalBC) >= 0; }
176+
177+
private:
178+
// row of aod::BcOccsAll for this global BC, -1 if the BC is not in the table
179+
int64_t rowOf(uint64_t globalBC) const
180+
{
181+
const auto bc = static_cast<int64_t>(globalBC);
182+
for (const auto& seg : mSegments) { // a few segments: one per range of consecutive TFs in the DF
183+
if (bc >= seg.firstGlobalBC && bc < seg.endGlobalBC) {
184+
return bc - seg.offset;
185+
}
186+
}
187+
return -1;
188+
}
189+
190+
struct Segment {
191+
int64_t firstGlobalBC; // first global BC of the segment
192+
int64_t endGlobalBC; // last global BC of the segment + 1
193+
int64_t offset; // globalBC - row, constant within the segment
194+
};
195+
TBcOccsAll const* mTable; // not owned: the index is valid as long as the table (within the process function)
196+
std::vector<Segment> mSegments; // in increasing order of global BC
197+
};
198+
} // namespace bcocc
88199
} // namespace o2::aod
89200

90201
#endif // COMMON_DATAMODEL_EVENTSELECTION_H_

‎Common/TableProducer/PID/pidTOFBase.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ struct tofEventTime {
469469
// Reset the event time
470470
eventTime = 0.f;
471471
sumOfWeights = 0.f;
472-
weight = 0.f;
472+
// weight = 0.f; // FIXME: unused
473473
// Remove the bias on TOF ev. time
474474
if constexpr (removeTOFEvTimeBias) {
475475
evTimeTOF.removeBias<TrksEvTime::iterator, filterForTOFEventTime>(trk, nGoodTracksForTOF, t0TOF[0], t0TOF[1], 2);

‎Common/TableProducer/PID/pidTOFMerge.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ struct tofEventTime {
435435
// Reset the event time
436436
eventTime = 0.f;
437437
sumOfWeights = 0.f;
438-
weight = 0.f;
438+
// weight = 0.f; // FIXME: unused
439439
// Remove the bias on TOF ev. time
440440
if constexpr (kRemoveTOFEvTimeBias) {
441441
evTimeMakerTOF.removeBias<Run3TrksWtof::iterator, filterForTOFEventTime>(trk, nGoodTracksForTOF, t0TOF[0], t0TOF[1], 2);

‎Common/TableProducer/caloClusterProducer.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,9 +1116,9 @@ struct CaloClusterProducer {
11161116
if (cpvdist != 99.) { // was evaluated
11171117
cpvdist = std::sqrt(cpvdist); // was squared
11181118
}
1119-
if (trackdist != 99.) { // was evaluated
1120-
trackdist = std::sqrt(trackdist); // was squared
1121-
}
1119+
// if (trackdist != 99.) { // was evaluated
1120+
// trackdist = std::sqrt(trackdist); // was squared // FIXME: unused
1121+
// }
11221122

11231123
float lambdaShort = 0., lambdaLong = 0.;
11241124
clu.getElipsAxis(lambdaShort, lambdaLong);
@@ -1544,9 +1544,9 @@ struct CaloClusterProducer {
15441544
if (cpvdist != 99.) { // was evaluated
15451545
cpvdist = std::sqrt(cpvdist); // was squared
15461546
}
1547-
if (trackdist != 99.) { // was evaluated
1548-
trackdist = std::sqrt(trackdist); // was squared
1549-
}
1547+
// if (trackdist != 99.) { // was evaluated
1548+
// trackdist = std::sqrt(trackdist); // was squared // FIXME: unused
1549+
// }
15501550

15511551
float lambdaShort = 0., lambdaLong = 0.;
15521552
clu.getElipsAxis(lambdaShort, lambdaLong);

‎Common/TableProducer/eventSelectionService.cxx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,17 @@ struct EventselectionRun3 { // o2-linter: disable=name/workflow-file (exception
112112

113113
o2::common::eventselection::EvselConfigurables evselOpts;
114114
o2::common::eventselection::EventSelectionModule evselmodule;
115+
o2::common::eventselection::BcOccConfigurables bcoccOpts;
116+
o2::common::eventselection::BcOccAllConfigurables bcoccAllOpts;
115117

116118
o2::common::eventselection::LumiConfigurables lumiOpts;
117119
o2::common::eventselection::LumiModule lumimodule;
118120

119121
Produces<aod::Timestamps> timestampTable; /// Table with SOR timestamps produced by the task
120122
Produces<aod::BcSels> bcsel;
121123
Produces<aod::EvSels> evsel;
124+
Produces<aod::BcOccs> bcocc;
125+
Produces<aod::BcOccsAll> bcoccall;
122126

123127
// for slicing
124128
SliceCache cache;
@@ -149,6 +153,8 @@ struct EventselectionRun3 { // o2-linter: disable=name/workflow-file (exception
149153
timestampMod.init(timestampConfigurables, metadataInfo);
150154
bcselmodule.init(context, bcselOpts, histos, metadataInfo);
151155
evselmodule.init(context, evselOpts, histos, metadataInfo);
156+
evselmodule.initBcOccupancy(context, bcoccOpts);
157+
evselmodule.initBcOccupancyAll(context, bcoccAllOpts);
152158
lumimodule.init(context, lumiOpts, histos);
153159
}
154160

@@ -163,6 +169,8 @@ struct EventselectionRun3 { // o2-linter: disable=name/workflow-file (exception
163169
timestampMod.process(bcs, ccdb, timestamps, timestampTable);
164170
bcselmodule.processRun3(ccdb, histos, bcs, timestamps, bcselsbuffer, bcsel);
165171
evselmodule.processRun3(ccdb, histos, bcs, collisions, pvTracks, ft0s, cache, timestamps, bcselsbuffer, evsel);
172+
evselmodule.processRun3BcOccupancy(bcs, bcselsbuffer, bcocc);
173+
evselmodule.processRun3BcOccupancyAll(bcs, bcoccall);
166174
lumimodule.process(ccdb, histos, bcs, timestamps, bcselsbuffer);
167175
}
168176
};

‎Common/TableProducer/match-mft-ft0.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ struct matchmftft0 {
367367

368368
auto ft0s = bc.ft0s();
369369
i = 0; // reinitialise
370-
D = 0.0;
370+
// D = 0.0; // FIXME: unused
371371
minD = 999.9;
372372
for (auto const& ft0 : ft0s) {
373373
// printf("---------ft0.bcId %d\n", ft0.bcId());

0 commit comments

Comments
 (0)