Skip to content

Commit f2445ac

Browse files
jmunozmejmunozme
authored
Merge branch 'AliceO2Group:master' into master
2 parents 0fd90f8 + 85604b4 commit f2445ac

26 files changed

+2382
-827
lines changed

‎Common/Tools/EventSelectionModule.h‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,10 +1514,14 @@ class EventSelectionModule
15141514
// apply int7-like selections
15151515
bool sel7 = 0;
15161516

1517-
// TODO apply other cuts for sel8
1518-
// TODO introduce sel1 etc?
1517+
// Combination of bits for Run 3 event selection decisions
1518+
// TODO apply other cuts for sel8?
15191519
// TODO introduce array of sel[0]... sel[8] or similar?
1520-
bool sel8 = bitcheck64(bcselEntry.selection, aod::evsel::kIsTriggerTVX) && bitcheck64(bcselEntry.selection, aod::evsel::kNoTimeFrameBorder) && bitcheck64(bcselEntry.selection, aod::evsel::kNoITSROFrameBorder);
1520+
bool sel8 = false;
1521+
if (lastRun < 568873) // pre-2026 data & MC: require all three bits: TVX, TF and ROF border cuts
1522+
sel8 = bitcheck64(bcselEntry.selection, aod::evsel::kIsTriggerTVX) && bitcheck64(bcselEntry.selection, aod::evsel::kNoTimeFrameBorder) && bitcheck64(bcselEntry.selection, aod::evsel::kNoITSROFrameBorder);
1523+
else // for pp 2026: sel8 without kNoITSROFrameBorder bit, because the cross-ROF reconstruction for ITS will be On (the switch by a runNumber is a temporary solution)
1524+
sel8 = bitcheck64(bcselEntry.selection, aod::evsel::kIsTriggerTVX) && bitcheck64(bcselEntry.selection, aod::evsel::kNoTimeFrameBorder);
15211525

15221526
// fill counters
15231527
histos.template get<TH1>(HIST("eventselection/hColCounterAll"))->Fill(Form("%d", bc.runNumber()), 1);

‎EventFiltering/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ o2physics_add_dpl_workflow(je-hf-filter
6969

7070
o2physics_add_dpl_workflow(fje-filter
7171
SOURCES PWGJE/fullJetFilter.cxx
72-
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::PWGJECore FastJet::FastJet FastJet::Contrib Boost::system
72+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::PWGJECore FastJet::FastJet FastJet::Contrib
7373
COMPONENT_NAME Analysis)
7474

7575
o2physics_add_dpl_workflow(lf-strangeness-filter

‎PWGCF/EbyEFluctuations/Tasks/v0ptHadPiKaProt.cxx‎

Lines changed: 283 additions & 28 deletions
Large diffs are not rendered by default.

‎PWGCF/Femto/Core/baseSelection.h‎

Lines changed: 143 additions & 122 deletions
Large diffs are not rendered by default.

‎PWGCF/Femto/Core/partitions.h‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,24 @@
2424
(o2::aod::femtocollisions::magField >= static_cast<int8_t>(selection.magFieldMin) && o2::aod::femtocollisions::magField <= static_cast<int8_t>(selection.magFieldMax)) && \
2525
ncheckbit(o2::aod::femtocollisions::mask, selection.collisionMask)
2626

27+
// macro for track momentum, i.e. ||q|*pT/q| * cosh(eta)
28+
// there is no ncosh function, so we have to make our own, i.e. cosh(x) = (exp(x)+exp(-x))/2
29+
#define TRACK_MOMENTUM(chargeAbs, signedPt, eta) nabs((chargeAbs) * (signedPt)) * (nexp(eta) + nexp(-1.f * (eta))) / 2.f
30+
2731
// standard track partition
28-
#define MAKE_TRACK_PARTITION(selection) \
29-
ifnode(selection.chargeSign.node() != 0, ifnode(selection.chargeSign.node() > 0, o2::aod::femtobase::stored::signedPt > 0.f, o2::aod::femtobase::stored::signedPt < 0.f), true) && \
30-
(nabs(selection.chargeAbs.node() * o2::aod::femtobase::stored::signedPt) > selection.ptMin) && \
31-
(nabs(selection.chargeAbs.node() * o2::aod::femtobase::stored::signedPt) < selection.ptMax) && \
32-
(o2::aod::femtobase::stored::eta > selection.etaMin) && \
33-
(o2::aod::femtobase::stored::eta < selection.etaMax) && \
34-
(o2::aod::femtobase::stored::phi > selection.phiMin) && \
35-
(o2::aod::femtobase::stored::phi < selection.phiMax) && \
36-
ifnode(nabs(selection.chargeAbs.node() * o2::aod::femtobase::stored::signedPt) * (nexp(o2::aod::femtobase::stored::eta) + nexp(-1.f * o2::aod::femtobase::stored::eta)) / (2.f) <= selection.pidThres, \
37-
ncheckbit(o2::aod::femtotracks::mask, selection.maskLowMomentum), \
38-
ncheckbit(o2::aod::femtotracks::mask, selection.maskHighMomentum))
32+
#define MAKE_TRACK_PARTITION(selection) \
33+
ifnode(selection.chargeSign.node() != 0, ifnode(selection.chargeSign.node() > 0, o2::aod::femtobase::stored::signedPt > 0.f, o2::aod::femtobase::stored::signedPt < 0.f), true) && \
34+
(nabs(selection.chargeAbs * o2::aod::femtobase::stored::signedPt) > selection.ptMin) && \
35+
(nabs(selection.chargeAbs * o2::aod::femtobase::stored::signedPt) < selection.ptMax) && \
36+
(o2::aod::femtobase::stored::eta > selection.etaMin) && \
37+
(o2::aod::femtobase::stored::eta < selection.etaMax) && \
38+
(o2::aod::femtobase::stored::phi > selection.phiMin) && \
39+
(o2::aod::femtobase::stored::phi < selection.phiMax) && \
40+
ifnode(TRACK_MOMENTUM(selection.chargeAbs, o2::aod::femtobase::stored::signedPt, o2::aod::femtobase::stored::eta) <= selection.pidThres, \
41+
ncheckbit(o2::aod::femtotracks::mask, selection.maskLowMomentum) && \
42+
(o2::aod::femtotracks::mask & selection.rejectionMaskLowMomentum) == static_cast<o2::aod::femtodatatypes::TrackMaskType>(0), \
43+
ncheckbit(o2::aod::femtotracks::mask, selection.maskHighMomentum) && \
44+
(o2::aod::femtotracks::mask & selection.rejectionMaskHighMomentum) == static_cast<o2::aod::femtodatatypes::TrackMaskType>(0))
3945

4046
// partition for phis and rhos, i.e. resonance that are their own antiparticle
4147
#define MAKE_RESONANCE_0_PARTITON(selection) \

0 commit comments

Comments
 (0)